BugFix

src/views/modules/product/template-chose.vue

@@ -9,6 +9,9 @@
         <el-form-item label="物料名称">
           <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
         </el-form-item>
+        <el-form-item label="图号">
+          <el-input v-model="dataForm.mapNumber" placeholder="图号" clearable></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button @click="search()">查询</el-button>
           <el-button type="primary" @click="addItems()">添加</el-button>
@@ -43,12 +46,18 @@
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="productTypeValue"
+          prop="mapNumber"
           header-align="center"
           align="center"
-          label="物料类别">
+          label="图号">
         </el-table-column>
 <!--        <el-table-column-->
+<!--          prop="productTypeValue"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          label="物料类别">-->
+<!--        </el-table-column>-->
+<!--        <el-table-column-->
 <!--          prop="delFlag"-->
 <!--          header-align="center"-->
 <!--          align="center"-->
@@ -113,6 +122,7 @@
             'current': this.pageIndex,
             'size': this.pageSize,
             'productName': this.dataForm.name ? this.dataForm.name : null,
+            'mapNumber': this.dataForm.mapNumber ? this.dataForm.mapNumber : null,
             'productType': this.dataForm.type ? this.dataForm.type : null
           })
         }).then(({data}) => {

src/views/modules/tech/ctafts-add-or-detail.vue

@@ -203,8 +203,7 @@ export default {
         if (data && data.code === '200') {
           this.optionLevel = data.data.records
           this.optionLevel.forEach(item => {
-            let labelName = item.productName + '-' + item.mapNumber + '-' + (item.techId == null ? '有' : '无')
-            item.productName = labelName
+            item.productName = item.productName + '-' + item.mapNumber + '-' + (item.techId && item.techId !== 0 ? '有' : '无')
           })
         }
       })

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

@@ -109,7 +109,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <div class="title"><span style="color: red">*</span> 关联图纸</div>
+        <div class="title"> 关联图纸</div>
         <el-table :data="drawingList" border style="width: 100%;">
           <el-table-column label="序号" type="index" width="50" align="center">
           </el-table-column>
@@ -236,7 +236,6 @@ export default {
         productType: [{ required: true, message: '请选择物料类别', trigger: 'change' }],
         materials: [{ required: true, message: '请输入材料', trigger: 'blur' }],
         size: [{ required: true, message: '请输入物料尺寸', trigger: 'blur' }],
-        developedSize: [{ required: true, message: '请输入展开尺寸', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
         cnt: [{ required: true, message: '请输入单套数量', trigger: 'blur' }],
         mapNumber: [{ required: true, message: '请输入主图号', trigger: 'blur' }]
@@ -376,10 +375,10 @@ export default {
               })
             })
           }
-          if (this.drawingList.length <= 0) {
-            this.$message.error('请选择关联图纸')
-            return
-          }
+          // if (this.drawingList.length <= 0) {
+          //   this.$message.error('请选择关联图纸')
+          //   return
+          // }
           this.dataForm.drawingList = this.drawingList
 
           this.$http({