From 262c62d273cee8754e54d52a1403d57971ba5bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Wed, 29 Nov 2023 19:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E3=80=81=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRecordMain.data.ts | 318 +++++----- .../inventoryinitRequestMain.data.ts | 578 +++++++++--------- .../transferissueJobMain.data.ts | 396 ++++++------ .../transferissueRecordMain.data.ts | 324 +++++----- .../transferissueRequestMain.data.ts | 530 ++++++++-------- 5 files changed, 1073 insertions(+), 1073 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index 707f36bba..fe15f1259 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -6,41 +6,35 @@ import { dateFormatter } from '@/utils/formatTime' */ export const InventoryinitRecordMain = useCrudSchemas(reactive([ { - label: '申请单号', - field: 'requestNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true }, { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '出库事务类型', - field: 'outTransactionType', + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, + isSearch: true }, { - label: '入库事务类型', - field: 'inTransactionType', + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '执行时间', - field: 'executeTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -59,8 +53,8 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ } }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -79,8 +73,8 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ } }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -99,8 +93,8 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ } }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -119,37 +113,43 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ } }, { - label: '部门', - field: 'departmentCode', + label: '出库事务类型', + field: 'outTransactionType', sort: 'custom', table: { width: 150 }, }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, + label: '入库事务类型', + field: 'inTransactionType', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - isSearch: true }, { - label: '业务类型', - field: 'businessType', + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -269,109 +269,84 @@ export const InventoryinitRecordMainRules = reactive({ */ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ { - label: '货主代码', - field: 'ownerCode', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '包装号', - field: 'packingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '替代批次', - field: 'altBatch', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '到货日期', - field: 'arriveDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '批次', + field: 'batch', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, { - label: '过期日期', - field: 'expireDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 }, + }, + { + label: '数量', + field: 'qty', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + component: 'InputNumber', + } }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, sort: 'custom', @@ -380,44 +355,47 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '库位代码', - field: 'locationCode', + label: '标包数量', + field: 'stdPackQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '库位组代码', - field: 'locationGroupCode', + label: '标包单位', + field: 'stdPackUnit', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '库区代码', - field: 'areaCode', + label: '单价', + field: 'singlePrice', sort: 'custom', table: { width: 150 }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '金额', + field: 'amount', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '标包单位', - field: 'stdPackUnit', - dictType: DICT_TYPE.PACK_UNIT, + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', isTable: true, sort: 'custom', @@ -426,56 +404,56 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '单价', - field: 'singlePrice', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { width: 150 }, }, { - label: '金额', - field: 'amount', + label: '库位组代码', + field: 'locationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '库区代码', + field: 'areaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 }, }, - // { - // label: '任务明细ID', - // field: 'jobDetailId', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '创建时间', - field: 'createTime', + label: '替代批次', + field: 'altBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到货日期', + field: 'arriveDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -494,62 +472,84 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - }, - { - label: '物品名称', - field: 'itemName', sort: 'custom', table: { - width: 150 + width: 180 }, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, { - label: '项目代码', - field: 'projectCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '数量', - field: 'qty', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'InputNumber', - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 534413c6a..c8a79a77d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -34,31 +34,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 库存初始化申请主表 */ export const InventoryinitRequestMain = useCrudSchemas(reactive([ - { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '仓库信息', // 查询弹窗标题 - searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 - searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, { label: '单据号', field: 'number', @@ -71,59 +46,47 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '业务类型', - field: 'businessType', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, form: { - value: 'InventoryInitial', + value: '1', componentProps: { disabled: true } - }, - isForm: false, + } }, { - label: '备注', - field: 'remark', + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 }, - isTable: false, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, + isSearch: true, form: { - component: 'DatePicker', + // labelMessage: '信息提示说明！！！', componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '仓库信息', // 查询弹窗标题 + searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } - }, - isForm: false, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, + } }, { label: '申请时间', @@ -169,68 +132,34 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, form: { - value: userDept.name, + value: 'InventoryInitial', componentProps: { disabled: true } - } + }, + isForm: false, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, form: { - value: '1', + value: userDept.name, componentProps: { disabled: true } } }, - { - 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, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '自动提交', field: 'autoCommit', @@ -311,6 +240,77 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + 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: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + 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, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, { label: '操作', field: 'action', @@ -353,19 +353,33 @@ export const InventoryinitRequestMainRules = reactive({ */ export const InventoryinitRequestDetail = useCrudSchemas(reactive([ { - label: '货主代码', - field: 'ownerCode', + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择货主代码', + searchListPlaceholder: '请选择物品代码', searchField: 'code', - searchTitle: '货主信息', - searchAllSchemas: Owner.allSchemas, - searchPage: OwnerApi.getOwnerPage, + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -376,11 +390,11 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择货主代码', + searchListPlaceholder: '请选择物品代码', searchField: 'code', - searchTitle: '货主信息', - searchAllSchemas: Owner.allSchemas, - searchPage: OwnerApi.getOwnerPage, + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -390,114 +404,130 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, { - label: '包装号', - field: 'packingNumber', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, + isTableForm: false, + isForm: false }, { - label: '器具号', - field: 'containerNumber', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, + isTableForm: false, + isForm: false }, { - label: '批次', - field: 'batch', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, + isTableForm: false, + isForm: false }, { - label: '替代批次', - field: 'altBatch', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到货日期', - field: 'arriveDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 }, + }, + { + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { - width: 180 + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 }, form: { - component: 'DatePicker', + component: 'InputNumber', componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + min: 1, + precision: 6 } }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + type: 'InputNumber', + min: 1, + precision: 6 } }, { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + type: 'Select' } }, { - label: '过期日期', - field: 'expireDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '标包数量', + field: 'stdPackQty', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + component: 'InputNumber', componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + min: 1, + precision: 6 } }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false, + }, + { + label: '标包单位', + field: 'stdPackUnit', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select' + }, + isTableForm: false, + isForm: false, }, { label: '库存状态', @@ -571,71 +601,19 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } - }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6 - }, - isTableForm: false, - isForm: false, - }, - { - label: '标包单位', - field: 'stdPackUnit', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select' - }, - isTableForm: false, - isForm: false, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物品代码', - field: 'itemCode', + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 }, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', + searchListPlaceholder: '请选择货主代码', searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, + searchTitle: '货主信息', + searchAllSchemas: Owner.allSchemas, + searchPage: OwnerApi.getOwnerPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -646,11 +624,11 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', + searchListPlaceholder: '请选择货主代码', searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, + searchTitle: '货主信息', + searchAllSchemas: Owner.allSchemas, + searchPage: OwnerApi.getOwnerPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -660,16 +638,26 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, { - label: '备注', - field: 'remark', + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '替代批次', + field: 'altBatch', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', + label: '到货日期', + field: 'arriveDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -687,92 +675,104 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, - isTableForm: false, - isForm: false + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - isTableForm: false, - isForm: false - }, - { - label: '物品名称', - field: 'itemName', sort: 'custom', table: { - width: 150 + width: 180 }, - isTableForm: false, - isForm: false - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, - isTableForm: false, - isForm: false + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { - label: '物品描述2', - field: 'itemDesc2', + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, - isTableForm: false, - isForm: false + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { - label: '项目代码', - field: 'projectCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false }, { - label: '数量', - field: 'qty', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'InputNumber', + component: 'DatePicker', componentProps: { - min: 1, - precision: 6 + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6 - } + isTableForm: false, + isForm: false }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' - } + isTableForm: false, + isForm: false }, { label: '最后更新时间', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts index a29fdf271..e1c0bef7b 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts @@ -6,81 +6,63 @@ import { dateFormatter } from '@/utils/formatTime' */ export const TransferissueJobMain = useCrudSchemas(reactive([ { - label: '申请单号', - field: 'requestNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true, }, { - label: '发货月台', - field: 'deliverDock', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '运输方式', - field: 'transferMode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '车牌号', - field: 'vehiclePlateNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '从仓库代码', - field: 'fromWarehouseCode', + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, + isSearch: true, }, { - label: '到仓库代码', - field: 'toWarehouseCode', + label: '发货月台', + field: 'deliverDock', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码范围', - field: 'fromAreaCodes', + label: '承运商', + field: 'carrierCode', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '运输方式', + field: 'transferMode', sort: 'custom', table: { width: 150 }, }, { - label: '从月台代码', - field: 'fromDockCode', + label: '车牌号', + field: 'vehiclePlateNumber', sort: 'custom', table: { width: 150 @@ -126,18 +108,6 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', @@ -158,42 +128,6 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ } }, }, - { - 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', - } - }, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: '状态', - // field: 'jobStageStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '优先级', field: 'priority', @@ -217,67 +151,35 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ } }, { - label: '部门', - field: 'departmentCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '承接人', - field: 'acceptUserId', + label: '到仓库代码', + field: 'toWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '承接时间', - field: 'acceptTime', - 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: 'completeUserId', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '完成时间', - field: 'completeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, { @@ -304,18 +206,8 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isSearch: true, - }, - { - label: '业务类型', - field: 'businessType', + label: '从月台代码', + field: 'fromDockCode', sort: 'custom', table: { width: 150 @@ -330,28 +222,16 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '业务类型', + field: 'businessType', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 @@ -547,6 +427,126 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ } } }, + // { + // label: '状态', + // field: 'jobStageStatus', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '承接时间', + field: 'acceptTime', + 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: 'acceptUserId', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '完成时间', + field: 'completeTime', + 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: 'completeUserId', + 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: 'creator', + 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', + } + }, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '操作', field: 'action', @@ -625,137 +625,137 @@ export const TransferissueJobMainRules = reactive({ */ export const TransferissueJobDetail = useCrudSchemas(reactive([ { - label: '包装号', - field: 'packingNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '数量', + field: 'qty', + form: { + component: 'InputNumber', + }, sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '数量', - field: 'qty', - form: { - component: 'InputNumber', - }, + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 87a7875bf..fa5c7619c 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 调拨出库记录主表 */ export const TransferissueRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -48,86 +58,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '执行时间', - field: 'executeTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -146,8 +78,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -166,8 +98,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -186,8 +118,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -206,17 +138,25 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -225,14 +165,55 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 + }, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从月台代码', + field: 'fromDockCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 }, - isSearch: true }, { label: '业务类型', @@ -243,16 +224,27 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 @@ -278,6 +270,14 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -370,6 +370,68 @@ export const TransferissueRecordMainRules = reactive({ * @returns {Array} 调拨出库记录子表 */ export const TransferissueRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '从包装号', field: 'fromPackingNumber', @@ -493,22 +555,6 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', @@ -553,30 +599,6 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '项目代码', field: 'projectCode', @@ -585,28 +607,6 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, // { // label: '代码', // field: 'code', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index c15d531d5..8424b14bc 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -31,6 +31,35 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 调拨出库申请主表 */ export const TransferissueRequestMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isForm: false, + isSearch: true, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '承运商', field: 'carrierCode', @@ -72,6 +101,49 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '申请时间', + field: 'requestTime', + 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: 'dueTime', + 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', + } + }, + }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -157,17 +229,6 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } } }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, { label: '业务类型', field: 'businessType', @@ -183,89 +244,6 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '创建时间', - field: 'createTime', - 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: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '申请时间', - field: 'requestTime', - 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: 'dueTime', - 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', - } - }, - }, { label: '部门', field: 'departmentCode', @@ -280,55 +258,6 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } } }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: '1', - componentProps: { - disabled: true - } - } - }, - { - 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, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '自动提交', field: 'autoCommit', @@ -410,16 +339,87 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } }, { - label: '操作', - field: 'action', - isDetail: false, + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + 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: 'creator', + sort: 'custom', table: { - width: 300, - fixed: 'right' + width: 150 }, - } -])) + isForm: false, + }, + { + 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, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } +])) //表单校验 export const TransferissueRequestMainRules = reactive({ @@ -466,46 +466,22 @@ export const TransferissueRequestMainRules = reactive({ */ export const TransferissueRequestDetail = useCrudSchemas(reactive([ { - label: '包装号', - field: 'packingNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePage - }, + isTableForm: false, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePage + disabled: true } } }, { - label: '器具号', - field: 'containerNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - } - }, - { - label: '批次', - field: 'batch', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 @@ -515,147 +491,163 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( } }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true, - type: 'Select' - } + isTableForm: false, + isForm: false }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, isTableForm: false, - isForm: false, + isForm: false }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, isTableForm: false, - isForm: false, + isForm: false }, { - label: '到库位代码', - field: 'toLocationCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true, + disabled: true } }, { - label: '单据号', - field: 'number', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, - isTableForm: false, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, form: { + // labelMessage: '信息提示说明！！！', componentProps: { - disabled: true + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage } } }, { - label: '备注', - field: 'remark', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, - isTable: false, + tableForm: { + disabled: true + } }, { - label: '创建者', - field: 'creator', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6, + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6, + }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, - isTableForm: false, - isForm: false + tableForm: { + type: 'Select' + } }, { - label: '物品代码', - field: 'itemCode', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true + disabled: true, } }, { - label: '物品名称', - field: 'itemName', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false + tableForm: { + disabled: true, + type: 'Select' + } }, { - label: '物品描述1', - field: 'itemDesc1', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, isTableForm: false, - isForm: false + isForm: false, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, isTableForm: false, - isForm: false + isForm: false, }, { label: '项目代码', @@ -668,42 +660,40 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( isForm: false }, { - label: '数量', - field: 'qty', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6, - } - }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6, - }, + isTable: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, - tableForm: { - type: 'Select' - } + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isTableForm: false, + isForm: false }, { - label: '最后更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 @@ -734,6 +724,16 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, { label: '操作', field: 'action',