From cda33a61775679ce0b0ba0e750ec7d6055799967 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Fri, 7 Feb 2025 10:54:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=89=A9=E6=96=99=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=EF=BC=88BOM=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=EF=BC=89=E3=80=81=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=EF=BC=88=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=EF=BC=89=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/md/mditem/components/itembom.vue | 9 +++++----
 src/views/mes/wm/arrivalnotice/line.vue        | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/mes/md/mditem/components/itembom.vue b/src/views/mes/md/mditem/components/itembom.vue
index d7e74f8..dae1d91 100644
--- a/src/views/mes/md/mditem/components/itembom.vue
+++ b/src/views/mes/md/mditem/components/itembom.vue
@@ -31,7 +31,7 @@
       <el-table-column label="物料编码" align="center" prop="bomItemCode" />
       <el-table-column label="物料名称" align="center" prop="bomItemName" :show-overflow-tooltip="true" />
       <el-table-column label="规格" align="center" prop="bomItemSpec" :show-overflow-tooltip="true" />
-      <el-table-column label="单位" width="60px" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" width="60px" align="center" prop="unitName" />
       <el-table-column label="使用比例" width="90px" align="center" prop="quantity" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="optType !='view'">
@@ -74,8 +74,8 @@
         <el-form-item label="BOM物料规格" prop="bomItemSpec">
           <el-input v-model="form.bomItemSpec" readonly type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="BOM物料单位" prop="unitOfMeasure">
-          <el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" />
+        <el-form-item label="BOM物料单位" prop="unitName">
+          <el-input v-model="form.unitName" readonly placeholder="请输入BOM物料单位" />
         </el-form-item>
         <el-form-item label="物料使用比例" prop="quantity">
           <el-input-number  :precision="4" :step="0.1" :min="0"  v-model="form.quantity" placeholder="请输入物料使用比例" />
@@ -251,7 +251,7 @@ components: { ItemSelect },
     },
     //物料选择弹出框
     onItemSelected(obj){
-        debugger;
+      console.log(obj, '-----obj----===')
         this.form.itemId = this.itemId;
         if(obj != undefined && obj != null){
             obj.forEach(element => {
@@ -261,6 +261,7 @@ components: { ItemSelect },
                 this.form.bomItemSpec = element.specification;
                 this.form.unitOfMeasure = element.unitOfMeasure;
                 this.form.itemOrProduct = element.itemOrProduct;
+                this.form.unitName = element.unitName
                 this.form.quantity = 1;
                 this.form.enableFlag = 'Y';
                 var retFlag = false;
diff --git a/src/views/mes/wm/arrivalnotice/line.vue b/src/views/mes/wm/arrivalnotice/line.vue
index c503b7c..bcf653d 100644
--- a/src/views/mes/wm/arrivalnotice/line.vue
+++ b/src/views/mes/wm/arrivalnotice/line.vue
@@ -41,7 +41,7 @@
       <el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
       <el-table-column label="物料名称" width="150px" align="center" prop="itemName" />
       <el-table-column label="规格型号" align="center" prop="specification" />
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="到货数量" align="center" prop="quantityArrival" />
       <el-table-column label="是否检验" align="center" prop="iqcCheck">
         <template slot-scope="scope">
@@ -97,8 +97,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" readonly="readonly" />
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="form.unitName" readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -304,13 +304,14 @@ export default {
     },
     //物料选择弹出框
     onItemSelected(obj){
-        debugger;
+      console.log(obj, '-----obj=========')
         if(obj != undefined && obj != null){
           this.form.itemId = obj.itemId;
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
           this.form.unitOfMeasure = obj.unitOfMeasure;
+          this.form.unitName = obj.unitName
         }
     },
     //IQC检验单选择