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

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -12,42 +12,58 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    table: {
+      width: 180
+    },
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isForm: false,
+    table: {
+      width: 180
+    },
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
     isForm: false,
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
     isForm: false,
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '状态',
     field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
-
+    table: {
-    form: {
+      width: 150
-      component: 'Radio'
     },
+    isForm: false,
   },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -69,6 +85,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestDueTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -91,7 +110,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expiredTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -112,20 +133,23 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-
   },
   {
     label: '承接人用户名',
     field: 'acceptUserName',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '承接时间',
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -146,12 +170,18 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人用户名',
     field: 'completeUserName',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '完成时间',
     field: 'completeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -171,12 +201,26 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
   },
   {
     label: '业务类型',
@@ -185,48 +229,62 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
                 form: {
                   component: 'SelectV2'
                 },
+                table: {
+                  width: 120
+                },
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     sort: 'custom',
-
+    table: {
+      width: 120
+    },
   },
   {
     label: '允许修改库位',
     field: 'allowModifyLocation',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改数量',
     field: 'allowModifyQty',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许大于推荐数量',
     field: 'allowBiggerQty',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '允许小于推荐数量',
     field: 'allowSmallerQty',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '允许修改库存状态',
     field: 'allowModifyInventoryStatus',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
     form: {
       component: 'Radio'
     },
@@ -235,66 +293,82 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '允许连续扫描',
     field: 'allowContinuousScanning',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许部分完成',
     field: 'allowPartialComplete',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改批次',
     field: 'allowModifyBatch',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '允许修改箱码',
     field: 'allowModifyPackingNumber',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
-
+    table: {
+      width: 150
+    },
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
-
+    table: {
+      width: 150
     },
-  {
-    label: '工作流流水号',
-    field: 'serialNumber',
-    sort: 'custom',
-
   },
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
     sort: 'custom',
-
+    table: {
+      width: 180
+    },
   },
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
     sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    table: {
+      width: 120
+    },
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -326,18 +400,27 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '库存状态',
@@ -347,60 +430,90 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Radio'
     },
+    table: {
+      width: 120
+    },
   },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 120
+    },
   },
   {
     label: '数量',
@@ -411,18 +524,22 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
     },
-  {
+    tableForm: {
-    label: '主表ID',
+      type: 'Select',
-    field: 'masterId',
+      disabled: true
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '备注',
@@ -444,6 +561,9 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
     isForm: false,
   },
   {

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -54,17 +54,64 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '入库事务类型',
     field: 'inTransactionType',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '执行时间',
@@ -152,24 +199,23 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
+    label: '创建时间',
-    field: 'available',
+    field: 'createTime',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
-    table: {
+    formatter: dateFormatter,
-      width: 150
+    search: {
-    },
+      component: 'DatePicker',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
       componentProps: {
-        inactiveValue: 'FALSE',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        activeValue: 'TRUE'
+        type: 'daterange',
-      }
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
   {
     label: '部门',
     field: 'departmentCode',
@@ -198,64 +244,32 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
+    label: '是否可用',
-    field: 'remark',
+    field: 'available',
-    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
-    table: {
-      width: 100
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    table: {
-      width: 180
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
-    },
     },
-  {
+    form: {
-    label: '从库区代码范围',
+      component: 'Switch',
-    field: 'fromAreaCodes',
+      value: 'TRUE',
-    sort: 'custom',
+      componentProps: {
-    isSearch: true,
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '到库区类型范围',
+    label: '备注',
-    field: 'toAreaTypes',
+    field: 'remark',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
-      width: 180
+      width: 100
     },
   },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-  },
   {
     label: '操作',
     field: 'action',
@@ -299,26 +313,6 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -329,8 +323,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位代码',
+    label: '物品代码',
-    field: 'fromLocationCode',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -338,8 +332,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位组代码',
+    label: '物品名称',
-    field: 'fromLocationGroupCode',
+    field: 'itemName',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -347,8 +341,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库区代码',
+    label: '物品描述1',
-    field: 'fromAreaCode',
+    field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -356,8 +350,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到货主代码',
+    label: '物品描述2',
-    field: 'toOwnerCode',
+    field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -365,8 +359,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到器具号',
+    label: '项目代码',
-    field: 'toContainerNumber',
+    field: 'projectCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -374,8 +368,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位代码',
+    label: '数量',
-    field: 'toLocationCode',
+    field: 'qty',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -383,26 +377,30 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位组代码',
+    label: '计量单位',
-    field: 'toLocationGroupCode',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
+    label: '库存状态',
-    field: 'toAreaCode',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '单价',
+    label: '从货主代码',
-    field: 'singlePrice',
+    field: 'fromOwnerCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -410,8 +408,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '金额',
+    label: '从库位代码',
-    field: 'amount',
+    field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -419,8 +417,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
+    label: '从库位组代码',
-    field: 'remark',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -428,27 +426,17 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建时间',
+    label: '从库区代码',
-    field: 'createTime',
+    field: 'fromAreaCode',
     sort: 'custom',
-    formatter: dateFormatter,
     isSearch: true,
     table: {
-      width: 180
+      width: 150
-    },
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
     },
-    isForm: false,
   },
   {
-    label: '物品代码',
+    label: '到货主代码',
-    field: 'itemCode',
+    field: 'toOwnerCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -456,8 +444,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
+    label: '到器具号',
-    field: 'itemName',
+    field: 'toContainerNumber',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -465,8 +453,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
+    label: '到库位代码',
-    field: 'itemDesc1',
+    field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -474,8 +462,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述2',
+    label: '到库位组代码',
-    field: 'itemDesc2',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -483,8 +471,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项目代码',
+    label: '到库区代码',
-    field: 'projectCode',
+    field: 'toAreaCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -492,8 +480,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
+    label: '单价',
-    field: 'qty',
+    field: 'singlePrice',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -501,12 +489,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
+    label: '金额',
-    field: 'uom',
+    field: 'amount',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
@@ -542,6 +528,34 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -389,7 +389,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 120
+      width: 150
     },
     isForm: false
   },
@@ -472,7 +472,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTableForm: false,
     table: {
-      width: 100
+      width: 180
     },
   },
   // {
@@ -567,7 +567,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 120
+      width: 150
     },
     tableForm: {
       disabled: true
@@ -585,7 +585,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTableForm: false,
     table: {
-      width: 120
+      width: 150
     },
   },
   {