From 11ff16784103194ce95e88428d94e5bdbf586cf4 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 8 Nov 2024 14:33:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E7=89=A9=E6=96=99=E9=80=89=E4=B8=8D=E4=B8=8A=20YT-652?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 7a08520db..aa59a0c38 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -123,7 +123,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['packingNumber'] = item['packingNumber'] newRow['containerNumber'] = item['containerNumber'] newRow['batch'] = item['batch'] - newRow['qty'] = item[0]['qty'] + newRow['qty'] = item['qty'] newRow['inventoryStatus'] = item['inventoryStatus'] newRow['fromLocationCode'] = item['locationCode'] newRow['itemCode'] = item['itemCode'] From a1e5db511884ad37f39e186395c7e51e050a6673 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 14:48:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8F=B7=E8=AF=95=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptJobDetail/index.ts | 15 +- src/api/wms/purchasereceiptJobMain/index.ts | 14 +- .../wms/purchasereceiptRecordDetail/index.ts | 14 +- .../wms/purchasereceiptRecordMain/index.ts | 16 +- .../wms/purchasereceiptRequestDetail/index.ts | 18 +- .../wms/purchasereceiptRequestMain/index.ts | 16 +- .../developPurchasereceiptJobMain/index.vue | 428 +++ .../purchasereceiptJobMain.data.ts | 1590 +++++++++++ .../index.vue | 475 ++++ .../purchasereceiptRecordMain.data.ts | 2037 +++++++++++++ .../index.vue | 915 ++++++ .../purchasereceiptRequestMain.data.ts | 2532 +++++++++++++++++ 12 files changed, 8056 insertions(+), 14 deletions(-) create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue create mode 100644 src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts index 547d7c9c6..420ec63a4 100644 --- a/src/api/wms/purchasereceiptJobDetail/index.ts +++ b/src/api/wms/purchasereceiptJobDetail/index.ts @@ -48,13 +48,24 @@ export const getPurchasereceiptJobDetailPage = async (params) => { export const getToolPurchasereceiptJobDetailPage = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 + return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) + } +} + +// 查询号试品收货任务子列表 +export const getDevelopPurchasereceiptJobDetailPage = async (params) => { + if (params.isSearch) { + params.source_type = "Develop" + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data }) + } else { + params.sourceType = "Develop" return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) } } diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index b357846d9..d9f182a32 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -104,12 +104,22 @@ export const exportPurchasereceiptJobMain = async (params) => { export const exportToolPurchasereceiptJobMain = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 + return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) + } +} + +// 导出号试品收货任务主 Excel +export const exportDevelopPurchasereceiptJobMain = async (params) => { + if (params.isSearch) { + params.source_type = "Develop" + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data }) + } else { + params.sourceType = "Develop" return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) } } diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index e7f56eaf3..b7f2602b4 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -65,13 +65,23 @@ export const getPurchasereceiptRecordDetailPage = async (params) => { export const getToolPurchasereceiptRecordDetailPage = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 delete params.isSearch const data = { ...params } return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 + return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) + } +} +// 查询号试品收货记录子列表 +export const getDevelopPurchasereceiptRecordDetailPage = async (params) => { + if (params.isSearch) { + params.source_type = "Develop" + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data }) + } else { + params.sourceType = "Develop" return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) } } diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 0428e423e..ed9bc0861 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -88,16 +88,26 @@ export const exportPurchasereceiptRecordMain = async (params) => { return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) } } -// 导出采购收货记录主 Excel +// 导出协定品收货记录主 Excel export const exportToolPurchasereceiptRecordMain = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + } +} + +// 导出号试品收货记录主 Excel +export const exportDevelopPurchasereceiptRecordMain = async (params) => { + if (params.isSearch) { + params.source_type = "Develop" + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) + } else { + params.sourceType = "Develop" return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) } } diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index 15f80d24d..3d55b6d0d 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -51,17 +51,31 @@ export const getTOOLPurchasereceiptRequestDetailPage = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params }) } } + +// 查询号试品收货申请子列表 +export const getDevelopPurchasereceiptRequestDetailPage = async (params) => { + + if (params.isSearch) { + params.source_type = "Develop" + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data }) + } else { + params.sourceType = "Develop" + return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params }) + } +} + + // 查询备件收货申请子列表 export const getPurchasereceiptRequestDetailPageSpare = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index 92ba0b6ef..d2a98945c 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -88,16 +88,26 @@ export const exportPurchasereceiptRequestMain = async (params) => { } } -// 导出采购收货申请主 Excel +// 导出协定品收货申请主 Excel export const exportToolPurchasereceiptRequestMain = async (params) => { if (params.isSearch) { params.source_type = "TOOL" - params.order_type_m = 2 const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" - params.orderTypeM = 2 + return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) + } +} + +// 导出号试品收货申请主 Excel +export const exportDevelopPurchasereceiptRequestMain = async (params) => { + if (params.isSearch) { + params.source_type = "Develop" + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data }) + } else { + params.sourceType = "Develop" return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) } } diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue new file mode 100644 index 000000000..9d57dd1f6 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue @@ -0,0 +1,428 @@ + + + diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts new file mode 100644 index 000000000..3349d2e31 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -0,0 +1,1590 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' +import { fa } from 'element-plus/es/locale' +import { DICT_TYPE } from '@/utils/dict' + +/** + * @returns {Array} 采购收货任务主表 + */ +export const PurchasereceiptJobMain = useCrudSchemas( + reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isSearch: true, + sortSearchDefault: 1 + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: false, + sortTableDefault: 2 + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 3, + isSearch: true + }, + { + label: '要货计划单号', + field: 'ppNumber', + sort: 'custom', + isTable: false, + table: { + width: 180 + } + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortSearchDefault: 2 + }, + { + label: '到月台代码', + field: 'toDockCode', + sort: 'custom', + isTable: false, + table: { + width: 150 + } + }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1010 + }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: 'ASN_ExternalReceipt', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1011 + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1012 + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + isTable: false, + table: { + width: 150 + } + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + //formatter: dateFormatter, + detail: { + //dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x' + // } + } + }, + { + label: '申请时间', + field: 'requestTime', + sort: 'custom', + isTable: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '要求截止时间', + field: 'requestDueTime', + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.PURCHASE_JOB_STATUS, + dictClass: 'string', + isSearch: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 6 + }, + { + label: '过期时间', + field: 'expiredTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + // { + // label: '状态', + // field: 'jobStageStatus', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '优先级', + field: 'priority', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber' + } + }, + { + label: '优先级增量', + field: 'priorityIncrement', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber' + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '岗位', + field: 'userPositionCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '承接人', + field: 'acceptUserName', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '承接时间', + field: 'acceptTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '完成人', + field: 'completeUserName', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '完成时间', + field: 'completeTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + // { + // label: '创建者', + // field: 'creator', + // 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 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: true, + 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')] + } + }, + }, + { + label: '自动完成', + field: 'autoComplete', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许修改库位', + field: 'allowModifyLocation', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许修改数量', + field: 'allowModifyQty', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许大于推荐数量', + field: 'allowBiggerQty', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许小于推荐数量', + field: 'allowSmallerQty', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许修改库存状态', + field: 'allowModifyInventoryStatus', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许连续扫描', + field: 'allowContinuousScanning', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许部分完成', + field: 'allowPartialComplete', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许修改批次', + field: 'allowModifyBatch', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '允许修改箱码', + field: 'allowModifyPackingNumber', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 180 + } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 250, + fixed: 'right' + } + }, + { + label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面 + field: 'batch', + sort: 'custom', + isForm: false, + isTableForm: false, + table: { + width: 150 + }, + sortTableDefault: 1001 + }, + { + label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面 + field: 'packingNumber', + sort: 'custom', + isForm: false, + isTableForm: false, + table: { + width: 150 + }, + sortTableDefault: 1001 + }, + + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isTable:false, + }, + // { + // label: '创建者', + // field: 'creator', + // table: { + // width: 130 + // }, + // isForm: false, + // isTable: true + // } + ]) +) + +//表单校验 +export const PurchasereceiptJobMainRules = reactive({ + requestNumber: [{ required: true, message: '请选择申请单号', trigger: 'change' }], + supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], + toWarehouseCode: [{ required: true, message: '请选择到仓库代码', trigger: 'change' }], + toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }], + requestTime: [{ required: true, message: '请输入申请时间', trigger: 'change' }], + requestDueTime: [{ required: true, message: '请输入要求截止时间', trigger: 'change' }], + status: [{ required: true, message: '请选择状态', trigger: 'change' }], + // jobStageStatus: [ + // { required: true, message: '请选择阶段状态', trigger: 'change' } + // ], + priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }], + priorityIncrement: [{ required: true, message: '请输入优先级增量', trigger: 'blur' }], + departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }], + userPositionCode: [{ required: true, message: '请输入岗位', trigger: 'blur' }], + number: [{ required: true, message: '请输入单据号', trigger: 'blur' }], + businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }], + createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }], + creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }] +}) + +/** + * @returns {Array} 采购收货任务子表 + */ +export const PurchasereceiptJobDetail = useCrudSchemas( + reactive([ + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + hiddenInMain: true, + sortTableDefault: 1002, + sortSearchDefault: 1002 + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1002 + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + sortTableDefault: 1002 + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // hiddenInMain: true, + // table: { + // width: 150 + // }, + // isTable: false + // }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 1000, + isSearch: true, + hiddenInMain: true, + sortTableDefault: 8 + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // hiddenInMain: true + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 1005, + hiddenInMain: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 1005, + hiddenInMain: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 1005, + hiddenInMain: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1006 + }, + // { + // label: '来源库位', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1007 + // }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1007 + }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault: 6 + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 6 + }, + { + label: '行类型', + field: 'poLineType', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 6, + hiddenInMain: true, + isForm: false, + tableForm: { + disabled: true + } + }, + + { + label: '供应商计量数量', + field: 'supplierQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1009, + hiddenInMain: true, + form: { + component: 'InputNumber' + } + }, + { + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1009, + hiddenInMain: true + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + sortTableDefault: 1009, + hiddenInMain: true + }, + { + label: '从货主', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1008 + }, + { + label: '到货主', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1008 + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 7, + isSearch: true + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 7 + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 7 + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 7 + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1010 + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1004 + }, + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1004 + }, + { + label: '收货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + sortTableDefault: 1004 + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber' + }, + sortTableDefault: 1004 + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain: true, + sortTableDefault: 1011 + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1012, + hiddenInMain: true + }, + { + 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' + } + }, + hiddenInMain: false, + sortTableDefault: 1012 + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: false, + sortTableDefault: 1012 + }, + { + label: '操作', + hiddenInMain: true, + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 180, + fixed: 'right' + }, + isTableForm: true + } + ]) +) + +//表单校验 +export const PurchasereceiptJobDetailRules = reactive({ + packingNumber: [{ required: true, message: '请选择包装号', trigger: 'change' }], + batch: [{ required: true, message: '请输入批次', trigger: 'blur' }], + arriveDate: [{ required: true, message: '请输入到货日期', trigger: 'change' }], + produceDate: [{ required: true, message: '请输入生产日期', trigger: 'change' }], + expireDate: [{ required: true, message: '请输入过期日期', trigger: 'change' }], + inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'change' }], + poNumber: [{ required: true, message: '请选择订单号', trigger: 'change' }], + poLine: [{ required: true, message: '请输入订单行', trigger: 'blur' }], + packQty: [{ required: true, message: '请输入包装数量', trigger: 'blur' }], + packUnit: [{ required: true, message: '请选择包装规格', trigger: 'change' }], + convertRate: [{ required: true, message: '请输入转换率', trigger: 'blur' }], + toLocationCode: [{ required: true, message: '请选择到库位代码', trigger: 'change' }], + number: [{ required: true, message: '请输入单据号', trigger: 'blur' }], + itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }], + createTime: [{ required: true, message: '请输入创建时间', trigger: 'blur' }], + creator: [{ required: true, message: '请输入创建者', trigger: 'blur' }] +}) + +/** + * @returns {Array} 采购收货任务子表 + */ +export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas( + reactive([ + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled: true + // } + // }, + // tableForm: { + // disabled: true + // } + // }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled: true + // } + // }, + // tableForm: { + // disabled: true + // } + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + }, + tableForm: { + disabled: true + } + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + }, + tableForm: { + disabled: true, + type: 'FormDate', + valueFormat: 'x' + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + }, + tableForm: { + disabled: true, + type: 'FormDate', + valueFormat: 'x' + } + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + tableForm: { + disabled: true + } + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '供应商计量数量', + field: 'supplierQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + tableForm: { + disabled: true + } + }, + { + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + tableForm: { + disabled: true + } + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + }, + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + tableForm: { + disabled: true + } + }, + { + label: '备注', + fiield: 'remark', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + 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' + } + }, + tableForm: { + disabled: true, + type: 'FormDate', + valueFormat: 'x' + } + } + ]) +) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue new file mode 100644 index 000000000..b7690876d --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -0,0 +1,475 @@ + + + diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts new file mode 100644 index 000000000..a0fb7f5ab --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -0,0 +1,2037 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' + + + +/** + * @returns {Array} 采购收货记录主表 + */ +export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isSearch: true, + sortSearchDefault:1, + sortTableDefault:1 + + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:2 + }, + { + label: '任务单号', + field: 'jobNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:3 + }, + { + label: '备注', + field: 'mainRemark', + sort: 'custom', + table: { + width: 180 + }, + isSearch: false, + sortTableDefault:3 + }, + { + label: '明细备注', + field: 'remark', + sort: 'custom', + table: { + width: 180 + }, + isSearch: false, + sortTableDefault:3 + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:4, + isSearch: true + }, + { + label: 'ERP单据号(无用)', + field: 'erpNumber', + isTable:false, + isTableForm:false, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: 'ERP单据号', + field: 'qadNumber', + sort: 'custom', + table: { + width: 200 + }, + sortTableDefault:5, + }, + { + label: '要货计划单号', + field: 'ppNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable:false + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortSearchDefault:2, + isTable:false + }, + { + label: '到月台代码', + field: 'toDockCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: 'ASN_ExternalReceipt', + componentProps: { + disabled: true + } + }, + isSearch: false, + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '出库事务类型', + field: 'outTransaction', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '入库事务类型', + field: 'inTransaction', + sort: 'custom', + table: { + width: 150 + }, + isTable:false + }, + { + label: '执行时间', + field: 'executeTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '生效日期', + field: 'activeDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + }, + { + label: '申请时间', + field: 'requestTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + }, + // { + // label: '备注', + // field: 'mainRemark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:true, + // }, + { + label: '创建者', + field: 'creator', + 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 + }, + isTable: false, + isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, + { + label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 + field: 'fromBatch', + sort: 'custom', + isForm:false, + isTableForm:false, + table: { + width: 150 + }, + sortTableDefault:12, + }, + { + label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面 + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:16, + }, + { + label: '检验申请单号', + field: 'inspectNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:6, + }, + { + label: '发货数量', + field: 'shippedQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + }, + { + label: '收货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, +])) + +// 表单校验 +export const PurchasereceiptRecordMainRules = reactive({ + requestNumber: [ + { required: true, message: '请选择申请单号', trigger: 'change' } + ], + supplierCode: [ + { required: true, message: '请选择供应商代码', trigger: 'change' } + ], + toWarehouseCode: [ + { required: true, message: '请选择到仓库代码', trigger: 'change' } + ], + toAreaTypes: [ + { required: true, message: '请选择到库位类型服务', trigger: 'change' } + ], + outTransaction: [ + { required: true, message: '请输入出库事务类型', trigger: 'blur' } + ], + inTransaction: [ + { required: true, message: '请输入入库事务类型', trigger: 'blur' } + ], + executeTime: [ + { required: true, message: '请输入执行时间', trigger: 'change' } + ], + activeDate: [ + { required: true, message: '请输入生效日期', trigger: 'change' } + ], + available: [ + { required: true, message: '请输入是否可用', trigger: 'blur' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + interfaceType: [ + { required: true, message: '请选择接口类型', trigger: 'change' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], + createTime: [ + { required: true, message: '请选择创建时间', trigger: 'change' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 采购收货记录子表 + */ +export const PurchasereceiptRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + }, + sortTableDefault:1998, + hiddenInMain:true + }, + { + label: '检验申请单号', + field: 'inspectNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + sortTableDefault:6, + }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault:5, + sortTableDefault:7, + isSearch: true + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault:5, + sortTableDefault:8, + }, + { + label: '行类型', + field: 'poLineType', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:9, + hiddenInMain:true, + isForm: false, + tableForm:{ + disabled: true + }, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:10, + isSearch: true + }, + { + label: '是否已发送检验申请', + field: 'inspectRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '是否已生成上架申请', + field: 'putawayRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '物料类型', + field: 'itemType', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isSearch: true, + isTable:false, + isDetail:false, + search:{ + componentProps:{ + multiple:true, + } + } + + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:10, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:11, + hiddenInMain:true + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:11, + hiddenInMain:true + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:14, + hiddenInMain:true + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:14, + hiddenInMain:true + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain:true + // }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:15, + hiddenInMain:true + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:15, + hiddenInMain:true + }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain:true + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain:true + // }, + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + hiddenInMain:true, + sortTableDefault:1004 + }, + { + label: '收货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault:12, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + form: { + component: 'InputNumber', + }, + sortTableDefault:12, + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:16, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + tableForm: { + disabled: true, + }, + isForm:false, + sortTableDefault:16, + }, + { + label: '供应商计量数量', + field: 'supplierQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + sortTableDefault:24, + hiddenInMain:true + }, + { + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:24, + hiddenInMain:true + }, + + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:18, + hiddenInMain:true + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:18, + + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:18, + }, + { + label: '从库位组', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:19, + hiddenInMain:true + }, + { + label: '到库位组', + field: 'toLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:19, + hiddenInMain:true + }, + { + label: '从库区', + field: 'fromAreaCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:22, + hiddenInMain:true, + }, + { + label: '到库区', + field: 'toAreaCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:22, + hiddenInMain:true + }, + { + label: '从货主', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:23, + hiddenInMain:true + }, + { + label: '到货主', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:23, + hiddenInMain:true + }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + sortTableDefault:17, + hiddenInMain:true + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + sortTableDefault:17, + hiddenInMain:true + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + sortTableDefault:17, + hiddenInMain:true + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + sortTableDefault:1997, + hiddenInMain:true + }, + { + label: '目检结果', + field: 'visualInspectResult', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + hiddenInMain:true + }, + { + label: '目检照片', + field: 'visualInspectPhotos', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + hiddenInMain:true + }, + { + label: '不合格原因', + field: 'failedReason', + dictType: DICT_TYPE.PURCHASE_RETURN_REASON, + dictClass: 'string', + isTable:false, + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true + }, + { + label: '单价', + field: 'singlePrice', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + isTable:false, + hiddenInMain:true + }, + { + label: '金额', + field: 'amount', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + isTable:false, + hiddenInMain:true + }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1998, + hiddenInMain:true + }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + hiddenInMain:true + }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // sortTableDefault:2000, + // }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault:2000, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + sortTableDefault:2000, + }, + + { + label: '操作', + hiddenInMain:true, + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:true, + } +])) + +// 表单校验 +export const PurchasereceiptRecordDetailRules = reactive({ + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], + toPackingNumber: [ + { required: true, message: '请选择到包装号', trigger: 'change' } + ], + fromBatch: [ + { required: true, message: '请输入从批次', trigger: 'blur' } + ], + toBatch: [ + { required: true, message: '请输入到批次', trigger: 'blur' } + ], + arriveDate: [ + { required: true, message: '请选择到货日期', trigger: 'change' } + ], + produceDate: [ + { required: true, message: '请选择生产日期', trigger: 'change' } + ], + expireDate: [ + { required: true, message: '请选择过期日期', trigger: 'change' } + ], + inventoryStatus: [ + { required: true, message: '请选择库存状态', trigger: 'change' } + ], + toLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'change' } + ], + toLocationGroupCode: [ + { required: true, message: '请选择到库位组代码', trigger: 'change' } + ], + toAreaCodes: [ + { required: true, message: '请选择到库区代码', trigger: 'change' } + ], + poNumber: [ + { required: true, message: '请选择订单号', trigger: 'change' } + ], + poLine: [ + { required: true, message: '请选择订单行', trigger: 'change' } + ], + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } + ], + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } + ], + convertRate: [ + { required: true, message: '请输入转换率', trigger: 'blur' } + ], + visualInspectResult: [ + { required: true, message: '请选择目检结果', trigger: 'change' } + ], +}) + + +/** + * @returns {Array} 采购收货记录子表-子包装数据 + */ +export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + hiddenInMain:true, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled:true + // } + // }, + // tableForm: { + // disabled: true, + // } + // }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled:true + // } + // }, + // tableForm: { + // disabled: true, + // } + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled:true + // } + // }, + // tableForm: { + // disabled: true, + // } + // }, + { + label: '数量123', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + + }, + { + label: '供应商计量数量', + field: 'supplierQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '从库位组代码', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + sortTableDefault:21, + tableForm: { + disabled: true, + } + }, + { + label: '到库位组代码', + field: 'toLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + sortTableDefault:21, + tableForm: { + disabled: true, + } + }, + { + label: '从库区代码', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到库区代码', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm: { + disabled: true, + type:'FormDate', + valueFormat: 'x', + } + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm: { + disabled: true, + type:'FormDate', + valueFormat: 'x', + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm: { + disabled: true, + type:'FormDate', + valueFormat: 'x', + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '目检结果', + field: 'visualInspectResult', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '目检照片', + field: 'visualInspectPhotos', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '不合格原因', + field: 'failedReason', + dictType: DICT_TYPE.PURCHASE_RETURN_REASON, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '单价', + field: 'singlePrice', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '金额', + field: 'amount', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // form: { + // componentProps: { + // disabled:true + // } + // }, + // tableForm: { + // disabled: true, + // } + // } +])) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue new file mode 100644 index 000000000..de3fdfd3c --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue @@ -0,0 +1,915 @@ + + + diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts new file mode 100644 index 000000000..211ddf776 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -0,0 +1,2532 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as SupplierApi from '@/api/wms/supplier' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import * as PurchaseMainApi from '@/api/wms/purchaseMain' +import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' +import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' +import { useUserStore } from '@/store/modules/user' + + +const { t } = useI18n() // 国际化 +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'PurchaseReceiptRequest' +} +const data = await getRequestsettingApi.getRequestsettingPage(queryParams) +const requestsettingData =data?.list[0]||{} + + +// 获取当前操作人的部门 +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] + +/** + * @returns {Array} 采购收货申请主表 + */ +export const PurchasereceiptRequestMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + sortSearchDefault:1, + isForm: false, + isSearch: true, + }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch:true, + sortTableDefault:4, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择采购订单', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '采购订单信息', // 查询弹窗标题 + isConcatDetailSchemas:true,//是否是主子表合并 默认false + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法 + isEnter:true, + searchCondition: [{ + key:'status', + value:'2', + message: '已发布状态', + isMainValue: false + }, + { + key: 'status', // 查询列表中字段 + value: '2', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + }, + isForm: true, + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch:true, + sortSearchDefault:3, + isForm: true, + sortTableDefault:2 + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + sortTableDefault:1, + table: { + width: 150 + }, + isSearch: true, + sortSearchDefault:2, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 + } + } + }, + // { + // label: '要货计划单号', + // field: 'ppNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本 + // searchField: 'number', // 查询弹窗赋值字段 + // searchTitle: '要货计划信息', // 查询弹窗标题 + // searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类 + // searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'supplierCode', + // value: 'supplierCode', + // message: '请填写供应商代码！', + // isMainValue: true + // }, + // { + // key: 'status', + // value: 4, + // isMainValue: false + // }, + // { + // key: 'available', + // value: "TRUE", + // isMainValue: false + // }] + // } + // }, + // isForm: true, + // }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: 'ASN_ExternalReceipt', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + isTable:false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + isTable:false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '到月台代码', + field: 'toDockCode', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + form: { + value: 'PurchaseReceipt', + componentProps: { + disabled: true + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isSearch: true, + 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')] + } + }, + + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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', + isDetail: true, + isForm: false, + isTable: false, + table: { + 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, + isTable: 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', + // sort: 'custom', + // table: { + // width: 150 + // }, + // formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + // return userDeptArray.find((account) => account.id == cellValue)?.name + // }, + // form: { + // value: userDept.id, + // component: 'Select', + // api: () => userDeptArray, + // componentProps: { + // disabled: true, + // optionsAlias: { + // labelField: 'name', + // valueField: 'id' + // } + // } + // } + // }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: false, + isTable: true, + sortTableDefault:3, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'FALSE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true, + } + } + }, + { + label: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'FALSE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true, + } + } + }, + { + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'FALSE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true, + } + } + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true, + } + } + }, + { + label: '标签状态', + field: 'labelStatus', + sort: 'custom', + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string', + table: { + width: 150 + }, + isForm: false, + isTable: false, + isSearch: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + } +])) + +//表单校验 +export const PurchasereceiptRequestMainRules = reactive({ + ppNumber: [ + { required: true, message: '请输入采购订单', trigger: 'blur' } + ], + poNumber: [ + { required: true, message: '请选择采购订单号', trigger: 'blur' } + ], + toWarehouseCode: [ + { required: true, message: '请输入到仓库代码', trigger: 'blur' } + ], + toAreaTypes: [ + { required: true, message: '请输入到库区类型范围', trigger: 'blur' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + autoCommit: [ + { required: true, message: '请选择是否自动提交', trigger: 'change' } + ], + autoAgree: [ + { required: true, message: '请选择是否自动通过', trigger: 'change' } + ], + autoExecute: [ + { required: true, message: '请选择是否自动执行', trigger: 'change' } + ], + directCreateRecord: [ + { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 采购收货申请子表 + */ +export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ + + { + label: '订单号', + field: 'poNumber', + hiddenInMain:true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + isConcatDetailSchemas:true,//是否是主子表合并 默认false + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, + searchCondition: [ + { + key:'number', + value:'poNumber', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isFormModel:true, + required:true, + message:'请选择采购订单号', + isMainValue: false + }, + { + key: 'status', // 查询列表中字段 + value: '2', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单类型', + field: 'type', + dictType: DICT_TYPE.WORK_ORDER_TYPE, + dictClass: 'string', + isSearch: false, + isTable: false, + isTableForm: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isForm: false, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + multiple:true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '行类型', + field: 'poLineType', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:5, + hiddenInMain:true, + isForm: false, + tableForm:{ + disabled: true + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch:true, + sortTableDefault:6, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + isTableForm: false, + isForm: false + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // isTable:false, + // isTableForm: false, + // isForm: false + // }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 1, + // precision: 6 + // }, + // }, + // tableForm: { + // type: 'InputNumber', + // min: 1, + // precision: 6 + // } + // }, + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + hiddenInMain: true, + sortTableDefault:9, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '收货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:9, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + }, + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:10, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + hiddenInMain:true, + sortTableDefault:11, + isForm: false + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + isTableForm: false, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + sortTableDefault:11, + tableForm:{ + disabled:true + }, + isForm: true + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:11, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: false, + isForm: true + }, + { + label: '到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'businessType', + value: 'PurchaseReceipt', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'businessType', + value: 'PurchaseReceipt', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + isTableForm: true, + isForm: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + hiddenInMain:true, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + hiddenInMain:true, + form: { + component: 'InputNumber', + componentProps: { + min: 0 + }, + }, + isTableForm: false, + isForm: false + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:11, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain:true, + sortTableDefault:11, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + sortTableDefault:8, + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + sortTableDefault:11, + table: { + width: 180 + }, + isTable:true, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + // tableForm:{ + // type:'FormDate', + // placeholder: '请选择过期日期', + // valueFormat: 'x', + // }, + tableForm:{ + type: 'slot', + disabled: true + } + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + hiddenInMain:true, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + // { + // label: '从库位代码', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:12, + // isTableForm: false, + // isForm: false + // }, + + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain:true, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isTableForm: false, + isForm: false + }, + { + label: '操作', + hiddenInMain:true, + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } +])) + +//表单校验 +export const PurchasereceiptRequestDetailRules = reactive({ + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], + produceDate: [ + { required: true, message: '请输入生产日期', trigger: 'change' } + ], + arriveDate: [ + { required: true, message: '请输入到货日期', trigger: 'change' } + ], + expireDate: [ + { required: true, message: '请输入过期日期', trigger: 'change' } + ], + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'change' } + ], + poNumber: [ + { required: true, message: '请输入订单号', trigger: 'change' } + ], + poLine: [ + { required: true, message: '请输入订单行', trigger: 'change' } + ], + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } + ], + convertRate: [ + { required: true, message: '请输入转换率', trigger: 'blur' } + ], + inventoryStatus: [ + { required: true, message: '请选择库存状态', trigger: 'change' } + ], + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'change' } + ], +}) + +/** + * @returns {Array} 采购收货申请子表--子包装号 + */ +export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive([ + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + disabled:true, + isSearchList: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled: true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '默认到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: false + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择过期日期', + valueFormat: 'x', + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select', + disabled: true, + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: true + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + isForm: true + }, + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0 + }, + }, + tableForm: { + disabled: true, + }, + isTableForm: false, + isForm: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: 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', + } + }, + isTableForm: false, + isForm: false + } +])) + + +export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive([ + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true, + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '默认到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: false + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled:true, + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择过期日期', + valueFormat: 'x', + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + isMainValue: false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + isMainValue: false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: true + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + isForm: true + }, + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 1, + precision: 6 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, +])) From 6bdcb872ff4aba2628fcbfc71f62d2b2ecd3e4b1 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 15:12:42 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=8F=B7=E8=AF=95=E5=93=81=20=E5=8D=8F?= =?UTF-8?q?=E5=AE=9A=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptJobDetail/index.ts | 43 ++++++++++++++++- src/api/wms/purchasereceiptJobMain/index.ts | 46 ++++++++++++++++-- .../wms/purchasereceiptRecordDetail/index.ts | 47 ++++++++++++++++++- .../wms/purchasereceiptRecordMain/index.ts | 42 ++++++++++++++++- .../wms/purchasereceiptRequestDetail/index.ts | 45 +++++++++++++++++- .../wms/purchasereceiptRequestMain/index.ts | 42 ++++++++++++++++- 6 files changed, 252 insertions(+), 13 deletions(-) diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts index 420ec63a4..dba43b0b2 100644 --- a/src/api/wms/purchasereceiptJobDetail/index.ts +++ b/src/api/wms/purchasereceiptJobDetail/index.ts @@ -43,16 +43,46 @@ export const getPurchasereceiptJobDetailPage = async (params) => { return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) } } +// 查询采购收货任务子列表 +export const getASNPurchasereceiptJobDetailPage = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) + } +} // 查询协定品收货任务子列表 export const getToolPurchasereceiptJobDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) } } @@ -60,12 +90,21 @@ export const getToolPurchasereceiptJobDetailPage = async (params) => { // 查询号试品收货任务子列表 export const getDevelopPurchasereceiptJobDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-job-detail/senior', data }) } else { params.sourceType = "Develop" + delete params.source_type return await request.get({ url: `/wms/purchasereceipt-job-detail/page`, params }) } } diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index d9f182a32..b7c822abe 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -99,15 +99,45 @@ export const exportPurchasereceiptJobMain = async (params) => { return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) } } - +// 导出采购收货任务主 Excel +export const exportASNPurchasereceiptJobMain = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) + } +} // 导出协定品收货任务主 Excel export const exportToolPurchasereceiptJobMain = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) } } @@ -115,11 +145,21 @@ export const exportToolPurchasereceiptJobMain = async (params) => { // 导出号试品收货任务主 Excel export const exportDevelopPurchasereceiptJobMain = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-senior`, data }) } else { params.sourceType = "Develop" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel`, params }) } } diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index b7f2602b4..38d64a65e 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -61,27 +61,70 @@ export const getPurchasereceiptRecordDetailPage = async (params) => { } } + +// 查询采购收货记录子列表 +export const getASNPurchasereceiptRecordDetailPage = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) + } +} + + // 查询协定品收货记录子列表 export const getToolPurchasereceiptRecordDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType delete params.isSearch const data = { ...params } return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) } } // 查询号试品收货记录子列表 export const getDevelopPurchasereceiptRecordDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType delete params.isSearch const data = { ...params } return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data }) } else { params.sourceType = "Develop" + delete params.source_type return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) } } diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index ed9bc0861..a14582527 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -88,14 +88,43 @@ export const exportPurchasereceiptRecordMain = async (params) => { return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) } } +// 导出采购收货记录主 Excel +export const exportASNPurchasereceiptRecordMain = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + } +} // 导出协定品收货记录主 Excel export const exportToolPurchasereceiptRecordMain = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) } } @@ -103,11 +132,20 @@ export const exportToolPurchasereceiptRecordMain = async (params) => { // 导出号试品收货记录主 Excel export const exportDevelopPurchasereceiptRecordMain = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) } else { params.sourceType = "Develop" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) } } diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index 3d55b6d0d..f42c07c07 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -46,16 +46,48 @@ export const getPurchasereceiptRequestDetailPage = async (params) => { } } +// 查询采购收货申请子列表 +export const getASNPurchasereceiptRequestDetailPage = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params }) + } +} + // 查询协定品收货申请子列表 export const getTOOLPurchasereceiptRequestDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType + delete params.isSearch delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params }) } } @@ -65,11 +97,20 @@ export const getTOOLPurchasereceiptRequestDetailPage = async (params) => { export const getDevelopPurchasereceiptRequestDetailPage = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType delete params.isSearch const data = {...params} return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data }) } else { + delete params.source_type params.sourceType = "Develop" return await request.get({ url: `/wms/purchasereceipt-request-detail/page`, params }) } diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index d2a98945c..b3570511a 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -87,15 +87,44 @@ export const exportPurchasereceiptRequestMain = async (params) => { return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) } } +// 导出采购收货申请主 Excel +export const exportASNPurchasereceiptRequestMain = async (params) => { + if (params.isSearch) { + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "ASN" + }) + } + delete params.source_type + delete params.sourceType + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data }) + } else { + params.sourceType = "ASN" + delete params.source_type + return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) + } +} // 导出协定品收货申请主 Excel export const exportToolPurchasereceiptRequestMain = async (params) => { if (params.isSearch) { - params.source_type = "TOOL" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "TOOL" + }) + } + delete params.source_type + delete params.sourceType const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data }) } else { params.sourceType = "TOOL" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) } } @@ -103,11 +132,20 @@ export const exportToolPurchasereceiptRequestMain = async (params) => { // 导出号试品收货申请主 Excel export const exportDevelopPurchasereceiptRequestMain = async (params) => { if (params.isSearch) { - params.source_type = "Develop" + if(!params.filters.find(item=>item.column=='source_type')){ + params.filters.push({ + column : "source_type", + action : '==', + value : "Develop" + }) + } + delete params.source_type + delete params.sourceType const data = {...params} return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior`, data }) } else { params.sourceType = "Develop" + delete params.source_type return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel`, params }) } } From 04cff1dc6ddbd10e0fd1be538f5979442feb3a37 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 8 Nov 2024 15:36:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E6=94=B9=E8=BF=9B=EF=BC=9A=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E5=8E=BB=E6=8E=89=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?2=EF=BC=8C=E5=85=A5=E5=BA=93=E5=8C=85=E8=A3=85=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=98=AF=E5=90=A6=E7=BA=BF=E8=BE=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91(?= =?UTF-8?q?=E4=B8=8E=E8=8B=B1=E6=B3=B0=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E4=B8=8D=E7=AC=A6)=20YT-594?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRecordMain.data.ts | 16 +- .../inventoryinitRequestMain.data.ts | 478 +++++++++--------- 2 files changed, 247 insertions(+), 247 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index e7b0496ef..cd35ea0dd 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -488,14 +488,14 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '货主代码', + // field: 'ownerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, // { // label: '替代批次', // field: 'altBatch', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 2eb51de0c..8c3538c0a 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -543,28 +543,28 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( disabled: true } }, - { - label: '包装数量', - field: 'packQty', - 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: 'packQty', + // 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: 'packUnit', @@ -680,61 +680,61 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch: true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择货主代码', - searchField: 'code', - searchTitle: '货主信息', - searchAllSchemas: Owner.allSchemas, - searchPage: OwnerApi.getOwnerPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择货主代码', - searchField: 'code', - searchTitle: '货主信息', - searchAllSchemas: Owner.allSchemas, - searchPage: OwnerApi.getOwnerPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '货主代码', + // field: 'ownerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // enterSearch: true, + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择货主代码', + // searchField: 'code', + // searchTitle: '货主信息', + // searchAllSchemas: Owner.allSchemas, + // searchPage: OwnerApi.getOwnerPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: 'true', + // isFormModel: true + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择货主代码', + // searchField: 'code', + // searchTitle: '货主信息', + // searchAllSchemas: Owner.allSchemas, + // searchPage: OwnerApi.getOwnerPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: 'true', + // isFormModel: true + // }], // 失去焦点校验参数 + // } + // } + // }, { label: '项目代码', field: 'projectCode', @@ -832,7 +832,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, { - label: '包装规格1', + label: '默认包装规格', field: 'packUnit', isTable: true, sort: 'custom', @@ -906,7 +906,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, { - label: '包装数量1', + label: '默认包装数量', field: 'packQty', sort: 'custom', table: { @@ -919,168 +919,168 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( tableForm: { } }, - { - label: '包装规格2', - field: 'secondPackUnit', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - enterSearch: true, - disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPage, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + // { + // label: '包装规格2', + // field: 'secondPackUnit', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // enterSearch: true, + // disabled: true, + // isSearchList: true, + // searchListPlaceholder: '请选择包装', + // searchField: 'packUnit', + // searchTitle: '物品包装信息', + // searchAllSchemas: Itempackaging.allSchemas, + // searchPage: ItemPackageApi.getItempackagingPage, + // searchCondition: [ + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请选择订单行', + // isMainValue: true + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // } + // ], + // verificationParams: [{ + // key: 'packUnit', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 - } - }, - tableForm: { - enterSearch: true, - clearable: true, - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPage, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isTableRowValue: true, - isMainValue:false - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - }, - { - label: '包装数量2', - field: 'secondPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - } - }, - tableForm: { - } - }, - { - label: '入库存包装规格', - field: 'balancePackUnit', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - enterSearch: true, - disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPage, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + // } + // }, + // tableForm: { + // enterSearch: true, + // clearable: true, + // disabled: true, + // isInpuFocusShow: true, + // searchListPlaceholder: '请选择包装', + // searchField: 'packUnit', + // searchTitle: '物品包装信息', + // searchAllSchemas: Itempackaging.allSchemas, + // searchPage: ItemPackageApi.getItempackagingPage, + // searchCondition: [ + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请选择订单行', + // isTableRowValue: true, + // isMainValue:false + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'packUnit', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, + // { + // label: '包装数量2', + // field: 'secondPackQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // } + // }, + // tableForm: { + // } + // }, + // { + // label: '入库存包装规格', + // field: 'balancePackUnit', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // enterSearch: true, + // disabled: true, + // isSearchList: true, + // searchListPlaceholder: '请选择包装', + // searchField: 'packUnit', + // searchTitle: '物品包装信息', + // searchAllSchemas: Itempackaging.allSchemas, + // searchPage: ItemPackageApi.getItempackagingPage, + // searchCondition: [ + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请选择订单行', + // isMainValue: true + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // } + // ], + // verificationParams: [{ + // key: 'packUnit', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 - } - }, - tableForm: { - enterSearch: true, - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPage, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isTableRowValue: true, - isMainValue:false - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - }, + // } + // }, + // tableForm: { + // enterSearch: true, + // disabled: true, + // isInpuFocusShow: true, + // searchListPlaceholder: '请选择包装', + // searchField: 'packUnit', + // searchTitle: '物品包装信息', + // searchAllSchemas: Itempackaging.allSchemas, + // searchPage: ItemPackageApi.getItempackagingPage, + // searchCondition: [ + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请选择订单行', + // isTableRowValue: true, + // isMainValue:false + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'packUnit', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, { label: '是否线边', field: 'dataTypeLine', From ca45df6d79bf251b4f3a466f8d526eae3c43950b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 8 Nov 2024 15:38:51 +0800 Subject: [PATCH 05/10] =?UTF-8?q?YT-794=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=EF=BC=8C=E7=A6=BB=E6=95=A3=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E7=8A=B6=E6=80=81=EF=BC=8C=E6=98=8E=E7=BB=86=E5=BA=94?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BB=BB=E4=BD=95=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E7=8E=B0=E8=83=BD=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 76a6d3c9c..95bfa8e73 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -88,9 +88,9 @@ @searchTableSuccessDetail="searchTableSuccessDetail" :detailValidate="detailValidate" :detailButtonIsShowAddStatusArray="['1','3','4','5','6']" - :detailButtonIsShowEdit="true" - :detailButtonIsShowDelete="true" - :detailButtonIsShowAdd="true" + :detailButtonIsShowEdit="detailData.type == 'SCHEDULE'" + :detailButtonIsShowDelete="detailData.type == 'SCHEDULE'" + :detailButtonIsShowAdd="detailData.type == 'SCHEDULE'" addHasPermi="wms:purchase-plan-main:create" editHasPermi="wms:purchase-plan-main:update" deleteHasPermi="wms:purchase-plan-main:delete" @@ -548,8 +548,10 @@ const isShowMainButton1 = (row, val) => { } // 获取部门 用于详情 部门回显 /** 详情操作 */ - const detailRef = ref() - const openDetail = (row : any, titleName : any, titleValue : any) => { +const detailRef = ref() +const detailData = ref({}) +const openDetail = (row: any, titleName: any, titleValue: any) => { + detailData.value = row detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain') const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) From da986ef73c16e73c896857943d7c88dadb8ab677 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 15:57:04 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89order=5Ftype=5Fm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developPurchasereceiptRecordMain/index.vue | 15 +++------------ .../toolPurchasereceiptRecordMain/index.vue | 12 ------------ 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue index b7690876d..55ee5fb9d 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -279,7 +279,6 @@ const searchList = (model) => { params.itemTypes = '' params.itemType = '' } - params.orderTypeM = '1' setSearchParams(params) } @@ -424,11 +423,7 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { - searchData.filters.push({ - action: '==', - column: 'order_type_m', - value: '1' - }) + tableObject.params = { isSearch: true, filters: searchData.filters @@ -458,18 +453,14 @@ const changeTabs = (data) => { /** 初始化 **/ onMounted(async () => { - tableObject.params = { - orderTypeM: '1' - } + await getSwitchByCode('EnableQms').then((res) => { EnableQms.value = res == 'TRUE' ? true : false }) getList() }) onActivated(() => { - tableObject.params = { - orderTypeM: '1' - } + getList() }) diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue index 8c764f908..99996a116 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue @@ -279,7 +279,6 @@ const searchList = (model) => { params.itemTypes = '' params.itemType = '' } - params.orderTypeM = '1' setSearchParams(params) } @@ -424,11 +423,6 @@ const handleExport = async () => { // 筛选提交 const searchFormClick = (searchData) => { - searchData.filters.push({ - action: '==', - column: 'order_type_m', - value: '1' - }) tableObject.params = { isSearch: true, filters: searchData.filters @@ -458,18 +452,12 @@ const changeTabs = (data) => { /** 初始化 **/ onMounted(async () => { - tableObject.params = { - orderTypeM: '1' - } await getSwitchByCode('EnableQms').then((res) => { EnableQms.value = res == 'TRUE' ? true : false }) getList() }) onActivated(() => { - tableObject.params = { - orderTypeM: '1' - } getList() }) From 9701b09090cc785aec8dfe8dae1ccae845a31768 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 15:57:50 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1ASN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptJobMain/index.vue | 6 +++--- .../purchasereceiptRecordMain/index.vue | 8 ++++---- .../purchasereceiptRequestMain/index.vue | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 6ea8b010d..62ff3af95 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -73,7 +73,7 @@ :detailAllSchemas="PurchasereceiptJobDetail.allSchemas" :detailAllSchemasRules="PurchasereceiptJobDetailRules" :searchTableParams="searchTableParams" - :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage" + :apiPage="PurchasereceiptJobDetailApi.getASNPurchasereceiptJobDetailPage" :detailButtonIsShowEdit="false" :detailButtonIsShowDelete="false" :buttondataTable="buttondataTable" @@ -187,7 +187,7 @@ const Echo = [] const { tableObject, tableMethods } = useTable({ getListApi: routeName.value.includes('SCP') ? PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPageSCP - : PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口 + : PurchasereceiptJobDetailApi.getASNPurchasereceiptJobDetailPage // 分页接口 }) // 获得表格的各种操作 @@ -407,7 +407,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params) + const data = await PurchasereceiptJobMainApi.exportASNPurchasereceiptJobMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 78c777a5c..bb115ee2e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -142,7 +142,7 @@ routeName.value = route.name const apiPage = ref( routeName.value.includes('SCP') ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP - : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage + : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage ) const tableColumns = ref([ ...PurchasereceiptRecordMain.allSchemas.tableColumns, @@ -158,7 +158,7 @@ const updataTableColumns = (val) => { const { tableObject, tableMethods } = useTable({ getListApi: routeName.value.includes('SCP') ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP - : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage // 分页接口 + : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage // 分页接口 }) // 获得表格的各种操作 @@ -427,7 +427,7 @@ const handleExport = async () => { ) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } else { - const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain( + const data = await PurchasereceiptRecordMainApi.exportASNPurchasereceiptRecordMain( tableObject.params ) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) @@ -457,7 +457,7 @@ const changeTabs = (data) => { console.log(data) apiPage.value = routeName.value.includes('SCP') ? PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP - : PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage + : PurchasereceiptRecordDetailApi.getASNPurchasereceiptRecordDetailPage detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas tabeKey.value = 'receiptDetail' } else if (data.prop == 'scarceGoodsDetail') { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 96d9a5118..7306d2614 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -200,7 +200,7 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns]) -const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage) +const apiPage = ref(PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage) const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas) @@ -310,7 +310,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { } const { tableObject, tableMethods } = useTable({ - getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage // 分页接口 + getListApi: PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage // 分页接口 }) // 获得表格的各种操作 @@ -491,7 +491,7 @@ const checkQualityReport = async (row)=>{ const isCreateLabel = ref(false) const formLabelRef = ref() const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage + getListApi: PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage }) const { getList:getDetailList } = detatableMethods @@ -794,7 +794,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) + const data = await PurchasereceiptRequestMainApi.exportASNPurchasereceiptRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { @@ -899,7 +899,7 @@ const searchFormClick = (searchData) => { // tabs 切换事件 // const changeTabs = (data) =>{ // if(data.prop == 'receiptDetail'){ -// apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage +// apiPage.value = PurchasereceiptRequestDetailApi.getASNPurchasereceiptRequestDetailPage // detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas // }else if(data.prop == 'scarceGoodsDetail'){ // apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage From a5bf8943c81893ef52c7c5bc83f9001026326cab Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 16:19:07 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 20 +++++++++---------- .../purchasereceiptRecordMain.data.ts | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index a0fb7f5ab..f123cfa53 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 400, - fixed: 'right' - }, - }, + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 400, + // fixed: 'right' + // }, + // }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index a0fb7f5ab..f123cfa53 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 400, - fixed: 'right' - }, - }, + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 400, + // fixed: 'right' + // }, + // }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', From 940e196f358961ec2d5cd40c3507c940d05a40bf Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 8 Nov 2024 16:19:54 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.env.wyf b/.env.wyf index d8f72db2d..99bad36e9 100644 --- a/.env.wyf +++ b/.env.wyf @@ -7,12 +7,18 @@ VITE_DEV=false # SCP 28040 # WMS 28050 -# 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:28050/api' +# # 请求路径 +# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api' + +# # 上传路径 +# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload' -# 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:28050/admin-api/infra/file/upload' +# # 请求路径 +VITE_BASE_URL='http://192.168.1.196:12080' + +# 上传路径 +VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' # # 请求路径 # VITE_BASE_URL='http://192.168.1.35:12080' From 82a7e17552cd7e68c195c5c2ca7b0b38582b9e6f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 8 Nov 2024 16:24:20 +0800 Subject: [PATCH 10/10] =?UTF-8?q?YT-270=E7=89=A9=E6=96=99=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itembasic/itembasic.data.ts | 577 ++++++++++-------- .../itempackage/itempackage.data.ts | 12 + .../packageunit/packageunit.data.ts | 20 +- 3 files changed, 342 insertions(+), 267 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 4163cdccd..ecc2cce07 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -9,7 +9,7 @@ import {validateYS} from '@/utils/validator' */ export const Itembasic = useCrudSchemas(reactive([ { - label: '代码', + label: '品番', field: 'code', sort: 'custom', isSearch: true, @@ -18,6 +18,15 @@ export const Itembasic = useCrudSchemas(reactive([ fixed: 'left' }, }, + { + label: '品名', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, { label: '品号', field: 'articleNumber', @@ -46,25 +55,93 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '名称', - field: 'name', + label: '描述1', + field: 'desc1', + sort: 'custom', + table: { + width: 150 + } , + // isTableForm:false + }, + { + label: '描述2', + field: 'desc2', sort: 'custom', - isSearch: true, table: { width: 150 + } , + }, + { + label: '物料类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , + }, + { + label: '物料状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, + { + label: '可采购', + field: 'enableBuy', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } }, }, { - label: '是否可用', - field: 'available', + label: '可制造', + field: 'enableMake', sort: 'custom', - isSearch:true, - isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - search: { + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , + form: { + component: 'Switch', value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } }, + }, + { + label: '虚零件', + field: 'isPhantom', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + table: { + width: 100 + } , form: { component: 'Switch', value: 'TRUE', @@ -73,27 +150,46 @@ export const Itembasic = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + }, + { + label: 'ABC类', + field: 'abcClass', + sort: 'custom', + dictType: DICT_TYPE.ABC_CLASS, + dictClass: 'string', + isTable: true, table: { - width: 110 - } + width: 100 + } , }, { - label: '描述1', - field: 'desc1', + label: '默认包装规格', + field: 'defaultPackUnit', sort: 'custom', table: { width: 150 } , - // isTableForm:false }, { - label: '描述2', - field: 'desc2', + label: '默认包装数量', + field: 'defaultPackQty', sort: 'custom', table: { width: 150 } , }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, { label: '受入号', field: 'receivedNumber', @@ -103,15 +199,6 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '受入地', - // field: 'receivedLocation', - // sort: 'custom', - // isSearch: true, - // table: { - // width: 150 - // }, - // }, { label: '前工程', field: 'preEngineering', @@ -131,7 +218,7 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '再订货点', + label: '再订货点数量', field: 'reorderPoint', sort: 'custom', isSearch: false, @@ -148,15 +235,6 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '生产线分区', - field: 'productionLineZoning', - sort: 'custom', - isSearch: false, - table: { - width: 150 - }, - }, { label: '采购员', field: 'purchaser', @@ -167,73 +245,42 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, { - label: '状态', - field: 'status', - sort: 'custom', - dictType: DICT_TYPE.ITEM_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 120 - } - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, - table: { - width: 120 - } - }, - { - label: '替代计量单位', - field: 'altUom', + label: '项目', + field: 'project', sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, table: { - width: 150 + width: 100 } , }, { - label: '是否标包', - field: 'isStdPack', + label: '是否脱离ERP管理', + field: 'isOutErp', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - // colorType: 'danger', isTable: true, table: { - width: 120 + width: 100 }, form: { component: 'Switch', - value: 'TRUE', + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' } }, - // tableForm:{ - // width: 180, - // type:'Radio', - // } }, { - label: '可采购', - field: 'enableBuy', + label: '是否可用', + field: 'available', sort: 'custom', + isSearch:true, + isForm: false, dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 100 + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', }, form: { component: 'Switch', @@ -243,129 +290,245 @@ export const Itembasic = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 110 + } }, { - label: '可制造', - field: 'enableMake', + label: '生效时间', + field: 'activeTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 100 + width: 180 } , form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, + // tableForm:{ + // width: 200, + // type:'FormDateTime', + // } }, { - label: '可委外加工', - field: 'enableOutsourcing', + label: '失效时间', + field: 'expireTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 120 + width: 180 } , form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', + value:'activeTime', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, }, { - label: '回收件', - field: 'isRecycled', + label: '备注', + field: 'remark', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', + isTable: false + }, + { + label: '创建者', + field: 'creator', + isForm: false, isTable: true, table: { - width: 100 + width: 180 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + isTable: true, + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 180 }, }, { - label: '虚零件', - field: 'isPhantom', + label: '最后更新时间', + field: 'updateTime', sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, + isDetail: true, + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 100 - } , + width: 180 + }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } + } + }, + + // { + // label: '受入地', + // field: 'receivedLocation', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // }, + + { + label: '生产线分区', + field: 'productionLineZoning', + sort: 'custom', + isSearch: false, + isTable: false, + isDetail:false, + table: { + width: 150 }, }, + + + { - label: '是否脱离ERP管理', - field: 'isOutErp', + label: '替代计量单位', + field: 'altUom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: false, + isDetail:false, + table: { + width: 150 + } , + }, + { + label: '是否标包', + field: 'isStdPack', sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + // colorType: 'danger', + isTable: false, + isDetail:false, table: { - width: 100 + width: 120 }, form: { component: 'Switch', - value: 'FALSE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' } }, + // tableForm:{ + // width: 180, + // type:'Radio', + // } }, + { - label: 'ABC类', - field: 'abcClass', + label: '可委外加工', + field: 'enableOutsourcing', sort: 'custom', - dictType: DICT_TYPE.ABC_CLASS, + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { - width: 100 + width: 120 } , + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, }, { - label: '类型', - field: 'type', + label: '回收件', + field: 'isRecycled', sort: 'custom', - dictType: DICT_TYPE.ITEM_TYPE, + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 - } , + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, }, + + + + { label: '产品类', field: 'prodCla', sort: 'custom', isForm:false, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -376,7 +539,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_CATEGORY, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -387,7 +551,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_GROUP, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -398,7 +563,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_COLOR, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -409,7 +575,8 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_CONFIGURATION, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 100 } , @@ -420,26 +587,21 @@ export const Itembasic = useCrudSchemas(reactive([ dictType: DICT_TYPE.SETTLEMENT_TYPE, dictClass: 'string', sort: 'custom', - isTable: true, + isTable: false, + isDetail:false, table: { width: 120 } , }, - { - label: '项目', - field: 'project', - sort: 'custom', - table: { - width: 100 - } , - }, + { label: '质量等级', field: 'eqLevel', sort: 'custom', dictType: DICT_TYPE.EQ_LEVEL, dictClass: 'string', - isTable: true, + isTable: false, + isDetail:false, table: { width: 120 } , @@ -448,6 +610,8 @@ export const Itembasic = useCrudSchemas(reactive([ label: '有效天数', field: 'validityDays', sort: 'custom', + isTable: false, + isDetail:false, table: { width: 120 }, @@ -459,122 +623,9 @@ export const Itembasic = useCrudSchemas(reactive([ } }, }, - { - label: '生效时间', - field: 'activeTime', - sort: 'custom', - 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', - } - }, - // tableForm:{ - // width: 200, - // type:'FormDateTime', - // } - }, - { - label: '失效时间', - field: 'expireTime', - sort: 'custom', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - } , - form: { - component: 'DatePicker', - value:'activeTime', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - isTable: true, - formatter: dateFormatter, - isForm: false, - 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: 'creator', - isForm: false, - isTable: true, - table: { - width: 180 - }, - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isTable: true, - isDetail: true, - formatter: dateFormatter, - isForm: false, - 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', - isDetail: true, - isForm: false, - isTable: true, - table: { - width: 180 - }, - }, - { label: '备注', field: 'remark', sort: 'custom', isTable: false}, + + + // { // label: '操作', // field: 'action', diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index bca65a1c6..2fed930a9 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -144,6 +144,9 @@ export const Itempackaging = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', + isTable: false, + isDetail:false, + isForm:false, table: { width: 120 }, @@ -223,6 +226,15 @@ export const Itempackaging = useCrudSchemas(reactive([ } } }, + { + label: '数据来源', + field: 'dataSource', + sort: 'custom', + isForm:false, + table: { + width: 180 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 0035745bc..6f3f9764a 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -122,6 +122,8 @@ export const Packageunit1 = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, form: { component: 'Switch', value: 'TRUE', @@ -141,6 +143,8 @@ export const Packageunit1 = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, form: { component: 'Switch', value: 'FALSE', @@ -335,7 +339,9 @@ export const Packageunit = useCrudSchemas(reactive([ label: '父包装代码', field: 'parentCode', sort: 'custom', - isTable:false, + isTable: false, + isDetail:false, + isForm:false, table: { width: 150 }, @@ -479,6 +485,9 @@ export const Packageunit = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, + isForm:false, form: { component: 'Switch', value: 'TRUE', @@ -498,6 +507,9 @@ export const Packageunit = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: false, + isTable: false, + isDetail:false, + isForm:false, form: { component: 'Switch', value: 'FALSE', @@ -713,9 +725,9 @@ export const PackageunitRules = reactive({ type: [ { required: true, message: '请选择包装类型', trigger: 'change' } ], - reuse: [ - { required: true, message: '请选择是否重复使用', trigger: 'change' } - ], + // reuse: [ + // { required: true, message: '请选择是否重复使用', trigger: 'change' } + // ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ],