From d0af518339298578816f516080e707067187c07d 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: Tue, 11 Mar 2025 15:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=B1=9E=E6=80=A7=E5=92=8C?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Business/ProdOrder/ProdOrderNewDrawer.vue | 8 ++++++++
 src/views/yh/logImport/index.vue                         | 6 +++---
 src/views/yh/prodOrder/index.vue                         | 2 +-
 src/views/yh/reportOrderProd/index.vue                   | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue b/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue
index 77bb643..d5d9b59 100644
--- a/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue
+++ b/src/components/Business/ProdOrder/ProdOrderNewDrawer.vue
@@ -65,6 +65,14 @@
                 <div class="label">计划跟踪号:</div>
                 <div class="value">{{ item.erpMtoNo | dv}}</div>
               </div>
+              <div class="detail-item">
+                <div class="label">颜色:</div>
+                <div class="value">{{ item.fauxProp | dv}}</div>
+              </div>
+              <div class="detail-item">
+                <div class="label">数量:</div>
+                <div class="value">{{ item.erpQty | dv}} {{item.unitName}}</div>
+              </div>
             </div>
           </div>
           <div class="check-icon">
diff --git a/src/views/yh/logImport/index.vue b/src/views/yh/logImport/index.vue
index 28ad539..72d788c 100644
--- a/src/views/yh/logImport/index.vue
+++ b/src/views/yh/logImport/index.vue
@@ -246,9 +246,9 @@ export default {
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
         {key: 'finishedTime', visible: true, label: '完成时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "180"},
         {key: 'seconds', visible: true, label: '耗时', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
-        {key: 'addCount', visible: true, label: '新增', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
-        {key: 'updateCount', visible: true, label: '修改', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
-        {key: 'failCount', visible: true, label: '失败', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
+        // {key: 'addCount', visible: true, label: '新增', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
+        // {key: 'updateCount', visible: true, label: '修改', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
+        // {key: 'failCount', visible: true, label: '失败', minWidth: null, sortable: false, overflow: false, align: 'center', width: "80"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue
index 08545b8..1116f2a 100644
--- a/src/views/yh/prodOrder/index.vue
+++ b/src/views/yh/prodOrder/index.vue
@@ -229,7 +229,7 @@ export default {
         {key: 'erpDocumentStatus', visible: false, label: '单据', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
         {key: 'erpDescription', visible: false, label: '主备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'materialNumber', visible: true, label: '物料', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
-        {key: 'fauxPropId', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
+        {key: 'fauxProp', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
         {key: 'workShopName', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'erpIsRework', visible: true, label: '返工', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
         {key: 'percentage', visible: true, label: '进度', minWidth: null, sortable: false, overflow: false, align: 'left', width: "120"},
diff --git a/src/views/yh/reportOrderProd/index.vue b/src/views/yh/reportOrderProd/index.vue
index 38ae76b..e7ea67e 100644
--- a/src/views/yh/reportOrderProd/index.vue
+++ b/src/views/yh/reportOrderProd/index.vue
@@ -202,6 +202,7 @@ export default {
         {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'orderErpMtoNo', visible: true, label: '计划跟踪号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'orderErpBillNo', visible: true, label: '生产订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'orderFauxProp', visible: true, label: '辅助属性', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'reportId', visible: false, label: '报表编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'reportDeptName', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'reportDate', visible: true, label: '日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},