From 456c40f0f2b3a980b12f66ed98080ac3ec1a6ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 19 Mar 2024 13:21:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverRecordMain.data.ts             | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 88921406d..28a940c90 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -267,16 +267,8 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从数量',
-    field: 'fromQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到数量',
-    field: 'toQty',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -338,6 +330,22 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从库存状态',
     field: 'fromInventoryStatus',

From 2a0cc8d1cf37071b2f3732fd047276c2ca05a555 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 19 Mar 2024 13:27:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9a58903d9..22bc8f76a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -80,11 +80,11 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column align="center" label="角色编号" prop="id" />
+      <el-table-column align="center" label="角色编号" prop="id" :width="100"/>
       <el-table-column align="center" label="角色名称" prop="name" />
-      <el-table-column align="center" label="角色类型" prop="type" />
+      <el-table-column align="center" label="角色类型" prop="type" :width="100"/>
       <el-table-column align="center" label="角色标识" prop="code" />
-      <el-table-column align="center" label="显示顺序" prop="sort" />
+      <el-table-column align="center" label="显示顺序" prop="sort" :width="80"/>
       <el-table-column align="center" label="备注" prop="remark" />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">

From 55bddfc06625919f5b17a2cc31e43d7051f23e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 19 Mar 2024 15:44:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverRecordMain.data.ts             | 64 +++++++++++++++++--
 1 file changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 28a940c90..5d6693780 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -176,28 +176,62 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    sort: 'custom',
     table: {
       width: 180
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
-    isForm: false
-  }
+  },
 ]))
 
 
@@ -315,16 +349,16 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '从包装规格',
+    field: 'fromPackUnit',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '到包装规格',
+    field: 'toPackUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -346,6 +380,22 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从库存状态',
     field: 'fromInventoryStatus',