领料申请和客户模版对照表

src/views/mes/pro/ItemTemplateMapping/index.vue

@@ -257,7 +257,7 @@
                 >
                 <el-popover trigger="hover" placement="right">
                   <el-image style="width: 100px; height: 100px" :src="item.filePath" :preview-src-list="[item.filePath]"/>
-                  <div slot="reference">{{item.name}}</div>
+                  <div slot="reference">{{item.name + '(' +(item.remark || '') + ')'}}</div>
                 </el-popover>
               </el-option>
               </el-select>
@@ -380,6 +380,11 @@ export default {
         reportType: 'package_label',
       }).then((res) => {
         if (res.code === 200) {
+          // if (res.rows && res.rows.length > 0) {
+          //   res.rows.forEach(element => {
+          //     element['name'] = `${element.name}(${element.remark || ''})`
+          //   });
+          // }
           this.templateOptions = res.rows
         }
       })

src/views/mes/pro/request/components/requestIndex.vue

@@ -75,10 +75,11 @@
                 </el-row>
                 <el-row :gutter="10">
                     <el-col :span="12">
-          <el-form-item label="申请数量" prop="applyNum">
-            <el-input-number v-model="form.applyNum" :min="0" />
-          </el-form-item>
-        </el-col>
+                        <el-form-item label="申请数量" prop="applyNum">
+                            <el-input-number v-model="form.applyNum" :min="0" />
+                            单位：{{form.unitOfMeasure}}
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -169,6 +170,7 @@ export default {
                 itemId: null,
                 sapItemCode: null,
                 itemName: null,
+                unitOfMeasure: null,
                 applyNum: null,
                 workstationCode: null,
                 workunitCode: null,
@@ -217,11 +219,11 @@ export default {
             this.$refs[refName].showFlag = true;
         },
         onItemSelect(row) {
-            console.log('sdaa', row)
             if (row != undefined && row != null) {
                 this.$set(this.form,'itemId',row.itemId)
                 this.$set(this.form,'sapItemCode',row.sapItemCode)
                 this.$set(this.form,'itemName',row.itemName)
+                this.$set(this.form,'unitOfMeasure',row.unitOfMeasure)
             }
         },
         onWorkstationSelected(row){
@@ -310,6 +312,7 @@ export default {
                 this.form.sapItemCode=null;
                 this.form.itemName=null;
                 this.form.applyNum=null;
+                this.form.unitOfMeasure=null;
             //this.resetForm("form");
         },
         /** 重置按钮操作 */