增加图号、单位

src/views/modules/cus/communicate-add-or-update.vue

@@ -144,6 +144,15 @@
               width="50"
               align="center"
             >
+            </el-table-column>
+             <el-table-column
+              prop="mapNumber"
+              header-align="center"
+              align="center"
+              min-width="120"
+              :show-tooltip-when-overflow="true"
+              label="图号"
+            >
             </el-table-column>
             <el-table-column
               prop="productName"
@@ -169,6 +178,13 @@
               label="数量"
             >
             </el-table-column>
+            <el-table-column
+              prop="unitName"
+              header-align="center"
+              align="center"
+              label="单位"
+            >
+            </el-table-column>
             <el-table-column
               prop="deliveryDate"
               header-align="center"

src/views/modules/cus/communicate-detail.vue

@@ -80,6 +80,15 @@
         <el-table :data="cusRCommProductVOS" border style="width: 100%">
           <el-table-column label="序号" type="index" width="50" align="center">
           </el-table-column>
+          <el-table-column
+            prop="mapNumber"
+            header-align="center"
+            align="center"
+            min-width="120"
+            :show-tooltip-when-overflow="true"
+            label="图号"
+          >
+          </el-table-column>
           <el-table-column
             prop="productName"
             header-align="center"
@@ -103,6 +112,13 @@
             align="center"
             label="数量"
           >
+          </el-table-column>
+           <el-table-column
+            prop="unitName"
+            header-align="center"
+            align="center"
+            label="单位"
+          >
           </el-table-column>
           <el-table-column
             prop="deliveryDate"

src/views/modules/cus/contract-record-add-or-update.vue

@@ -63,6 +63,14 @@
                 width="50"
                 align="center">
               </el-table-column>
+              <el-table-column
+                prop="mapNumber"
+                header-align="center"
+                align="center"
+                min-width="120"
+                :show-tooltip-when-overflow="true"
+                label="图号">
+              </el-table-column>
               <el-table-column
                 prop="productName"
                 header-align="center"
@@ -85,6 +93,13 @@
                 align="center"
                 min-width="160"
                 label="数量">
+              </el-table-column>
+               <el-table-column
+                prop="unitName"
+                header-align="center"
+                align="center"
+                min-width="160"
+                label="单位">
               </el-table-column>
               <el-table-column
                 prop="price"

src/views/modules/order/order-add-or-update.vue

@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="8" style="padding-left: 20px">
             <el-form-item label="合同号" prop="contractNumber">
-              <el-input v-model="dataForm.contractNumber" :disabled="display || addType === 2" placeholder="合同号"></el-input>
+              <el-input v-model="dataForm.contractNumber" :disabled="display || addType === 2" @change="queryContracList" placeholder="合同号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" style="padding-left: 20px">
@@ -573,6 +573,19 @@ export default {
       formatDate (row) {
         if (!row || !row.planCompletionTime) return ''
         return dateToString(row.planCompletionTime, 'yyyy-MM-dd')
+      },
+      // 根据合同号模糊查询获取合同信息
+      queryContracList (val) {
+        this.$http({
+          url: this.$http.adornUrl(`/biz-service/cusContractBook/infoCode/` + val),
+          method: 'get'
+        }).then(({data}) => {
+          if (data && data.code === '200') {
+  
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
       }
     }
   }

src/views/modules/product/template-add-or-update-v2.vue

@@ -6,6 +6,11 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
+        <el-row class="my-row">
+          <el-form-item label="图号" prop="mapNumber">
+            <el-input v-model="dataForm.mapNumber" placeholder="图号"></el-input>
+          </el-form-item>
+        </el-row>
         <el-row class="my-row">
           <el-form-item label="物料名称" prop="productName">
             <el-input v-model="dataForm.productName" placeholder="物料名称"></el-input>
@@ -21,6 +26,11 @@
             <el-input-number v-model="dataForm.cnt" ></el-input-number>
           </el-form-item>
         </el-row>
+        <el-row class="my-row">
+          <el-form-item label="单位" prop="unitName">
+            <el-input v-model="dataForm.unitName" placeholder="单位"></el-input>
+          </el-form-item>
+        </el-row>
         <el-row class="my-row">
           <el-form-item label="交付日期" prop="deliveryDate">
               <el-date-picker
@@ -60,9 +70,11 @@
         dataForm: {
         },
         dataRule: {
+          mapNumber: [{ required: true, message: '图号不能为空', trigger: 'blur' }],
           productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
           productSpecifications: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
           cnt: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+          unitName: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
           price: [{ required: true, message: '含税单价不能为空', trigger: 'blur' }]
         }
       }

src/views/modules/product/template-add-or-update.vue

@@ -6,6 +6,13 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
+        <el-row class="my-row">
+          <el-col :span="8">
+            <el-form-item label="图号" prop="mapNumber">
+              <el-input v-model="dataForm.mapNumber" :disabled="bizType === 3" placeholder="图号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row class="my-row">
           <el-col :span="8">
             <el-form-item label="物料名称" prop="productName">
@@ -20,8 +27,8 @@
         </el-row>
         <el-row class="my-row">
           <el-col :span="8">
-            <el-form-item label="单位" prop="cnt">
-              <el-input v-model="dataForm.unit" :disabled="bizType === 3" placeholder="单位"></el-input>
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="dataForm.unitName" :disabled="bizType === 3" placeholder="单位"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -126,6 +133,7 @@ export default {
         fileList1: [],
         fileList2: [],
         dataRule: {
+          mapNumber: [{ required: true, message: '图号不能为空', trigger: 'blur' }],
           productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
           productSpecifications: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
           cnt: [{ required: true, message: '数量不能为空', trigger: 'blur' }]

src/views/modules/production/monitoring.vue

@@ -78,6 +78,13 @@
           align="center"
           min-width="160"
           label="当前工序-数量-操作人">
+        </el-table-column>
+         <el-table-column
+          prop="operationRecords"
+          header-align="center"
+          align="center"
+          min-width="160"
+          label="报工记录">
         </el-table-column>
         <el-table-column
           prop="deliveryDate"