From 381250fa3cc485e56d5602337737bef9a7963cb5 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Sat, 8 Feb 2025 17:37:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=9F=E4=BA=A7=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=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/workorderSelect/single.vue |  2 +-
 src/views/mes/pro/procard/index.vue       |  4 +++-
 src/views/mes/pro/workorder/index.vue     | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue
index 33e1488..ccba4c2 100644
--- a/src/components/workorderSelect/single.vue
+++ b/src/components/workorderSelect/single.vue
@@ -73,7 +73,7 @@
         <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
         <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
         <el-table-column label="规格型号" align="center" prop="productSpc" :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="quantity" />
         <el-table-column label="客户编码" align="center" prop="clientCode" />
         <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue
index b7b3a0e..bcdaaf3 100644
--- a/src/views/mes/pro/procard/index.vue
+++ b/src/views/mes/pro/procard/index.vue
@@ -89,7 +89,7 @@
       <el-table-column label="产品物料编码" align="center" prop="itemCode" />
       <el-table-column label="产品物料名称" 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="quantityTransfered" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -356,6 +356,7 @@ export default {
       this.$refs.woSelect.handleOpen(this.form.workorderId)
     },
     onWorkorderSelected(row){
+      console.log(row, '-----------------')
       if(row != undefined && row != null){
         this.form.workorderId = row.workorderId;
         this.form.workorderCode = row.workorderCode;
@@ -365,6 +366,7 @@ export default {
         this.form.itemName = row.productName;
         this.form.specification = row.specification;
         this.form.unitOfMeasure = row.unitOfMeasure;
+        this.form.unitName = row.unitName
       }
     },
   }
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 347ca22..c6e7b84 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -159,7 +159,7 @@
       <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
       <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="productSpc" :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="quantity" />
       <el-table-column label="调整数量" align="center" prop="quantityChanged" />
       <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
@@ -321,8 +321,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位" prop="unitOfMeasure">
-              <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="form.unitName" placeholder="请选择产品" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -770,12 +770,14 @@ export default {
     },
     //物料选择弹出框
     onItemSelected(obj){
+      console.log(obj, '----------------')
       if(obj != undefined && obj != null){
         this.form.productId = obj.itemId;
         this.form.productCode = obj.itemCode;
         this.form.productName = obj.itemName;
         this.form.productSpc = obj.specification;
-        this.form.unitOfMeasure = obj.unitName;
+        this.form.unitOfMeasure = obj.unitOfMeasure;
+        this.form.unitName = obj.unitName;
       }
     },
     //客户选择弹出框