chris 3 роки тому
батько
коміт
73d2a9df8f

+ 4 - 2
src/views/modules/sale/contract-detail.vue

@@ -5,10 +5,12 @@
     <div style="margin-left: 20px;margin-right: 20px">
       <e-desc title="基本信息" column="3">
         <e-desc-item label="合同编码">{{dataForm.contractCode}}</e-desc-item>
-        <e-desc-item label="合同类别" span="2">{{!dataForm.type?'':(Number(dataForm.type) === 1?'采购合同':'委外合同')}}</e-desc-item>
+        <e-desc-item label="合同类别">{{!dataForm.type?'':(Number(dataForm.type) === 1?'采购合同':'委外合同')}}</e-desc-item>
+        <e-desc-item label="供应商">{{dataForm.supplierName}}</e-desc-item>
 
+        <e-desc-item label="合同交期">{{dataForm.deliveryTime}}</e-desc-item>
         <e-desc-item label="合同号">{{dataForm.contractNumber}}</e-desc-item>
-        <e-desc-item label="合同金额" span="2">{{dataForm.totalAmount}}</e-desc-item>
+        <e-desc-item label="合同金额">{{dataForm.totalAmount}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
 

+ 3 - 1
src/views/modules/sale/contract.vue

@@ -204,7 +204,9 @@ export default {
       let params = {
         'current': this.pageIndex,
         'size': this.pageSize,
-        'supplierName': this.dataForm.supplierName ? this.dataForm.supplierName : null
+        'supplierName': this.dataForm.supplierName ? this.dataForm.supplierName : null,
+        'startTime': this.dataForm.date ? this.dataForm.date[0] : null,
+        'endTime': this.dataForm.date ? this.dataForm.date[1] : null
       }
       getContractList(params).then(({data}) => {
         if (data && data.code === '200') {