From bcbd1ee60340d8c5dcf0228d1d167929dbed100b Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Sat, 8 Feb 2025 10:56:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E3=80=81=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E3=80=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E9=80=80=E6=96=99=E5=92=8C=E4=BA=A7=E5=93=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/noticeSelect/lineSingle.vue |  9 ++++-----
 src/views/mes/wm/issue/line.vue            | 13 +++++++------
 src/views/mes/wm/itemrecpt/line.vue        |  8 +++++---
 src/views/mes/wm/productrecpt/line.vue     |  7 ++++---
 src/views/mes/wm/rtissue/line.vue          |  7 ++++---
 src/views/mes/wm/rtvendor/line.vue         |  7 ++++---
 6 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/noticeSelect/lineSingle.vue b/src/components/noticeSelect/lineSingle.vue
index afeb738..a62a8bb 100644
--- a/src/components/noticeSelect/lineSingle.vue
+++ b/src/components/noticeSelect/lineSingle.vue
@@ -11,11 +11,11 @@
             <template v-slot="scope">
                 <el-radio v-model="selectedId" :label="scope.row.lineId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
-        </el-table-column> 
+        </el-table-column>
         <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">
@@ -26,7 +26,7 @@
         <el-table-column label="检验单号" align="center" prop="iqcCode" />
         <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
-      
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -40,7 +40,7 @@
       </div>
     </el-dialog>
   </template>
-  
+
   <script>
   import { listArrivalnoticeline} from "@/api/mes/wm/arrivalnoticeline";
   export default {
@@ -130,4 +130,3 @@
     }
   };
   </script>
-  
\ No newline at end of file
diff --git a/src/views/mes/wm/issue/line.vue b/src/views/mes/wm/issue/line.vue
index 944fd1b..de632ef 100644
--- a/src/views/mes/wm/issue/line.vue
+++ b/src/views/mes/wm/issue/line.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">    
+  <div class="app-container">
     <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -41,7 +41,7 @@
       <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
       <el-table-column label="产品物料名称" width="120px"  align="center" prop="itemName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="领料数量" align="center" prop="quantityIssued" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
@@ -69,7 +69,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -110,8 +110,8 @@
         </el-row>
         <el-row>
             <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-col :span="8">
@@ -350,7 +350,7 @@ export default {
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
+          this.form.unitOfMeasure = obj.unitOfMeasure;
           this.form.batchCode = obj.batchCode;
           this.form.warehouseId = obj.warehouseId;
           this.form.warehouseCode = obj.warehouseCode;
@@ -363,6 +363,7 @@ export default {
           this.form.areaName = obj.areaName;
           this.form.quantityIssued = obj.quantityOnhand;
           this.form.quantityMax = obj.quantityOnhand;
+          this.form.unitName = obj.unitName
         }
     },
     /** 导出按钮操作 */
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index 2b58e93..5f9a226 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -30,7 +30,7 @@
       <el-table-column label="物料编码" align="center" width="120px" prop="itemCode" />
       <el-table-column label="物料名称" align="center" prop="itemName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="入库数量" align="center" prop="quantityRecived" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库" align="center" prop="warehouseName" />
@@ -84,8 +84,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>
@@ -378,6 +378,7 @@ export default {
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
           this.form.unitOfMeasure = obj.unitOfMeasure;
+          this.form.unitName = obj.unitName
         }
     },
     //选择到货通知单行
@@ -393,6 +394,7 @@ export default {
           this.form.specification = obj.specification;
           this.form.unitOfMeasure = obj.unitOfMeasure;
           this.form.quantityRecived = obj.quantityQuanlified;
+          this.form.unitName = obj.unitName
         }
     },
     //IQC检验单选择
diff --git a/src/views/mes/wm/productrecpt/line.vue b/src/views/mes/wm/productrecpt/line.vue
index 1b61865..0a122e2 100644
--- a/src/views/mes/wm/productrecpt/line.vue
+++ b/src/views/mes/wm/productrecpt/line.vue
@@ -43,7 +43,7 @@
       <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
       <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" width="120px" align="center" prop="specification" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="入库数量" align="center" prop="quantityRecived" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
@@ -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" placeholder="请输入单位" />
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="form.unitName" placeholder="请输入单位" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -388,6 +388,7 @@ export default {
           this.form.batchCode = obj.batchCode;
           this.form.quantityRecived = obj.quantityOnhand;
           this.form.quantityMax = obj.quantityOnhand;
+          this.form.unitName = obj.unitName
         }
     },
     //选择默认的仓库、库区、库位
diff --git a/src/views/mes/wm/rtissue/line.vue b/src/views/mes/wm/rtissue/line.vue
index 64768e3..b9ce293 100644
--- a/src/views/mes/wm/rtissue/line.vue
+++ b/src/views/mes/wm/rtissue/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" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="退料数量" align="center" prop="quantityRt" />
       <el-table-column label="领料批次号" width="120px" align="center" prop="batchCode" />
       <el-table-column label="仓库名称" width="100px" align="center" prop="warehouseName" />
@@ -95,8 +95,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" readonly="readonly" placeholder="请输入单位" />
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="form.unitName" readonly="readonly" placeholder="请输入单位" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -378,6 +378,7 @@ export default {
           this.form.batchCode = obj.batchCode;
           this.form.quantityRt = obj.quantityOnhand;
           this.form.quantityMax = obj.quantityOnhand;
+          this.form.unitName = obj.unitName
         }
     },
     //选择默认的仓库、库区、库位
diff --git a/src/views/mes/wm/rtvendor/line.vue b/src/views/mes/wm/rtvendor/line.vue
index 9acc5dc..474b473 100644
--- a/src/views/mes/wm/rtvendor/line.vue
+++ b/src/views/mes/wm/rtvendor/line.vue
@@ -30,7 +30,7 @@
       <el-table-column label="物料编码" width="120px" align="center" prop="itemCode" />
       <el-table-column label="物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
-      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="退货数量" align="center" prop="quantityRted" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
       <el-table-column label="仓库" align="center" prop="warehouseName" />
@@ -97,8 +97,8 @@
         </el-row>
         <el-row>
             <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-col :span="8">
@@ -355,6 +355,7 @@ export default {
           this.form.areaName = obj.areaName;
           this.form.quantityRted = obj.quantityOnhand;
           this.form.quantityMax = obj.quantityOnhand;
+          this.form.unitName = obj.unitName
         }
     },
   }