Merge remote-tracking branch 'origin/master_hella' into master_hella

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">

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>

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',