翻包记录

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@@ -106,8 +106,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-job-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts

@@ -603,22 +603,22 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '从包装号',
+  //   label: '从包装号',
-    field: 'fromPackingNumber',
+  //   field: 'fromPackingNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '到包装号',
+  //   label: '到包装号',
-    field: 'toPackingNumber',
+  //   field: 'toPackingNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '从包装规格',
     field: 'fromPackUnit',

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue

@@ -92,7 +92,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -139,7 +139,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PackageoverRecordMainApi.exportPackageoverMainApi(tableObject.params)
+    const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params)
     download.excel(data, '翻包记录.xlsx')
   } catch {
   } finally {

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@@ -11,6 +11,15 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '任务单据号',
+    field: 'jobNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '仓库代码',
     field: 'warehouseCode',
@@ -129,12 +138,6 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false
   },
-  {
-    label: '用户组',
-    field: 'userGroupCode',
-    sort: 'custom',
-    isTable:false
-  },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -154,7 +157,6 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
     sort: 'custom',
     table: {
       width: 150
@@ -214,173 +216,182 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库位代码',
+    label: '物料代码',
-    field: 'locationCode',
+    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从数量',
+    label: '物料名称',
-    field: 'fromQty',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到数量',
+    label: '物料描述1',
-    field: 'toQty',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从批次',
+    label: '物料描述2',
-    field: 'fromBatch',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到批次',
+    label: '项目代码',
-    field: 'toBatch',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库存状态',
+    label: '计量单位',
-    field: 'fromInventoryStatus',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库存状态',
+    label: '从数量',
-    field: 'toInventoryStatus',
+    field: 'fromQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
+    label: '到数量',
-    field: 'fromContainerNumber',
+    field: 'toQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到器具号',
+    label: '从包装号',
-    field: 'toContainerNumber',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
+    label: '到包装号',
-    field: 'fromOwnerCode',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
+    label: '库位代码',
-    field: 'toOwnerCode',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料代码',
+    label: '库位组代码',
-    field: 'itemCode',
+    field: 'locationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料名称',
+    label: '库区代码',
-    field: 'itemName',
+    field: 'areaCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料描述1',
+    label: '从批次',
-    field: 'itemDesc1',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料描述2',
+    label: '到批次',
-    field: 'itemDesc2',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
+    label: '从库存状态',
-    field: 'projectCode',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '计量单位',
+    label: '到库存状态',
-    field: 'uom',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -389,27 +400,27 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        style: {width:'100%'},
+  //       style: {width:'100%'},
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-    isForm: false
+  //   isForm: false
-  },
+  // },
 ]))
 
 // 表单校验