From 9b152b06236d003d5f2d795cd957d27a0ef77fdf Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 11 Jul 2025 15:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E7=94=B0=E4=BB=A5=E5=A4=96=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=B4=A7=E3=80=81=E9=A1=BA=E5=BC=95=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E4=B8=B0=E7=94=B0=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E3=80=81=E5=AE=A2=E6=88=B7PDA=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E7=9B=B4=E7=BA=B3=E5=93=81=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=82=B9=E5=87=BB=E6=98=8E=E7=BB=86=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=8D=95=E4=BB=B7=E4=B8=8E=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain.data.ts | 6 +- .../deliverRecordMain.data.ts | 6 +- .../deliverRecordMain.data.ts | 6 +- .../deliverRecordMain.data.ts | 6 +- .../deliverRecordMain.data.ts | 316 +++++++++++++++++- 5 files changed, 327 insertions(+), 13 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 94a57af0c..8e7250bd1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -676,7 +676,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '金额', @@ -688,7 +689,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '在途库库位', diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 021d72ca1..99e3cfba9 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -376,7 +376,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '金额', @@ -388,7 +389,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '在途库库位', diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 52082814e..38f27bc3b 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -426,7 +426,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '金额', @@ -438,7 +439,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '在途库库位', diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index d38f17876..f31371951 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -369,7 +369,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '金额', @@ -381,7 +382,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ hiddenInMain: true, form: { component: 'InputNumber', - } + }, + isTable: false, }, { label: '在途库库位', diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 572ea058a..a0be7b3d4 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -4,7 +4,10 @@ import * as CustomerApi from '@/api/wms/customer' import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data' import * as CustomerItemApi from '@/api/wms/customeritem' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' - +import * as ProductionlineApi from '@/api/wms/productionline' +import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' +import * as ItemBasicApi from '@/api/wms/itembasic' +import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data' /** * @returns {Array} 发货记录主表 */ @@ -199,7 +202,7 @@ export const DeliverRecordMain = useCrudSchemas( } }, { - label: '生产线项', + label: '类型', field: 'productionLine', hiddenSearchHigh: true, sort: 'custom', @@ -697,6 +700,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, isTableForm: false, }, + { label: '数量', field: 'qty', @@ -767,6 +771,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'InputNumber', }, isTableForm: false, + isTable: false, }, { label: '金额', @@ -780,6 +785,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'InputNumber', }, isTableForm: false, + isTable: false, }, { label: '在途库库位', @@ -909,6 +915,68 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ isTable: false, isTableForm: false, }, + { + label: '对账日期', + field: 'reconciliationDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isTableForm: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + 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: 'billDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isTableForm: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + 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: 'remark', @@ -963,7 +1031,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ valueFormat: 'x' } }, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -1136,7 +1204,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ }, { - label: '开始日期', + label: '对账开始日期', field: 'startDate', sort: 'custom', form: { @@ -1150,7 +1218,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ }, }, { - label: '结束日期', + label: '对账结束日期', field: 'endDate', sort: 'custom', form: { @@ -1301,3 +1369,241 @@ export const ImportLeadershipDocErrorData = useCrudSchemas(reactive([ + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + multiple:true, + isInpuFocusShow: false, // 开启查询弹窗 + searchListPlaceholder: '请选择品番', + searchField: 'backNumber', + searchTitle: '物料基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItemBasicApi.selectItembasicPageToFgAndSemibasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + verificationPage: ItemBasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择品番', + searchField: 'backNumber', + searchTitle: '物料基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItemBasicApi.getBackNumberPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + } + } + }, + { + label: '生产线', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择生产线', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, + { + label: '顺引开始日期', + field: 'startDueTime', + sort: 'custom', + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '顺引结束日期', + field: 'endDueTime', + sort: 'custom', + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '开始序号', + field: 'startSerialNo', + sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 0 + } + }, + }, + { + label: '结束序号', + field: 'endSerialNo', + sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 0 + } + }, + }, + { + label: '对账日期', + field: 'reconciliationDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isTableForm: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + 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')] + }, + }, + }, +])) + +// 维护对账日期主校验 +export const MaintenanceBillDateMainRules = reactive({ + backNumber: [ + { required: true, message: '请输入背番', trigger: 'blur' }, + ], + productionLineCode: [ + { required: true, message: '请选择生产线', trigger: 'change' } + ], + startDueTime: [ + { required: true, message: '请选择顺引开始日期', trigger: 'change' } + ], + endDueTime: [ + { required: true, message: '请选择顺引结束日期', trigger: 'change' }, + ], + startSerialNo: [ + { required: true, message: '请输入开始序号', trigger: 'change' }, + { type: 'number', message: '开始序号必须为数字', trigger: 'blur' } + ], + endSerialNo: [ + { required: true, message: '请输入结束序号', trigger: 'change' }, + { type: 'number', message: '结束序号必须为数字', trigger: 'blur' } + ], + reconciliationDate: [ + { required: true, message: '请选择顺引结束日期', trigger: 'change' }, + ], +}) +/** + * @returns {Array} 维护对账日期子 + */ +export const MaintenanceBillDateDetail = useCrudSchemas(reactive([ + { + label: '不包含顺引日期', + field: 'billDate', + sort: 'custom', + tableForm: { + type: 'FormDate', + placeholder: '请选择维护对账日期', + valueFormat: 'YYYYMMDD', + } + }, + { + label: '不包含顺序号', + field: 'serialNoShow', + sort: 'custom', + table: { + width: 150 + }, + }, +])) + +// 维护对账日期主校验 +export const MaintenanceBillDateDetailRules = reactive({ + billDate: [ + { required: true, message: '请输入不包含顺引日期', trigger: 'blur' }, + ], + serialNoShow: [ + { required: true, message: '请输入不包含顺序号', trigger: 'blur' } + ], +}) \ No newline at end of file