From af291d04cdff9aea42ef76daee957e02481749c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Mon, 10 Feb 2025 11:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A1=E3=80=81=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=A1=A8=E9=9D=A2=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E9=A2=9C=E8=89=B2=202=E3=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B6=E4=BB=96=E8=BD=A6=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Business/ProdOrder/ProdOrderCheck.vue          |  4 ++--
 .../report/edit/components/ReportProductEdit.vue   | 14 ++++++++++++++
 .../edit/components/ReportProductRowEdit.vue       |  6 ++++++
 src/views/yh/reportProd/index.vue                  |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/Business/ProdOrder/ProdOrderCheck.vue b/src/components/Business/ProdOrder/ProdOrderCheck.vue
index 3cbbe3f..3b7dbcf 100644
--- a/src/components/Business/ProdOrder/ProdOrderCheck.vue
+++ b/src/components/Business/ProdOrder/ProdOrderCheck.vue
@@ -19,9 +19,9 @@
           />
         </el-select>
       </el-form-item> -->
-      <!-- <el-form-item label="生产车间" prop="deptId">
+      <el-form-item label="生产车间" prop="deptId">
         <dept-tree-select v-model="queryParams.deptId" class="small-tree-select" @change="handleQuery"/>
-      </el-form-item> -->
+      </el-form-item>
       <!-- <el-form-item label="业务状态" prop="erpStatusList">
         <el-checkbox-group v-model="queryParams.erpStatusList" @change="handleQuery">
           <el-checkbox-button
diff --git a/src/views/yh/report/edit/components/ReportProductEdit.vue b/src/views/yh/report/edit/components/ReportProductEdit.vue
index 5fde7ab..9b1d2c2 100644
--- a/src/views/yh/report/edit/components/ReportProductEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductEdit.vue
@@ -49,6 +49,18 @@
           
           <!-- 数据指标网格 -->
           <div class="metrics-grid">
+            <div class="metric-item">
+              <span class="label">表面处理</span>
+              <div class="value-unit">
+                <span class="value">{{item.surface | dv}}</span>
+              </div>
+            </div>
+            <div class="metric-item">
+              <span class="label">颜色</span>
+              <div class="value-unit">
+                <span class="value">{{item.color | dv}}</span>
+              </div>
+            </div>
             <div class="metric-item">
               <span class="label">良品数</span>
               <div class="value-unit">
@@ -276,6 +288,8 @@ export default {
         num: null,
         defectNum: null,
         totalAmount: 0,
+        surface: null,
+        color: null,
         orderProdList: [],
         userProdList: [],
         ...data
diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
index 88e80ef..27aaef0 100644
--- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
@@ -28,6 +28,12 @@
           <form-col :span="span / 2 " label="总价">
             {{ row.totalAmount | dv }} 元
           </form-col>
+          <form-col :span="span" label="表面处理" prop="surface">
+            <el-input v-model="row.surface" placeholder="请输入表面处理"/>
+          </form-col>
+          <form-col :span="span" label="颜色" prop="color">
+            <el-input v-model="row.color" placeholder="请输入颜色"/>
+          </form-col>
           <form-col :span="span" label="良品" prop="num">
             <el-input-number v-model="row.num" type="number" :min="0" placeholder="请输入良品数" controls-position="right" style="width: calc(100% - 2em)" @change="calcTotalAmount"/>
             {{row.priceUnit}}
diff --git a/src/views/yh/reportProd/index.vue b/src/views/yh/reportProd/index.vue
index 24b4ba6..e026935 100644
--- a/src/views/yh/reportProd/index.vue
+++ b/src/views/yh/reportProd/index.vue
@@ -78,6 +78,8 @@
               <el-descriptions-item label="图案">{{d.row.pricePattern | dv}}</el-descriptions-item>
               <el-descriptions-item label="规格">{{d.row.priceSpec | dv}}</el-descriptions-item>
               <el-descriptions-item label="分类">{{d.row.priceClassify | dv}}</el-descriptions-item>
+              <el-descriptions-item label="表面处理">{{d.row.surface | dv}}</el-descriptions-item>
+              <el-descriptions-item label="颜色">{{d.row.color | dv}}</el-descriptions-item>
               <el-descriptions-item label="倍数">{{formatFraction(d.row.priceQuantityNumerator, d.row.priceQuantityDenominator)}}</el-descriptions-item>
             </el-descriptions>
             <template v-if="!isEmpty(d.row.userProdList)">
@@ -277,6 +279,8 @@ export default {
         {key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'priceSubName', visible: true, label: '子工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'priceType', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'surface', visible: false, label: '表面处理', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'color', visible: false, label: '颜色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'num', visible: true, label: '良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'defectNum', visible: true, label: '不良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'priceUnit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},