From 25f8b6e28a70dfabc38e7e7c7267e0cac696ad0b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Sun, 7 Apr 2024 15:41:18 +0800
Subject: [PATCH] =?UTF-8?q?2024-4-7=20=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97-=E4=BA=A7=E5=93=81-=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E6=B1=87=E7=8E=87+=E4=BC=98=E5=8C=96=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 49 +++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index b1559a7..39c00f0 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -119,6 +119,12 @@
         prop="productDescZh"
         width="350"
       />
+      <!-- <el-table-column
+        label="产品型号"
+        align="left"
+        prop="productModel"
+        width="350"
+      /> -->
       <el-table-column
         label="物料组编码"
         align="center"
@@ -136,6 +142,12 @@
           {{ scope.row.mtart == "material_type1" ? "料罐物料" : "其他类别" }}
         </template>
       </el-table-column>
+      <el-table-column
+        label="报工汇率"
+        align="center"
+        prop="reportRate"
+        width="150"
+      />
       <!-- 中文描述也就是产品名称 -->
       <!-- <el-table-column label="英文描述" align="center" prop="productDescEn" />
 						<el-table-column label="产品类别" align="center" prop="productGroup">
@@ -231,13 +243,13 @@
             style="width: 320px"
           />
         </el-form-item>
-        <el-form-item label="产品/物料型号" prop="productModel">
+        <!-- <el-form-item label="产品/物料型号" prop="productModel">
           <el-input
             v-model="form.productModel"
             placeholder="请输入产品型号"
             style="width: 320px"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="产品/物料组编码" prop="productGroup">
           <el-input
             v-model="form.productGroup"
@@ -332,6 +344,13 @@
 				<el-form-item label="工厂编码" prop="factoryCode">
 					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
 				</el-form-item> -->
+        <el-form-item label="报工汇率" prop="reportRate">
+          <el-input
+            v-model="form.reportRate"
+            placeholder="请输入报工汇率"
+            style="width: 320px"
+          />
+        </el-form-item>
         <el-form-item label="是否启用" prop="activeFlag">
           <el-select
             v-model="form.activeFlag"
@@ -402,9 +421,27 @@
               :contentStyle="CS"
               :label-style="LS"
             >
-              <el-descriptions-item label="产品编号">{{
+              <el-descriptions-item label="产品编码">{{
                 form.productCode
               }}</el-descriptions-item>
+              <el-descriptions-item label="产品名称">{{
+                form.productDescZh
+              }}</el-descriptions-item>
+              <!-- <el-descriptions-item label="产品型号">{{
+                form.productModel
+              }}</el-descriptions-item> -->
+              <el-descriptions-item label="物料组编码">{{
+                form.productGroup
+              }}</el-descriptions-item>
+              <el-descriptions-item label="物料组名称">{{
+                form.productGroupName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="物料类别">{{
+                form.mtart
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报工汇率">{{
+                form.reportRate
+              }}</el-descriptions-item>
               <el-descriptions-item label="品类">{{
                 form.category
               }}</el-descriptions-item>
@@ -507,7 +544,7 @@ export default {
         pageSize: 10,
         productCode: null,
         productDescZh: null,
-        productModel: null,
+        // productModel: null,
         productDescEn: null,
         ruleCode: null,
         oldProductCode: null,
@@ -541,6 +578,7 @@ export default {
         convIssue: null,
         appendFlag: null,
         appendPercent: null,
+        reportRate: null,
       },
       options: [
         {
@@ -595,7 +633,7 @@ export default {
         productId: null,
         productCode: null,
         productDescZh: null,
-        productModel: null,
+        // productModel: null,
         productDescEn: null,
         ruleCode: null,
         oldProductCode: null,
@@ -634,6 +672,7 @@ export default {
         convIssue: null,
         appendFlag: null,
         appendPercent: null,
+        reportRate: null,
       };
       this.resetForm("form");
     },