Commit 4d7f9788 by lichengming

修改了报价登记和合同登记的删除按钮

parent 7c73a423
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract } from '../../../api'
import MeterSendOperation from '../MeterContractRecord' import MeterSendOperation from '../MeterContractRecord'
import MeterSampleManage from '../MeterSampleQuoteManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterQuoteRegisterEdit' import MeterSubcontractorEdit from './MeterQuoteRegisterEdit'
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功!') this.$Message.success('删除成功!')
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span>{{scope.row[item.key]}}</span> <span>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
......
...@@ -6,29 +6,29 @@ ...@@ -6,29 +6,29 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="实验室名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -147,6 +147,7 @@ export default { ...@@ -147,6 +147,7 @@ export default {
} }
}) })
}, },
_resultRecord() {},
_submitToReview() { _submitToReview() {
this._submitByContractIds() this._submitByContractIds()
}, },
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract } from '../../../api'
import MeterSendOperation from '../MeterContractReviewOperation' import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSampleManage from '../MeterSampleQuoteManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterContractRegisterEdit' import MeterSubcontractorEdit from './MeterContractRegisterEdit'
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功!') this.$Message.success('删除成功!')
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
</template> </template>
<script> <script>
import { meterEntrust, meterContract, meterSubcontractor } from '../../../api' import { meterEntrust, meterContract } from '../../../api'
import MeterContracHisOperation from '../../../components/operation/Operation' import MeterContracHisOperation from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterContractRegisterEdit' import MeterSubcontractorEdit from './MeterContractRegisterEdit'
export default { export default {
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids) const result = await meterContract.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功!') this.$Message.success('删除成功!')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment