From 163edf34e81f15629373cae4e8d482f37ccb9173 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 26 Nov 2024 14:45:48 +0800 Subject: [PATCH 01/12] =?UTF-8?q?YT-1253=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E5=B9=B4=E6=9C=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=8E=A7=E4=BB=B6=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=8F=AA=E9=80=89=E6=8B=A9=E5=B9=B4=E5=92=8C=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierMoldCostMain/supplierMoldCostMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts index 733960b88..ffef1bf8a 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts @@ -69,7 +69,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM', - type: 'daterange', + type: 'monthrange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, From d780005692b73b193886ffb7ecf86b2b9ee20948 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 26 Nov 2024 15:01:15 +0800 Subject: [PATCH 02/12] =?UTF-8?q?YT-1249=E5=AE=A2=E6=88=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E5=B9=B4=E6=9C=88=E5=BA=94=E6=98=AF=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ImportCustomerStatementForecastForm.vue | 16 ++++++++++++---- .../src/ImportCustomerStatementForm.vue | 16 +++++++++++++--- .../src/ImportSupplierMoldCostForm.vue | 14 +++++++++++--- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue index d7ffa66c5..2e5fdae96 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue @@ -6,11 +6,12 @@ :model="queryParams" class="demo-form-inline" style="margin-bottom: 10px" - label-width="70px" + label-width="80px" + :rules="rules" > - + - + {//获取客户列表 var param ={} const list = await CustomerApi.getCustomerListPc(param); diff --git a/src/components/ImportForm/src/ImportCustomerStatementForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForm.vue index 368dddc93..a54f52544 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForm.vue @@ -6,11 +6,12 @@ :model="queryParams" class="demo-form-inline" style="margin-bottom: 10px" - label-width="70px" + label-width="80px" + :rules="rules" > - + - + {//获取客户列表 var param ={} const list = await CustomerApi.getCustomerListPc(param); diff --git a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue index 21390cacc..c628365ab 100644 --- a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue +++ b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue @@ -7,10 +7,11 @@ class="demo-form-inline" style="margin-bottom: 10px" label-width="70px" + :rules="rules" > - + - + {//获取客户列表 const list = await SuppliperMoldCostMainApi.getCustomerList(); From 990f4b559fa547468a679f076e3496fccf3a8899 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 26 Nov 2024 15:20:35 +0800 Subject: [PATCH 03/12] =?UTF-8?q?YT-1283=E6=89=80=E6=9C=89=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=BB=93=E7=AE=97=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=80=85=EF=BC=8C=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=85=AC=E5=85=B1=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 34 ++++++++++- .../deliverRecordMain.data.ts | 56 +++++++++++++++++++ .../deliverRequestMain.data.ts | 2 - .../deliverplan/saleMain/saleMain.data.ts | 24 ++++---- .../customerStatementMain.data.ts | 2 +- 5 files changed, 100 insertions(+), 18 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 72ef90780..25697de78 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -585,6 +585,7 @@ export const DeliverJobMain = useCrudSchemas( }, isTable: false }, + { label: '创建时间', field: 'createTime', @@ -635,7 +636,6 @@ export const DeliverJobMain = useCrudSchemas( table: { width: 180 }, - isTable: false, form: { component: 'DatePicker', componentProps: { @@ -652,7 +652,6 @@ export const DeliverJobMain = useCrudSchemas( table: { width: 150 }, - isTable: false }, { label: '操作', @@ -904,6 +903,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, isTable: false, }, + { label: '创建时间', field: 'createTime', @@ -943,6 +943,36 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, isTable: true, }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, + ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 6d87a4b22..9aee9b616 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -402,6 +402,34 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -814,6 +842,34 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, isTable: true, }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '任务明细ID', // field: 'jobDetailId', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 9ffaa9d3b..ba7796931 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -1115,7 +1115,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, form: { component: 'DatePicker', componentProps: { @@ -1135,7 +1134,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, isTableForm: false, isForm: false }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index f8f69a610..f7fda27e5 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -176,15 +176,6 @@ export const SaleMain = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '创建时间', field: 'createTime', @@ -216,14 +207,13 @@ export const SaleMain = useCrudSchemas(reactive([ }, }, { - label: '最后更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, isForm: false, - isTable: false }, { label: '最后更新时间', @@ -245,7 +235,15 @@ export const SaleMain = useCrudSchemas(reactive([ } }, isForm: false, - isTable: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, }, { label: '当前阶段', diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 124616c97..1a5904214 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -116,7 +116,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'YYYY-MM' + valueFormat: 'YYYY-MM', } }, }, From fe18243755250e4ad59a76afc3693362335c13a1 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 26 Nov 2024 15:29:30 +0800 Subject: [PATCH 04/12] =?UTF-8?q?YT-1238=EF=BC=9A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=B9=8B=E5=90=8E=E6=B2=A1=E6=9C=89=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=89=93=E5=8D=B0=E5=8F=91=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 2555afd6a..05ba7a993 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -696,7 +696,7 @@ const buttonTableClick = async (val, row) => { labelPrint(row) } else if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.masterId) + handleDocumentPrint(row.masterId,row.masterId) } } const footButttondata = ref([ @@ -1080,13 +1080,14 @@ const genRecords = async (id: number) => { // 发起处理 SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id) .then((res) => { + console.log('res',res) message.success(t('ts.处理成功!')) // 刷新列表 getList() getLoading?.close() // 单据打印 - handleDocumentPrint(id) + handleDocumentPrint(res,id) }) .catch((err) => { getLoading?.close() @@ -1242,8 +1243,8 @@ const print = async () => { const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) // 物料状态是号试显示生准订单的发货单模版 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) -const handleDocumentPrint = async (id) => { - await SupplierdeliverRequestMainApi.getItemStatus(id).then(async (res) => { +const handleDocumentPrint = async (id,stausId) => { + await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => { if (res) { //号试（生准订单）模板 window.open(documentSrc2.value + '&id=' + id) From d81b2fce002bacc00e5b1356f444082902242e27 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Tue, 26 Nov 2024 15:36:19 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index d44eae0c6..6bff0c144 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1824,18 +1824,18 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive Date: Tue, 26 Nov 2024 16:25:44 +0800 Subject: [PATCH 06/12] =?UTF-8?q?YT-1289=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=EF=BC=8C=E5=86=8D=E6=AC=A1=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA123=EF=BC=8C=E5=BA=94=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportForm/src/ImportCustomerStatementShareForm.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue index 922ff5143..5eb16a5ed 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue @@ -275,7 +275,6 @@ const verifyData = async () => { // buttonBaseClick('refresh',null) } catch { //取消走的 - alert(123); } }else if(data.status==3){ await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已确认分摊金额，无法导入') From 4f7856fb3c29b58e1e8bd94d479d8171e333327e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 26 Nov 2024 16:33:06 +0800 Subject: [PATCH 07/12] =?UTF-8?q?YT-1288=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=EF=BC=8C=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C=E7=A1=AE=E8=AE=A4=E5=AE=8C?= =?UTF-8?q?=E5=88=86=E6=91=8A=E9=87=91=E9=A2=9D=E5=90=8E=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=91=E9=A2=9D=E5=BA=94=E4=B8=8D=E8=83=BD=E5=9C=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moldAllocation/customerStatement/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue index 8588cce12..fb2dde87c 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue @@ -117,7 +117,7 @@