update

src/views/modules/common/product-component.vue

@@ -81,7 +81,7 @@
             }
             data.data.records.forEach(item => {
               this.options.push({
-                label: item.productName,
+                label: item.productName + ' - ' + item.mapNumber + ' - ' + item.productSpec,
                 value: item.productId
               })
             })

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

@@ -107,6 +107,9 @@
                 align="center"
                 min-width="100"
                 label="含税单价">
+                 <template slot-scope="scope">
+                  <span>{{ scope.row.price == null ? '0' : scope.row.price }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="amount"

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

@@ -30,7 +30,13 @@
           </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" @change="queryContracList" placeholder="合同号"></el-input>
+              <el-autocomplete
+                :disabled="display || addType === 2"
+                v-model="dataForm.contractNumber"
+                :fetch-suggestions="queryContracList"
+                placeholder="请输入合同号"
+                @select="handleSelect"
+              ></el-autocomplete>
             </el-form-item>
           </el-col>
           <el-col :span="8" style="padding-left: 20px">
@@ -87,6 +93,14 @@
               width="50"
               align="center">
             </el-table-column>
+            <el-table-column
+              prop="mapNumber"
+              header-align="center"
+              align="center"
+              width="160"
+              :show-tooltip-when-overflow="true"
+              label="图号">
+            </el-table-column>
             <el-table-column
               prop="productName"
               header-align="center"
@@ -575,17 +589,34 @@ export default {
         return dateToString(row.planCompletionTime, 'yyyy-MM-dd')
       },
       // 根据合同号模糊查询获取合同信息
-      queryContracList (val) {
+      queryContracList (val, callback) {
         this.$http({
           url: this.$http.adornUrl(`/biz-service/cusContractBook/infoCode/` + val),
           method: 'get'
         }).then(({data}) => {
           if (data && data.code === '200') {
-  
+            let contractOption = []
+            if (data.data != null) {
+              data.data.forEach(item => {
+                contractOption.push({
+                  label: item.contractNumber,
+                  value: item.contractNumber,
+                  data: item.cusCBookProducts
+                })
+              })
+            }
+            callback(contractOption)
           } else {
             this.$message.error(data.msg)
           }
         })
+      },
+      handleSelect (item) {
+        this.productDetails = []
+        item.data.forEach(t => {
+          t.unit = t.unitName
+          this.addItem(t)
+        })
       }
     }
   }

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

@@ -27,8 +27,8 @@
           </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 label="单位" prop="unit">
+            <el-input v-model="dataForm.unit" placeholder="单位"></el-input>
           </el-form-item>
         </el-row>
         <el-row class="my-row">

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

@@ -9,7 +9,7 @@
         <el-row class="my-row">
           <el-col :span="8">
             <el-form-item label="图号" prop="mapNumber">
-              <el-input v-model="dataForm.mapNumber" placeholder="图号"></el-input>
+              <el-input v-model="dataForm.mapNumber" :disabled="bizType === 3" placeholder="图号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -26,14 +26,14 @@
           </el-col>
         </el-row>
         <el-row class="my-row">
-          <el-col :span="8">
-            <el-form-item label="单位" prop="unitName">
-              <el-input v-model="dataForm.unitName" :disabled="bizType === 3" placeholder="单位"></el-input>
+           <el-col :span="8">
+            <el-form-item label="数量" prop="cnt">
+              <el-input-number v-model="dataForm.cnt" :disabled="bizType === 3" ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="数量" prop="cnt">
-              <el-input-number v-model="dataForm.cnt" :disabled="bizType === 3" ></el-input-number>
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="dataForm.unit" :disabled="bizType === 3" placeholder="单位"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -150,10 +150,14 @@ export default {
         if (dataForm) {
           this.isModify = true
           this.dataForm = dataForm
+          // this.dataForm.unitName = dataForm.unit
         } else {
           this.dataForm = {
             recordId: Math.round(Math.random() * 1000000),
-            appraisal: 1
+            appraisal: 1,
+            // cnt: 0,
+            price: 0,
+            rate: 0
           }
         }
         this.visible = true