Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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

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',
-    sort: 'custom',
     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
+  },
+  {
+    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: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
+    },
+  },
 ]))
 
 
@@ -267,16 +301,8 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从数量',
+    label: '数量',
-    field: 'fromQty',
+    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到数量',
-    field: 'toQty',
     sort: 'custom',
     table: {
       width: 150
@@ -322,6 +348,38 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '从包装规格',
+    field: 'fromPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装规格',
+    field: 'toPackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从标包数量',
+    field: 'fromPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到标包数量',
+    field: 'toPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从批次',
     field: 'fromBatch',