From ab986aa946c8d7d7e1573b5824de6df0d635e83a Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 12 May 2025 10:56:11 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=AE=A1=E6=89=B9=E4=BA=BA=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E5=8E=BB=E6=8E=89=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 2 +- .../supplierinvoiceRequestMain.data.ts | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a5b04cfd2..e1c6e2a4d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -1767,7 +1767,7 @@ onMounted(async () => { sort: '', by: 'ASC' }) - item.componentProps.options = procurementCreators.list + item.componentProps.options = procurementCreators.list.filter(item => item.id != 1) } }) getList() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index d98ea3621..f0cf35abb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -16,7 +16,6 @@ const queryParams = { pageNo: 1, code: 'PurchaseInvoiceRequest' } -console.log(34343) const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData = data?.list[0] || {} @@ -29,7 +28,8 @@ const requestsettingData = data?.list[0] || {} userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] -const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' }) +const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase', pageSize: 1000, pageNo: 1, sort: '', by: 'ASC' }) +const purchasingPriceApprover = procurementCreators.list.filter(item => item.id != 1) /** * @returns {Array} 采购员列表 */ @@ -929,7 +929,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isSearch:true, form: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { options:[], optionsAlias: { @@ -956,7 +956,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, search: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { options:[], optionsAlias: { @@ -978,7 +978,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isDetail:false, form: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { optionsAlias: { labelField: 'nickname', @@ -1964,7 +1964,6 @@ function validateTaxRate(rule, value, callback) { } const validateGoldenTaxInvoiceNumber = (rule, value, callback) => { - console.log('金税票号',value) const reg = /^[0-9]*$/ if (value==null||value==''||reg.test(value)) { callback() From 5406c88bb49c1275b3d0fa9e078e47427509a1ed Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 12 May 2025 11:19:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?YT-2595SCP=E3=80=8A=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=AD=90=E8=A1=A8=E7=9A=84=20?= =?UTF-8?q?=E2=80=9C=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index a43d70b71..da978219b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -975,8 +975,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault:17, - hiddenInMain:true + sortTableDefault:19, }, { label: '生产日期', @@ -998,7 +997,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault:17, + sortTableDefault: 19, hiddenInMain:true }, { @@ -1021,7 +1020,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault:17, + sortTableDefault: 19, hiddenInMain:true }, { From f7c0a76d415572ec89749e011965d7f441d02cdb Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Mon, 12 May 2025 13:16:06 +0800 Subject: [PATCH 03/10] =?UTF-8?q?YT-2394:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E4=B8=BB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=BC=E5=87=BA=EF=BC=9B=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E6=98=8E=E7=BB=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierMoldCostMain/index.vue | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue index 2fa43c6a2..2f42c17d9 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue @@ -64,7 +64,18 @@ :detailButtonIsShowEdit="false" :detailButtonIsShowDelete="false" :buttondataTable="buttondataTable" - :otherHeadButttonData = "[]" + :otherHeadButttonData = "[ + { + label: t('ts.导出明细'), + name: 'export-detail', + hide: false, + type: 'primary', + // icon: 'ep:operation', + color: '', + float: 'left', + hasPermi: '' + } + ]" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" @@ -260,7 +271,7 @@ const buttonBaseClick = (val, item) => { } } - + const clicKRowId = ref() // 点击详情列表列按钮回调事件 const tableFormButton = async (val , row) => { if (val == 'close') { // 点击关闭 @@ -281,6 +292,7 @@ const buttonBaseClick = (val, item) => { value: row.number }] detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerStatementMain') + clicKRowId.value = row.id; } @@ -369,8 +381,30 @@ const importSuccess = () => { if (val == 'export') { // 子表导出明细 handleExportDetail(detailTableObject) + } else if (val === 'export-detail') { + console.log('导出明细:', clicKRowId.value) + handleDetailExport(clicKRowId.value) + } + } + /** 导出明细按钮操作 */ +const exportLoadingDetail = ref(false) // 导出的加载中 +const handleDetailExport = async (masterId) => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出导出明细 + exportLoadingDetail.value = true + let params = { + masterId: masterId } + const excelTitle = ref(route.meta.title) + const data = await SuppliperMoldCostDetailApi.exportSupplierMoldCostDetail(params) + download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`) + } catch { + } finally { + exportLoadingDetail.value = false } +} /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 // 子表导出明细 From 4c690828dff1aa83b537381f2ba16708275a1df4 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 12 May 2025 13:30:39 +0800 Subject: [PATCH 04/10] =?UTF-8?q?SCP=E3=80=8A=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=8B=E5=A2=9E=E5=8A=A0=20=E2=80=9C=E5=B7=B2?= =?UTF-8?q?=E6=94=B6=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E2=80=9D=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B7=B2=E6=94=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=95=B0=E9=87=8F=3D=E3=80=8A=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B=E4=B8=AD=E8=AF=A5=E8=A6=81?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E8=AF=A5=E5=93=81=E7=95=AA=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F=E4=B9=8B=E5=92=8C=EF=BC=9B?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E9=87=87=E8=B4=AD=E6=95=B0=E9=87=8F=3D?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=20/=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=8E=87=E3=80=82=E5=B7=B2=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E9=87=8F=E5=92=8C=E5=B7=B2=E6=94=B6=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=95=B0=E9=87=8F=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E3=80=8A=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=8B=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 3 ++- .../purchasePlanMain/purchasePlanMain.data.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index da978219b..f1b5feff8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -74,7 +74,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false + isTable:true, + sortTableDefault:5, }, { label: '供应商代码', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 8d38b3533..6daba3822 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -1052,6 +1052,18 @@ export const PurchasePlanDetail = useCrudSchemas( isTable: true, }, + { + label: '已收库存数量', + field: 'inventoryedQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: true, + }, + // {需求作废 // label: '受入地', From 413d6c9302e65dd7cb53e63f4cce7facdaba33c3 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 12 May 2025 14:22:40 +0800 Subject: [PATCH 05/10] YT-2599 --- .../deliver/deliverRequestMain/index.vue | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 3baa1316e..b1bb44d43 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -114,7 +114,6 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name -const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns]) const isShowButton = ref(true) const businessType = ref() @@ -131,12 +130,53 @@ const { tableObject, tableMethods } = useTable({ /** * DeliverRequestMain 成品发货申请 */ +console.log(4555, routeName.value) +DeliverRequestMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) +DeliverRequestMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '截止时间' + } +}) if ( routeName.value == 'DeliverRequestMain') { tableObject.params = { businessType: 'Deliver' } businessType.value = 'Deliver' importFileName.value = '成品发货申请' + DeliverRequestMain.allSchemas.formSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.tableColumns.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.detailSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) + DeliverRequestMain.allSchemas.searchSchema.forEach(item => { + if (item.field == 'dueTime') { + item.label = '发货日期' + } + }) } else if ( routeName.value == 'ZZBJDeliverRequestMain') { tableObject.params = { businessType: 'ZZBJDeliver' @@ -144,6 +184,8 @@ const { tableObject, tableMethods } = useTable({ businessType.value = 'ZZBJDeliver' importFileName.value = '自制备件发货申请' } +console.log(333,DeliverRequestMain.allSchemas.tableColumns) +const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns]) // 字段设置 更新主列表字段 const updataTableColumns = (val) => { From 0f0afb5819514c621b0d1b25d039665f283f61c2 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 12 May 2025 14:24:48 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BF=AE=E6=94=B9YT-25?= =?UTF-8?q?99=E4=B9=8B=E5=89=8D=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index b1bb44d43..3baa1316e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -114,6 +114,7 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name +const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns]) const isShowButton = ref(true) const businessType = ref() @@ -130,53 +131,12 @@ const { tableObject, tableMethods } = useTable({ /** * DeliverRequestMain 成品发货申请 */ -console.log(4555, routeName.value) -DeliverRequestMain.allSchemas.formSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '截止时间' - } -}) -DeliverRequestMain.allSchemas.tableColumns.forEach(item => { - if (item.field == 'dueTime') { - item.label = '截止时间' - } -}) -DeliverRequestMain.allSchemas.detailSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '截止时间' - } -}) -DeliverRequestMain.allSchemas.searchSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '截止时间' - } -}) if ( routeName.value == 'DeliverRequestMain') { tableObject.params = { businessType: 'Deliver' } businessType.value = 'Deliver' importFileName.value = '成品发货申请' - DeliverRequestMain.allSchemas.formSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '发货日期' - } - }) - DeliverRequestMain.allSchemas.tableColumns.forEach(item => { - if (item.field == 'dueTime') { - item.label = '发货日期' - } - }) - DeliverRequestMain.allSchemas.detailSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '发货日期' - } - }) - DeliverRequestMain.allSchemas.searchSchema.forEach(item => { - if (item.field == 'dueTime') { - item.label = '发货日期' - } - }) } else if ( routeName.value == 'ZZBJDeliverRequestMain') { tableObject.params = { businessType: 'ZZBJDeliver' @@ -184,8 +144,6 @@ DeliverRequestMain.allSchemas.searchSchema.forEach(item => { businessType.value = 'ZZBJDeliver' importFileName.value = '自制备件发货申请' } -console.log(333,DeliverRequestMain.allSchemas.tableColumns) -const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns]) // 字段设置 更新主列表字段 const updataTableColumns = (val) => { From 4e7bcfd57dcf3dccc9bc2116a39a241ccfbfbd93 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 12 May 2025 14:33:21 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=81=A2=E5=A4=8DYT-2595SCP=E3=80=8A?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=20=E2=80=9C=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E2=80=9D=20=E5=AD=97=E6=AE=B5=E4=B9=8B=E5=89=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f1b5feff8..ca436ac6a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -976,7 +976,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault:19, + sortTableDefault: 17, + hiddenInMain: true }, { label: '生产日期', @@ -998,7 +999,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault: 19, + sortTableDefault: 17, hiddenInMain:true }, { @@ -1021,7 +1022,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, - sortTableDefault: 19, + sortTableDefault: 17, hiddenInMain:true }, { From 78e27fc85271659ceb17ea058769b686d0440318 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Mon, 12 May 2025 17:07:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?YT-2604=EF=BC=9A=E4=B8=B0=E7=94=B0?= =?UTF-8?q?=E4=BB=A5=E5=A4=96=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain.data.ts | 26 ++++++++++++------- .../deliver/deliverRecordMain/index.vue | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 94195e82a..f98e86bea 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -603,14 +603,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '父包装号', - field: 'parentPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '父包装号', + // field: 'parentPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '包装规格', field: 'packUnit', @@ -841,10 +841,18 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, + // 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: '最后更新者', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index a498edadb..be6758cc2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From 82b7423075b7077c1977474d5a6cf0bbd05d6ccc Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 13 May 2025 08:54:20 +0800 Subject: [PATCH 09/10] =?UTF-8?q?YT-2604=EF=BC=9A=E4=B8=B0=E7=94=B0?= =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 4 ++-- .../deliverRecordMain/deliverRecordMain.data.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index f61b9fa0f..cfb17f1b4 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -533,11 +533,11 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ } }, isSearch: true, - search: { + search: { component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 668ed89c8..608fdca4e 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -949,7 +949,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, From 8690b7e596d04502553949ebbe0bdfb676cc8b48 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 13 May 2025 11:15:15 +0800 Subject: [PATCH 10/10] =?UTF-8?q?YT-2604=EF=BC=9A=E4=B8=B0=E7=94=B0?= =?UTF-8?q?=E4=BB=A5=E5=A4=96=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=8B=E3=80=8A=E9=A1=BA=E5=BC=95=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B=E3=80=8A=E4=B8=B0=E7=94=B0?= =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=8B=E3=80=8A=E5=AE=A2=E6=88=B7PDA=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=8B=E3=80=8A=E7=9B=B4=E7=BA=B3=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 2 +- .../deliverRecordMain/deliverRecordMain.data.ts | 2 +- .../finishedShipmentMain/finishedShipmentMain.data.ts | 4 ++-- .../unfinishedShipmentMain/unfinishedShipmentMain.data.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 7c8b46cf7..818eaf5f8 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -548,7 +548,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 26be02758..79238e5c7 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -598,7 +598,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts index 876cbe2cd..126bc1e33 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts @@ -273,9 +273,9 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + }, }, isForm: false, hiddenInMain:true diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts index 97157b8d2..2850d2e52 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -267,9 +267,9 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + }, }, isForm: false, hiddenInMain:true