Merge remote-tracking branch 'origin-mes-ui/dev' into dev

src/components/itemSelect/single.vue

@@ -147,6 +147,15 @@
             v-if="columns[5].visible"
             width="120"
           />
+          <el-table-column
+            label="备注"
+            align="center"
+            key="remark"
+            prop="remark"
+            v-if="columns[7].visible"
+            :show-overflow-tooltip="true"
+            width="160"
+          />
           <el-table-column
             label="创建时间"
             align="center"
@@ -236,6 +245,7 @@ export default {
         { key: 4, label: `物料/产品`, visible: true },
         { key: 5, label: `物料分类`, visible: true },
         { key: 6, label: `创建时间`, visible: true },
+        { key: 7, label: `备注`, visible: true },
       ],
     };
   },

src/views/mes/proofing/components/ProogingBom.vue

@@ -121,11 +121,11 @@
       >
         <el-row>
           <el-col :span="24">
-            <el-form-item label="产品" prop="itemId">
+            <el-form-item label="物料" prop="itemId">
               <el-input
                 v-model="form.itemName"
                 readonly
-                placeholder="请选择产品"
+                placeholder="请选择物料"
               >
                 <el-button
                   slot="append"
@@ -289,7 +289,8 @@ export default {
       if (row != undefined && row != null) {
         this.form.itemId = row.itemId;
         this.form.itemName = row.itemName;
-        this.form.unit = row.unitOfMeasure;
+        this.form.unitOfMeasure = row.unitOfMeasure;
+        this.form.itemRemark = row.remark;
       }
     },
     /**表单提交 */
@@ -323,8 +324,8 @@ export default {
     },
     /**重置组件状态 */
     resetState() {
-      this.resetForm()
-      this.tableData = []
+      this.resetForm();
+      this.tableData = [];
     },
     /**获取组件数据 */
     getComData() {

src/views/mes/proofing/proofingInfo.vue

@@ -310,7 +310,7 @@ export default {
         processList,
       };
       this.loading = true;
-      if (mode == "apply") {
+      if (this.mode == "apply") {
         addPrototypeRequest(params)
           .then((res) => {
             this.loading = false;