From 7fc3b38627cee885ca7544dee61ef4fd797c4acf Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 08:52:42 +0800 Subject: [PATCH 01/40] =?UTF-8?q?YT-1142=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 1 + .../inventorymoveRequestMain.data.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index e27f756a0..434002db7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -362,6 +362,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // newRow['fromPackingNumber'] = item['packingNumber'] newRow['fromContainerNumber'] = item['containerNumber'] newRow['itemCode'] = item['itemCode'] + newRow['balanceQty'] = item['qty'] if (item['batch'] != '') { newRow['fromBatch'] = item['batch'] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 9d7da189e..6d43f3759 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -655,6 +655,22 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( // isTableForm: false, // isForm: false, // }, + { + label: '库存余额', + field: 'balanceQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true + } + }, { label: '数量', field: 'qty', From 6c0dbbf41e6f4ba2afe854804f35f0b4fee1cdb4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 21 Nov 2024 08:52:52 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatementMain.data.ts | 6 +++--- ...merToolApportStatementForecastMain.data.ts | 16 +++++++++------- .../index.vue | 19 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 2b61a8290..36034c83f 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatterYM } from '@/utils/formatTime' import { validateTwoNum } from '@/utils/validator' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' const { t } = useI18n() // 国际化 @@ -72,7 +72,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '年月', field: 'yearsMonth', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatterYM, isSearch: true, search: { component: 'DatePicker', @@ -164,7 +164,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 360, + width: 400, fixed: 'right' } } diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts index 38f6d0e33..b0f00e24c 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatterYM } from '@/utils/formatTime' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' const { t } = useI18n() // 国际化 @@ -64,21 +64,24 @@ export const CustomerToolApportStatementForecastMain = useCrudSchemas(reactive([ { label: '车型', - field: 'number', + field: 'vehicleType', sort: 'custom', isSearch: true, }, { label: '模具分摊预测金额', - field: 'articleNumber', + field: 'forecastAllocationAmount', sort: 'custom', isSearch: true, }, diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue index c8284f58f..851d3a63a 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue @@ -333,16 +333,15 @@ const changeTabs = async (item) => { }] apiPage.value = CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage DetailAllSchemas.value = CustomerToolApportStatementForecastDetail.allSchemas - otherHeadButttonData.value = [] - // otherHeadButttonData.value = [{ - // label: t(`ts.导出`).replace('ts.', ''), - // name: 'exportDetail', - // hide: false, - // type: 'success', - // icon: 'ep:download', - // color: '', - // hasPermi: '' - // }] + otherHeadButttonData.value = [{ + label: t(`ts.导出`).replace('ts.', ''), + name: 'exportDetail', + hide: false, + type: 'success', + icon: 'ep:download', + color: '', + hasPermi: '' + }] } else if (item.prop == 'ForecastWithBilltDifference') { // 点击预测与对账单差异 tabsExtend.value = true From 9884fd34df04fc9f05f4b64c78f887f0f8c4301c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 21 Nov 2024 08:58:35 +0800 Subject: [PATCH 03/40] =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatementMain.data.ts | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 36034c83f..124616c97 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -68,32 +68,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, - { - label: '年月', - field: 'yearsMonth', - sort: 'custom', - formatter: dateFormatterYM, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - detail: { - dateFormat: 'YYYY-MM' - }, - isTable:false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'YYYY-MM' - } - }, - }, + // { // label: '年月', // field: 'yearsMonthStr', @@ -120,7 +95,31 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ } }, }, - + { + label: '年月', + field: 'yearsMonth', + sort: 'custom', + formatter: dateFormatterYM, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + detail: { + dateFormat: 'YYYY-MM' + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'YYYY-MM' + } + }, + }, { label: '创建者', field: 'creator', From da0298f2ee0bf8fb11645b06face53887ffe078b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 08:59:35 +0800 Subject: [PATCH 04/40] =?UTF-8?q?YT-1143=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=87=8D=E6=96=B0=E9=80=89=E6=8B=A9=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BB=A3=E7=A0=81=E5=90=8E=EF=BC=8C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=B8=85=E7=A9=BA=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 434002db7..64e2c27e4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -420,7 +420,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => item.value = val[0]["code"] } }) - } + } + + tableData.value = [] } setV[formField] = val[0][searchField] formRef.setValues(setV) From 20c65898f35cc003fc121fc83895fec2b5bec4d2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:04:07 +0800 Subject: [PATCH 05/40] =?UTF-8?q?YT-1144=E5=90=88=E6=A0=BC=E8=BD=AC?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=A7=BB=E5=88=B0=E6=9C=80=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E8=A6=81=E6=B1=82=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?->=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveJobMain/inventorymoveJobMain.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index dfaf623f1..fcef8685e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -200,7 +200,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ width: 150 }, isTable: true, - sortTableDefault:6, + sortTableDefault:1000, }, // { // label: '自动完成', @@ -474,7 +474,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ sortTableDefault:20, }, { - label: '要求截止时间', + label: '截止时间', field: 'requestDueTime', formatter: dateFormatter, detail: { @@ -606,7 +606,7 @@ export const InventorymoveJobMainRules = reactive({ { required: true, message: '请输入申请时间', trigger: 'change' } ], requestDueTime: [ - { required: true, message: '请输入要求截止时间', trigger: 'change' } + { required: true, message: '请输入截止时间', trigger: 'change' } ], status: [ { required: true, message: '请选择状态', trigger: 'change' } From d8dd5f30755b1b9293ccc2e349cb93c1ab3e0085 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:08:10 +0800 Subject: [PATCH 06/40] =?UTF-8?q?YT-1146=E7=94=B3=E8=AF=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=BB=8E=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=88=B0=E5=8C=85=E8=A3=85=E5=8F=B7=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/Table.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index d021328a9..0f323f45d 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -106,7 +106,7 @@ export default defineComponent({ if (!wsCache.get('ShowPackingNumber')) { if (columns) { - columns = columns.filter(item => item.field != 'packingNumber') + columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber') } } for (const v of columnsChildren || columns) { @@ -347,7 +347,7 @@ export default defineComponent({ } = unref(getProps) if (!wsCache.get('ShowPackingNumber')) { if (columns) { - columns = columns.filter(item => item.field != 'packingNumber') + columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber') } } //默认排序 From 06980eac7b54633e937db01611d11c58041b4a0d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:13:22 +0800 Subject: [PATCH 07/40] =?UTF-8?q?YT-1148=E8=AE=B0=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8F=91=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E4=BB=8E=E5=8C=85=E8=A3=85=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=88=B0=E5=8C=85=E8=A3=85=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecordMain/inventorymoveRecordMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index b3ccec9c9..53aecd8e8 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -141,6 +141,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, + isDetail: false, }, { label: '从仓库代码', From ce4373d3ed96d1948696f398285d960c88ce8e5c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:17:22 +0800 Subject: [PATCH 08/40] =?UTF-8?q?YT-1149=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=9C=89=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 95a6c30c7..b2cad323a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -76,6 +76,9 @@ @searchTableSuccessDetail="searchTableSuccessDetail" @detailOpenForm="detailOpenForm" :detailValidate="detailValidate" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> From 7b61668c2978890a54bf4dd443bf7d7b30c1686d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:20:22 +0800 Subject: [PATCH 09/40] =?UTF-8?q?YT-1147=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E7=BC=96=E8=BE=91=E4=B8=AD=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E5=92=8C=E5=B7=A5=E4=BD=8D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index b2cad323a..74c170f97 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -654,6 +654,14 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = false itemColumns.componentProps.disabled = true } + if (itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } + if (itemColumns.field == 'workStationCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } }) } else { // 修改 tableform 属性 @@ -661,6 +669,14 @@ const openForm =async (type: string, row?: number) => { if(itemColumns.field == 'workshopCode') { itemColumns.componentProps.isSearchList = true itemColumns.componentProps.disabled = false + } + if (itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = true + itemColumns.componentProps.disabled = false + } + if (itemColumns.field == 'workStationCode') { + itemColumns.componentProps.isSearchList = true + itemColumns.componentProps.disabled = false } }) } From b5999acf891e7218cec2df418bcfe8a6cb34521e Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 21 Nov 2024 09:24:52 +0800 Subject: [PATCH 10/40] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=A9=B3=E5=9B=9E=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=90=8E=E7=BC=BA=E5=B0=91=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=20=20YT-1095?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 21 +++- .../purchaseClaimRequest/index.vue | 118 ++++++++++-------- 2 files changed, 81 insertions(+), 58 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 7817ec0ab..b84a7b5ae 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -41,7 +41,7 @@ @@ -266,8 +266,20 @@ const handleSelectionPoint = async () => { }) // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) } + + +const isShowPointBtn = (row) =>{ + if(row.qty>0){ +   return false + }else{ +   return true + } +} + + // 列表-操作按钮 -const butttondata = [ +const butttondata = (row) => { +  return [ // { // label: '标签信息', // name: 'bqxx', @@ -279,10 +291,11 @@ const butttondata = [ // float: 'right', // hasPermi: '' // }, - defaultButtons.mainListPointBtn(null) // 标签打印 + defaultButtons.mainListPointBtn({hide: isShowPointBtn(row)} ) // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 -] +  ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue index 0e2602641..32ac1a8ea 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue @@ -80,8 +80,8 @@ :apiDelete="PurchaseClaimRequestDetailApi.deletePurchaseClaimRequestDetail" :detailButtonIsShowDelete="false" :detailButtonIsShowAdd="false" - :detailButtonIsShowAddStatusArray="['1','2']" - :isChangeDetailDrawer="['2']" + :detailButtonIsShowAddStatusArray="['1', '2']" + :isChangeDetailDrawer="['2']" @searchTableSuccessDetail="searchTableSuccessDetail" @detailOpenForm="detailOpenForm" /> @@ -96,14 +96,14 @@ :mode="2" :extend="businessType" /> - @@ -154,28 +154,34 @@ const updataTableColumns = (val) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { nextTick(async () => { if (type == 'tableForm') { - if(formField == 'itemCode'){ - let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode'])) - if(itemCodes.length>0){ - itemCodes = itemCodes.map(item=>(item['itemCode'])) + if (formField == 'itemCode') { + let itemCodes = val.filter((item) => + tableData.value.find((item1) => item1['itemCode'] == item['itemCode']) + ) + if (itemCodes.length > 0) { + itemCodes = itemCodes.map((item) => item['itemCode']) message.warning(`物料${itemCodes.join(',')}已经存在`) } - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode'])) - if(val.length==0){ + val = val.filter( + (item) => !tableData.value.find((item1) => item1['itemCode'] == item['itemCode']) + ) + if (val.length == 0) { return } - let newVal = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode'])) - newVal.forEach(item=>{ + let newVal = val.filter( + (item) => !tableData.value.find((item1) => item1['itemCode'] == item['itemCode']) + ) + newVal.forEach((item) => { let tfk = JSON.parse(JSON.stringify(tableFormKeys)) tfk['itemCode'] = item['itemCode'] tfk['itemName'] = item['itemName'] tfk['uom'] = item['supplierUom'] tableData.value.push(tfk) - }) + }) } - } + } const setV = {} - if(formField === 'supplierCode'){ + if (formField === 'supplierCode') { setV['supplierCode'] = val[0]['code'] setV['supplierName'] = val[0]['name'] tableData.value = [] @@ -192,9 +198,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['remark'] = val[0]['remark'] setV['uom'] = val[0]['customerUom'] if (formField == 'itemCode') { - setV['itemName'] = val[0]['itemName'] - setV['uom'] = val[0]['supplierUom'] - + setV['itemName'] = val[0]['itemName'] + setV['uom'] = val[0]['supplierUom'] } formRef.setValues(setV) }) @@ -277,9 +282,14 @@ const butttondata = (row, $index) => { hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseClaimRequest:update' }), // 编辑 - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3']),hasPermi:'wms:purchaseClaimRequest:close'}), // 关闭 - - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchaseClaimRequest:reAdd'}), // 重新添加 + defaultButtons.mainListCloseBtn({ + hide: isShowMainButton(row, ['1', '2', '3']), + hasPermi: 'wms:purchaseClaimRequest:close' + }), // 关闭 + defaultButtons.mainListReAddBtn({ + hide: isShowMainButton(row, ['4', '5']), + hasPermi: 'wms:purchaseClaimRequest:reAdd' + }) // 重新添加 ] } @@ -291,44 +301,46 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanSub') { // 提交审批 handleSub(row.masterId) - } - else if (val == 'mainPlanApp') { + } else if (val == 'mainPlanApp') { // 审批通过 handleAgree(row.masterId) - } - else if (val == 'mainPlanTur') { + } else if (val == 'mainPlanTur') { // 审批驳回 handleReject(row.masterId) - } - else if (val == 'delete') { + } else if (val == 'delete') { // 删除 handleDelete(row.masterId) - }else if (val == 'mainClose') { // 关闭 + } else if (val == 'mainClose') { + // 关闭 await message.confirm('确认要关闭吗？') tableObject.loading = true - PurchaseClaimRequestMainApi.closePurchaseClaimRequestMain(row.masterId).then(() => { - message.success(t('common.updateSuccess')) - tableObject.loading = false - buttonBaseClick('refresh',null) - }).catch(err => { - tableObject.loading = false - console.log(err) - }) - } else if (val == 'mainReAdd') { // 重新添加 -    await message.confirm('确认要重新添加吗？') -    tableObject.loading = true -    PurchaseClaimRequestMainApi.reAddPurchaseClaimRequestMain(row.masterId).then(() => { -      message.success(t('common.updateSuccess')) -      tableObject.loading = false -      buttonBaseClick('refresh',null) -    }).catch(err => { -      tableObject.loading = false -      console.log(err) -    }) -  } + PurchaseClaimRequestMainApi.closePurchaseClaimRequestMain(row.masterId) + .then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + buttonBaseClick('refresh', null) + }) + .catch((err) => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainReAdd') { + // 重新添加 + await message.confirm('确认要重新添加吗？') + tableObject.loading = true + PurchaseClaimRequestMainApi.reAddPurchaseClaimRequestMain(row.masterId) + .then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + buttonBaseClick('refresh', null) + }) + .catch((err) => { + tableObject.loading = false + console.log(err) + }) + } } - /** 提交审批按钮操作 */ const handleSub = async (masterId: number) => { try { @@ -383,20 +395,19 @@ const handleReject = async (masterId: number) => { } } - /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: any) => { tableData.value = [] // 重置明细数据 if (row?.id) { - PurchaseClaimRequestMain.allSchemas.formSchema.forEach(item => { + PurchaseClaimRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { item.componentProps.isSearchList = false item.componentProps.disabled = true } }) } else { - PurchaseClaimRequestMain.allSchemas.formSchema.forEach(item => { + PurchaseClaimRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { item.componentProps.isSearchList = true item.componentProps.disabled = false @@ -561,7 +572,7 @@ const detailOpenForm = (type, row, masterParmas) => { } } // 审批中的时候详情的编辑提交 -const submitFormDetail =async (formType,data) => { +const submitFormDetail = async (formType, data) => { detailFormRef.value.formLoading = true try { if (formType === 'create') { @@ -577,7 +588,6 @@ const submitFormDetail =async (formType,data) => { } catch { detailFormRef.value.formLoading = false } - } /** 初始化 **/ onMounted(async () => { From ccb44132e476db0a9fa8ca45fcc23998d6816a95 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:31:21 +0800 Subject: [PATCH 11/40] =?UTF-8?q?YT-1151=E7=82=B9=E5=87=BB=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E8=A7=84=E5=88=99=E6=9D=A1=E4=BB=B6=E5=BA=94?= =?UTF-8?q?=E6=9C=89=E9=BB=98=E8=AE=A4=EF=BC=8C=E7=8E=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/repairMaterialStrategy/AddForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 180f8ff8a..dd5509adb 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -603,7 +603,7 @@ const resetForm = () => { //规则条件集合 condition: [ // 物料类型/物料分组/物料/abc类/项目/ - { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }, + { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 仓库 { ParamCode: 'LocationCode', Operator: 'IN', Value: '' } ], From e0bedadc216d61d19001a3cab1d738014471988c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 09:38:09 +0800 Subject: [PATCH 12/40] =?UTF-8?q?YT-1153=E9=82=AE=E7=AE=B1=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=85=B3=E9=97=AD=EF=BC=8C=E9=82=AE=E7=AE=B1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=BA=94=E4=B8=8D=E8=AE=A9=E5=A1=AB=EF=BC=8C=E7=81=B0?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/repairMaterialStrategy/AddForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index dd5509adb..8b3fd4677 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -290,7 +290,7 @@ { required: formData.configuration.emailNotification, message: '请输入邮箱地址', trigger: 'change' }, { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'} ]"> - + From ae0a4c0fbb79660e85af90322625465322856858 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 21 Nov 2024 11:15:23 +0800 Subject: [PATCH 13/40] =?UTF-8?q?YT-275:=E6=96=B0=E5=A2=9E=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRecordMain.data.ts | 6 +++--- .../customerSaleInvoiceRequestMain/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index 0544c52b0..f1b236a20 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -121,7 +121,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ }, { label: '未税金额', - field: 'mainBeforeTaxAmount', + field: 'beforeTaxAmount', sort: 'custom', form: { componentProps: { @@ -145,7 +145,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ }, { label: '税额', - field: 'mainTaxAmount', + field: 'taxAmount', sort: 'custom', form: { componentProps: { @@ -155,7 +155,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ }, { label: '价税合计金额', - field: 'mainAdTaxAmount', + field: 'adTaxAmount', sort: 'custom', form: { componentProps: { diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue index 332003adb..7d9f55eaf 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue @@ -151,7 +151,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:`wms:customer-sale-invoice-request-main:create` }), // 新增 - defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-request-main:import` }), // 导入 + //defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-request-main:import` }), // 导入 defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-request-main:export` }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From b61aed78990bc55db47e4b1ec4b6484f4721a4a8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 11:25:42 +0800 Subject: [PATCH 14/40] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=A4=B1=E5=8E=BB?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplieDeliveryStrategy/AddForm.vue | 210 +++++++++--------- .../strategy/upShelfStrategy/AddForm.vue | 11 +- 2 files changed, 111 insertions(+), 110 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 81d5154a9..2b76dcc70 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -82,10 +82,13 @@ :key="'仓库和库区Operator'+cur.value" /> - - - - + + + - - - - + + + @@ -145,10 +151,13 @@ - - - - + + + @@ -561,110 +570,93 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { formData.value.configuration.PhoneNumber = val[0].contactPhone } } -// 受入地失去焦点校验 -const blurWarehouseByCodes = async (formField) => { - if (formField == 'WarehouseCode') { - let WarehouseCode = formData.value.condition.find(item=>item['ParamCode']=='WarehouseCode') - if(WarehouseCode&&WarehouseCode.Value){ - let verifyRes = await WarehouseApi.getWarehouseByCodes({ - codes:WarehouseCode.Value - }) - console.log('事务类型verifyRes',verifyRes) - if (verifyRes && verifyRes.length > 0) { - const arr1 = WarehouseCode.Value.split(',') - if (arr1.length != verifyRes.length) { - const arr2 = verifyRes.map((item) => item.code) - const str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') - message.alert('代码' + str + '没有找到对应数据') - WarehouseCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' - return - } - } else { - WarehouseCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' - message.alert('暂无数据') - } - }else{ - WarehouseCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' - } - } else { - let AreaCode = formData.value.condition.find(item=>item['ParamCode']=='AreaCode') - if(AreaCode&&AreaCode.Value){ - let verifyRes = await AreaApi.getAreabasicByCodes({ - codes:AreaCode.Value - }) - console.log('事务类型verifyRes',verifyRes) - if (verifyRes && verifyRes.length > 0) { - const arr1 = AreaCode.Value.split(',') - if (arr1.length != verifyRes.length) { - const arr2 = verifyRes.map((item) => item.code) - const str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') - message.alert('代码' + str + '没有找到对应数据') - AreaCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' - return - } - } else { - AreaCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' - message.alert('暂无数据') - } - }else{ - WarehouseCode.Value = '' - // formData.value.configuration.DockCode='' - // formData.value.configuration.Receiver='' - // formData.value.configuration.PhoneNumber='' +const blurWarehouse = async ({module='config',type})=>{ + + // 校验的值 + let warehouseValue = formData.value.configuration[WarehouseCodeOrArea.value] + let conditionObj = null + if(module=='condition'){ + // 规则条件 + conditionObj = formData.value.condition.find(item=>item['ParamCode']==type) + if(conditionObj){ + warehouseValue = conditionObj['Value'] } + // { value: 'WarehouseCode', label: '仓库' }, + // { value: 'AreaCode', label: '库区' }, + // { value: 'LocationGroupCode', label: '库位组' }, + // { value: 'LocationCode', label: '库位' } } - -} -// 供应商失去焦点 -const blurSupplierCode = async () => { - let SupplierCode = formData.value.condition.find(item => item['ParamCode'] == 'SupplierCode') - console.log(77,SupplierCode) - if(SupplierCode&&SupplierCode.Value){ - let verifyRes = await SupplierApi.getSupplierListByCodes({ - codes:SupplierCode.Value + if(!warehouseValue){ + return + } + let verifyRes = [] + console.log(222,warehouseValue) + if(module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ + // 仓库 + verifyRes = await WarehouseApi.verifyWarehouse({ + code:warehouseValue }) - console.log('事务类型verifyRes',verifyRes) - if (verifyRes && verifyRes.length > 0) { - const arr1 = SupplierCode.Value.split(',') - if (arr1.length != verifyRes.length) { - const arr2 = verifyRes.map((item) => item.code) - const str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') + console.log('仓库verifyRes',verifyRes) + }else if(module=='condition'&&type=='AreaCode' || module=='config'&&warehouseType.value == 'AreaCode'){ + // 库区 + verifyRes = await AreaApi.verifyAreaList({ + code:warehouseValue + }) + console.log('库区verifyRes',verifyRes) + }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ + // 库位组 + verifyRes = await LocationgroupApi.verifyLocationgroup({ + code:warehouseValue + }) + console.log('库位组verifyRes',verifyRes) + }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ + // 库位 + verifyRes = await LocationApi.verifyLocation({ + code:warehouseValue + }) + console.log('库位verifyRes',verifyRes) + }else if(module=='condition'&&type=='SupplierCode' || module=='config'&&warehouseType.value == 'SupplierCode'){ + // 库位 + verifyRes = await SupplierApi.getSupplierListByCodes({ + code:warehouseValue + }) + console.log('库位verifyRes',verifyRes) + } + if(verifyRes&&verifyRes.length>0){ + let verifyList = verifyRes.map(item=>(item['code'])) + if(module=='condition'){ + // 条件 + let codeList = warehouseValue.split(',') + conditionObj['Value'] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + const str = codeList.filter(item => verifyList.indexOf(item) == -1).join(',') + if (str) { message.alert('代码' + str + '没有找到对应数据') - SupplierCode.Value = '' - return } - } else { - SupplierCode.Value = '' - message.alert('暂无数据') + }else{ + // 配置 + let codeList = formData.value.configuration[warehouseType.value].split(',') + formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') } }else{ - SupplierCode.Value = '' + if(module=='condition'){ + message.alert('代码' + conditionObj['Value'] + '没有找到对应数据') + // 条件 + conditionObj['Value'] = '' + }else{ + message.alert('代码' + formData.value.configuration[warehouseType.value] + '没有找到对应数据') + formData.value.configuration[warehouseType.value] = '' + } + } + if(module!='condition'){ + let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] + fields.forEach(item=>{ + if(item!=warehouseType.value){ + formData.value.configuration[item] = '' + } + }) } } + // 月台失去焦点 const blurDockCode = async () => { if (formData.value.configuration.DockCode) { @@ -689,9 +681,11 @@ const blurDockCode = async () => { }) console.log('事务类型verifyRes',verifyRes) if (verifyRes.list && verifyRes.list.length > 0) { + let codeList = formData.value.configuration.DockCode.split(',') + formData.value.configuration.DockCode= codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') } else { + message.alert('代码' + formData.value.configuration.DockCode + '没有找到对应数据') formData.value.configuration.DockCode = '' - message.alert('暂无数据') } } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 05a68ebac..96c4efee8 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1077,17 +1077,24 @@ const blurWarehouse = async ({module='config',type})=>{ // 条件 let codeList = warehouseValue.split(',') conditionObj['Value'] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + const str = codeList.filter(item => verifyList.indexOf(item) == -1).join(',') + if (str) { + message.alert('代码' + str + '没有找到对应数据') + } }else{ // 配置 let codeList = formData.value.configuration[warehouseType.value].split(',') formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') } + }else{ if(module=='condition'){ - // 条件 - conditionObj['Value'] = '' + message.alert('代码' + conditionObj['Value'] + '没有找到对应数据') + // 条件 + conditionObj['Value'] = '' }else{ + message.alert('代码' + formData.value.configuration[warehouseType.value] + '没有找到对应数据') formData.value.configuration[warehouseType.value] = '' } } From b97380864ff812539288944c0cfdb9677a9f9795 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 21 Nov 2024 11:45:06 +0800 Subject: [PATCH 15/40] =?UTF-8?q?SCP=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/suppliperMoldCostDetail/index.ts | 18 + src/api/wms/suppliperMoldCostMain/index.ts | 33 ++ .../src/ImportSupplierMoldCostForm.vue | 467 ++++++++++++++++++ src/utils/dict.ts | 4 + .../supplierMoldCostMain/index.vue | 284 +++++++++++ .../supplierMoldCostMain.data.ts | 178 +++++++ 6 files changed, 984 insertions(+) create mode 100644 src/api/wms/suppliperMoldCostDetail/index.ts create mode 100644 src/api/wms/suppliperMoldCostMain/index.ts create mode 100644 src/components/ImportForm/src/ImportSupplierMoldCostForm.vue create mode 100644 src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue create mode 100644 src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts diff --git a/src/api/wms/suppliperMoldCostDetail/index.ts b/src/api/wms/suppliperMoldCostDetail/index.ts new file mode 100644 index 000000000..bd87e852d --- /dev/null +++ b/src/api/wms/suppliperMoldCostDetail/index.ts @@ -0,0 +1,18 @@ +import request from '@/config/axios' +export const getSupplierMoldCostDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-tool-apport-statement-detail/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-tool-apport-statement-detail/page`, params }) + } +} +export const exportSupplierMoldCostDetail = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplier-tool-apport-statement-detail/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/supplier-tool-apport-statement-detail/export-excel`, params }) + } +} diff --git a/src/api/wms/suppliperMoldCostMain/index.ts b/src/api/wms/suppliperMoldCostMain/index.ts new file mode 100644 index 000000000..bb9c209fb --- /dev/null +++ b/src/api/wms/suppliperMoldCostMain/index.ts @@ -0,0 +1,33 @@ +import request from '@/config/axios' +// 从客户对账单中获取客户代码 -- 销售申请 +export const getCustomerList = async () => { + return await request.get({ url: `/wms/supplier-tool-apport-statement-main/getCustomerList`}) +} +export const getSupplierMoldCostMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-tool-apport-statement-main/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-tool-apport-statement-main/page`, params }) + } +} +export const exportSupplierMoldCostMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplier-tool-apport-statement-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/supplier-tool-apport-statement-main/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier-tool-apport-statement-main/get-import-template' }) +} +// 导入客户对账单前校验是否有相同客户代码和年月的数据存在 +export const verifyDataExist = async (yearsMonthStr: String,customerCode:String) => { + return await request.get({ url: `/wms/supplier-tool-apport-statement-main/verifyDataExist?yearsMonthStr=` + yearsMonthStr+'&customerCode='+customerCode }) +} + + diff --git a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue new file mode 100644 index 000000000..a229e9337 --- /dev/null +++ b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue @@ -0,0 +1,467 @@ + + + + + diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 845be7f91..a9fa2e771 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -415,4 +415,8 @@ export enum DICT_TYPE { DELIVER_METHOD = 'deliver_method', CUSTOMER_SALE_INVOICE_TYPE = 'customer_saleInvoice_type', // 销售开票 LEADERSHIP_MATERIAL_TYPE = 'leadership_material_type', + SUPPLIER_TOOL_APPORT_STATEMENT_MAIN = 'supplier_tool_apport_statement_main', // 供应商模具费用主 + SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子 + + } diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue new file mode 100644 index 000000000..afeb10a82 --- /dev/null +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue @@ -0,0 +1,284 @@ + + + + \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts new file mode 100644 index 000000000..de91af5b7 --- /dev/null +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts @@ -0,0 +1,178 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter , dateFormatterYM } from '@/utils/formatTime' +import { validateTwoNum } from '@/utils/validator' + + +export const SupplierMoldCostMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + fixed: 'left', + isSearch: true, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.SUPPLIER_TOOL_APPORT_STATEMENT_MAIN, + dictClass: 'string', + form: { + //value: '',//可以添加默认值 有无都可 + component: 'Select', + }, + isSearch: true, + search:{ + component:'Select', + componentProps: { + multiple:true, + } + + }, + }, + { + label: '版本号', + field: 'versionNumber', + sort: 'custom', + isTable: false + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '年月', + field: 'yearsMonth', + sort: 'custom', + formatter: dateFormatterYM, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + detail: { + dateFormat: 'YYYY-MM' + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'YYYY-MM' + } + }, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isDetail:true, + isForm: false, + isTable:true + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + isTable:true, + isForm: false, + table:{ + width:180 + } + }, + { + label: '更新者', + field: 'updater', + sort: 'custom', + isDetail:true, + isForm: false, + isTable:false + }, + { + label: '更新时间', + field: 'updateTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + isTable:false, + isForm: false, + table:{ + width:180 + } + } +])) + + +export const SupplierMoldCostDetail = useCrudSchemas(reactive([ + { + label: '物料品号', + field: 'articleNumber', + sort: 'custom', + isForm: false, + }, + { + label: '车型', + field: 'vehicleType', + sort: 'custom', + isForm: false, + }, + { + label: '金额', + field: 'amount', + sort: 'custom', + isSearch: true, + isForm: false, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL, + dictClass: 'string', + form: { + //value: '',//可以添加默认值 有无都可 + component: 'Select', + }, + }, +])) + + From 49db404cade074bee7376da4e2982fd0b5e25b3e Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 21 Nov 2024 11:58:18 +0800 Subject: [PATCH 16/40] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BD=BF=E7=94=A8=E7=AD=9B=E9=80=89=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=20YT-1170?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 2 +- .../PurchaseClaimRecordMain.data.ts | 24 +++---------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index c0e6c31d8..af62834b8 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1239,7 +1239,7 @@ const print = async () => { // 单据打印 // const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken()) -const documentSrc = ref(BASE_URL + '/jmreport/view/932556833517789184?token=' + getAccessToken()) +const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) const handleDocumentPrint = async (id) => { window.open(documentSrc.value + '&id=' + id) } diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts index e82be6e6c..1a2c05a4f 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts @@ -26,7 +26,7 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ isSearch: true, isForm: false, table: { - width: 150 + width: 180 }, }, { @@ -36,7 +36,7 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ isSearch: true, isForm: false, table: { - width: 150 + width: 180 }, }, { @@ -119,7 +119,7 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ } }, table: { - width: 180 + width: 200 }, }, { @@ -211,8 +211,6 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, table: { - width: 150, - }, tableForm:{ multiple:false,//多选 @@ -291,7 +289,6 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ field: 'itemName', sort: 'custom', table: { - width: 150 }, tableForm: { disabled:true, @@ -307,7 +304,6 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { disabled:true, @@ -321,7 +317,6 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { type: 'InputNumber', @@ -336,24 +331,11 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { type: 'InputNumber', min: 0, precision: 5 } - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - hiddenInMain:true, - table: { - width: 150, - fixed: 'right' - }, - isTableForm: false, } ])) From 0ef262eda768c5d5693eafc89327d62879d96f8a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Nov 2024 12:00:32 +0800 Subject: [PATCH 17/40] =?UTF-8?q?=E5=8F=91=E6=96=99=E5=A4=B1=E5=8E=BB?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 46 +++++++++++++++---- .../strategy/upShelfStrategy/AddForm.vue | 4 ++ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 2cf69dc8d..53fd60db2 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -341,7 +341,7 @@ :key="'生产线Operator'+cur.value" /> - +