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

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -77,98 +77,6 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '替代包装单位1',
-    field: 'altPackUnit1',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 150
-    } 
-  },
-  { 
-    label: '替代包装量1', 
-    field: 'altPackQty1',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
-  { 
-    label: '替代包装量2', 
-    field: 'altPackQty2',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
-  {
-    label: '替代包装单位3',
-    field: 'altPackUnit3',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 150
-    } 
-  },
-  { 
-    label: '替代包装量3', 
-    field: 'altPackQty3',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
-  {
-    label: '替代包装单位4',
-    field: 'altPackUnit4',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    table: {
-      width: 150
-    } 
-  },
-  { 
-    label: '替代包装量4', 
-    field: 'altPackQty4',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
   {
     label: '是否可用',
     field: 'available',
@@ -258,7 +166,42 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: false
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
   },
   {
     label: '操作',