合同评审记录修改

api/meter/meter-contract.js

@@ -46,6 +46,10 @@ export default {
     http
       .post('meter/v1/contract/page_contract_register', data)
       .then(res => res),
+  pageContractRegisterHis: data =>
+    http
+      .post('meter/v1/contract/page_contract_register_his', data)
+      .then(res => res),
   pageContractReview: data =>
     http.post('meter/v1/contract/page_contract_review', data).then(res => res),
 

pages/meter-contract/MeterSampleQuoteManage.vue

@@ -119,9 +119,9 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '名称', key: 'name', width: 160 },
-        { title: '型号', key: 'spec' },
-        { title: '数量', key: 'quantity' },
-        { title: '检测依据', key: 'verification' },
+        { title: '型号', key: 'spec', width: 160 },
+        { title: '数量', key: 'quantity', width: 100 },
+        { title: '检测依据', key: 'verification', width: 260 },
         { title: '技术参数', key: 'technicalParameter' },
         { title: '生产厂家', key: 'manufacturer' },
         { title: '出厂编号', key: 'factoryNumber' },

pages/meter-contract/contract-register/MeterContractRegisterHis.vue

@@ -53,7 +53,7 @@
   </div>
 </template>
 <script>
-import { meterEntrust, meterContract } from '../../../api'
+import { meterContract } from '../../../api'
 import MeterContracHisOperation from '../../../components/operation/Operation'
 import MeterSubcontractorEdit from './MeterContractRegisterEdit'
 export default {
@@ -113,12 +113,11 @@ export default {
         { title: '联系人', key: 'person', width: 120 },
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
-        { title: '详细地址', key: 'address', width: 250 },
-        { title: '邮编', key: 'postcode' },
-        { title: 'E-mail', key: 'email', width: 120 },
-        { title: '委托日期', key: 'edate', width: 120 },
-        { title: '费用合计', key: 'fee', width: 120 },
-        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '合同编号', key: 'salesCode', width: 120 },
+        { title: '要求完成时间', key: 'odate', width: 120, date: true },
+        { title: '折扣', key: 'discount', width: 120 },
+        { title: '总价', key: 'totalPrice', width: 120 },
+        { title: '折扣价', key: 'discountPrice', width: 120 },
         { title: '备注', key: 'remark' }
       ]
     }
@@ -190,7 +189,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterEntrust.pageSendEntrust(this.formObj)
+      const result = await meterContract.pageContractRegisterHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result