From c0e3ac4b4e364439bcd68bfa2862616cf2fceed1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Sep 2024 16:59:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?HL-5825=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE,=E6=B2=A1=E6=9C=89=E8=AE=B0=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChangeRecord/src/ChangeRecord.vue | 2 +-
 src/components/Distinction/src/Distinction.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index 59d24cb5d..58aca8043 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -24,7 +24,7 @@
                 <div class="dic color-#303133" >
                   {{ item.nickname }} {{ item.content }}
                 </div>
-                <el-button type="primary" bg text style="margin-top: 5px;" @click="seeDistinction(item)">查看变更数据</el-button>
+                <el-button type="primary" bg text style="margin-top: 5px;" @click="seeDistinction(item)" v-if='item.beforeContent||item.afterContent'>查看变更数据</el-button>
 
               
               <!-- <div class="tips" v-if="item.type == 2">
diff --git a/src/components/Distinction/src/Distinction.vue b/src/components/Distinction/src/Distinction.vue
index 6ef0c4081..2c6876c33 100644
--- a/src/components/Distinction/src/Distinction.vue
+++ b/src/components/Distinction/src/Distinction.vue
@@ -2,11 +2,11 @@
 <template>
   <el-dialog v-model="dialogVisible" title="变更详情" width="80%" :before-close="handleClose">
     <div style="display: flex">
-      <div style="flex: 1; width: 0px">
+      <div style="flex: 1; width: 0px"  v-if="beforeContent">
         <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更前 </div>
         <Descriptions :data="beforeContent" :schema="schema" :columns="2" />
       </div>
-      <div style="flex: 1; width: 0px; margin-left: 20px">
+      <div style="flex: 1; width: 0px; margin-left: 20px" v-if="afterContent">
         <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px"> 变更后 </div>
         <Descriptions :data="afterContent" :schema="schema" :columns="2" />
       </div>

From 409ee43565af5d7c4fdc330016986f61f071b222 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 3 Sep 2024 17:00:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=85=E9=85=8D=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BAexcel?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=95=B0=E9=87=8F=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=20=20=20HL-5822?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayAssembleRecordMain.data.ts              | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index 57b04a37f..bdbb1e4ed 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -465,6 +465,14 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault:3,
   },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装规格',
     field: 'packUnit',