From e9205a34b9a6659b85d17d96eb2eec92404a89a2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 20 Nov 2024 14:11:47 +0800 Subject: [PATCH 01/18] =?UTF-8?q?YT-1120=E9=9A=94=E7=A6=BB=E8=BD=AC?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=9C=89=E5=88=9B=E5=BB=BA=E8=80=85=E5=92=8C=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/customerManage/customeritem/index.vue | 7 ++++++- .../inventorymoveRecordMain.data.ts | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index d51b95a7b..9cdb2c851 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -221,7 +221,8 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { +const formsSuccess = async (formType, data) => { + try { var isHave =Customeritem.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); @@ -248,6 +249,10 @@ const formsSuccess = async (formType,data) => { }else{ buttonBaseClick('refresh',null) } + } catch { + basicFormRef.value.formLoading = false + } + } const onEnter = async (field,value)=>{ console.log(field,value) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index 5a5271fa8..b3ccec9c9 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -276,6 +276,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + sortTableDefault: 1000, }, { label: '创建者', @@ -284,6 +285,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault: 1000, }, { label: '最后更新时间', From 3f13d70143ce8d11e8eea91b12df205f17ffd471 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 20 Nov 2024 14:22:19 +0800 Subject: [PATCH 02/18] =?UTF-8?q?YT-1134WMS=20=E9=A1=B5=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=9C=AA=E6=8C=89=E7=85=A7=E5=8E=9F=E5=9E=8B=E5=9B=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 7a44789e3..9d7da189e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -129,6 +129,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, + isDetail: false, }, { label: '申请时间', @@ -151,6 +153,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } }, isForm: false, + sortTableDefault: 1001, }, { label: '截止时间', @@ -172,6 +175,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + sortTableDefault: 1001, }, // { // label: '从库区类型范围', @@ -401,6 +405,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + sortTableDefault: 1001, }, { label: '创建者', @@ -410,7 +415,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, - isTable: true + isTable: true, + sortTableDefault: 1001, }, { label: '最后更新时间', @@ -433,7 +439,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } }, isForm: false, - isTable: false + isTable: false, + sortTableDefault: 1001, }, { label: '最后更新者', @@ -443,7 +450,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, - isTable: false + isTable: false, + sortTableDefault: 1001, }, { label: '操作', From b75bf616d489d4896e04fec33c3e52b3082bb211 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 20 Nov 2024 14:33:22 +0800 Subject: [PATCH 03/18] =?UTF-8?q?YT-1092=E6=96=B0=E5=A2=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E9=87=87=E8=B4=AD=E7=B4=A2=E8=B5=94=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=98=8E=E7=BB=86=E5=BA=94=E8=AF=A5=E6=98=AF=E5=8F=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseClaimRequestMain.data.ts | 13 +++++++++++-- .../purchaseClaim/purchaseClaimRequest/index.vue | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts index 0d63b2516..413440157 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts @@ -285,9 +285,13 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( table: { }, tableForm: { - disabled:true, - type: 'Select' + disabled:true }, + form: { + componentProps: { + disabled: true, + } + } }, { label: '计量单位', @@ -303,6 +307,11 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( disabled:true, type: 'Select' }, + form: { + componentProps: { + disabled: true, + } + } }, { label: '索赔数量', diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue index c0578e5dd..d1c3d4c5e 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue @@ -82,6 +82,7 @@ :detailButtonIsShowAdd="false" :detailButtonIsShowAddStatusArray="['1','2']" :isChangeDetailDrawer="['2']" + @searchTableSuccessDetail="searchTableSuccessDetail" @detailOpenForm="detailOpenForm" /> @@ -190,6 +191,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV[formField] = val[0][searchField] setV['remark'] = val[0]['remark'] setV['uom'] = val[0]['customerUom'] + if (formField == 'itemCode') { + setV['itemName'] = val[0]['itemName'] + setV['uom'] = val[0]['supplierUom'] + + } formRef.setValues(setV) }) } From 78f5ee4ca67eb1535a2c65ac45682485350b5159 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 20 Nov 2024 14:39:41 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.ts | 155 +++++++++++ src/components/Detail/src/Detail.vue | 33 +++ src/utils/dict.ts | 1 + src/utils/formatTime.ts | 9 + .../customerSaleInvoiceRecordMain.data.ts | 46 +++- .../customerSaleInvoiceRequestMain.data.ts | 39 ++- .../customerStatementShareRecordMain.data.ts | 220 +++++++++++++++ .../customerStatementShareRecord/index.vue | 251 ++++++++++++++++++ 8 files changed, 746 insertions(+), 8 deletions(-) create mode 100644 src/api/wms/customerStatementShareRecordDetail/index.ts create mode 100644 src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts create mode 100644 src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue diff --git a/src/api/wms/customerStatementShareRecordDetail/index.ts b/src/api/wms/customerStatementShareRecordDetail/index.ts new file mode 100644 index 000000000..79ae1f06e --- /dev/null +++ b/src/api/wms/customerStatementShareRecordDetail/index.ts @@ -0,0 +1,155 @@ +import request from '@/config/axios' + +export interface CustomerStatementDetailVO { + id: number + number: string + masterId: number + invoiceType: string + releaseNumber: string + ingress: string + ingress2: string + itemCode: string + articleNumber: string + articleName: string + backNumber: string + checkTime: Date + uom: string + qty: number + price: number + amount: number + allocationPrice: number + tftmQuantity: number + intexQuantity: number + quantityVariance: number + tftmPrice: number + intexPrice: number + priceVariance: number + tftmAmount: number + intexAmount: number + amountVariance: number + dischargingTime: Date + acceptCheckTime: Date + remark: string + available: string + siteId: string + concurrencyStamp: string +} + + +export const getCustomerStatementShareRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/customer-tool-apport-statement-detail/seniorGroup', data }) + } else { + return await request.get({ url: `/wms/customer-tool-apport-statement-detail/pageGroup`, params }) + } +} + + +export const getCustomerStatementShareRecordDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/customer-tool-apport-statement-detail/seniorDetail', data }) + } else { + return await request.get({ url: `/wms/customer-tool-apport-statement-detail/pageDetail`, params }) + } +} + + +export const exportCustomerStatementShareRecordDetail = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/customer-tool-apport-statement-detail/export-excel-senior-detail`, data }) + }else{ + return await request.download({ url: `/wms/customer-tool-apport-statement-detail/export-excel-detail`, params }) + } +} + +// // 查询客户对账单子信息明细表（WMS）列表或者查询客户对账单对账差异列表 二者共用一个 +// export const getCustomerStatementDetailPage = async (params) => { +// if (params.isSearch) { +// delete params.isSearch +// const data = {...params} +// return await request.post({ url: '/wms/customer-statement-detail/senior', data }) +// } else { +// return await request.get({ url: `/wms/customer-statement-detail/page`, params }) +// } +// } +// // 查询客户对账单子信息明细表（WMS）列表或者查询客户对账单对账差异列表 二者共用一个 +// export const getCustomerStatementReconciliationPage = async (params) => { +// if (params.isSearch) { +// delete params.isSearch +// const data = { ...params } +// return await request.post({ url: '/wms/customer-statement-detail/senior', data }) +// } else { +// return await request.get({ url: `/wms/customer-statement-detail/page`, params }) +// } +// } +// // 查询模具分摊明细列表 +// export const getCustomerToolApportStatementPage = async (params) => { +// if (params.isSearch) { +// delete params.isSearch +// const data = { ...params } +// return await request.post({ url: '/wms/customer-tool-apport-statement-detail/senior', data }) +// } else { +// return await request.get({ url: `/wms/customer-tool-apport-statement-detail/page`, params }) +// } +// } + +// // 查询客户对账单子信息表（WMS）详情 +// export const getCustomerStatementDetail = async (id: number) => { +// return await request.get({ url: `/wms/customer-statement-detail/get?id=` + id }) +// } + +// // 新增客户对账单子信息表（WMS） +// export const createCustomerStatementDetail = async (data: CustomerStatementDetailVO) => { +// return await request.post({ url: `/wms/customer-statement-detail/create`, data }) +// } + +// // 修改客户对账单子信息表（WMS） +// export const updateCustomerStatementDetail = async (data: CustomerStatementDetailVO) => { +// return await request.put({ url: `/wms/customer-statement-detail/update`, data }) +// } + +// // 删除客户对账单子信息表（WMS） +// export const deleteCustomerStatementDetail = async (id: number) => { +// return await request.delete({ url: `/wms/customer-statement-detail/delete?id=` + id }) +// } + +// // 下载用户导入模板 +// export const importTemplate = () => { +// return request.download({ url: '/wms/customer-statement-detail/get-import-template' }) +// } + +// //导出明细数据需要传masterId +// export const exportCustomerStatementDetail = async (params) => { +// if (params.isSearch) { +// const data = {...params} +// return await request.downloadPost({ url: `/wms/customer-statement-detail/export-excel-senior`, data }) +// }else{ +// return await request.download({ url: `/wms/customer-statement-detail/export-excel`, params }) +// } +// } + +// //导出详情对账差异列表数据 需要传masterId +// export const exportCustomerStatementCompareDetail = async (params) => { +// if (params.isSearch) { +// const data = {...params} +// return await request.downloadPost({ url: `/wms/customer-statement-detail/export-excel-compare-senior`, data }) +// }else{ +// return await request.download({ url: `/wms/customer-statement-detail/export-excel-compare`, params }) +// } +// } + + +// // 客户模具分摊对账单修改调整金额 +// export const updateAdjustmentAmount = async (id: number, masterId: number, amount: number) => { +// return await request.get({ url: `wms/customer-tool-apport-statement-detail/updateAdjustmentAmount?id=` + id + '&masterId=' + masterId + '&amount=' + amount }) +// } + +// // 客户对账单直接创建开票申请查询子分页数据 +// export const pageInvoice = async (params) => { +// return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params }) +// } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index f465845f0..976055482 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -385,6 +385,12 @@ const props = defineProps({ required: false, default: null }, + // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件 + extendRowKeyValue: { + type: Array, + required: false, + default: null + }, // 子列表 筛选 展示与隐藏 ，默认展示 detailButtonIsShowFilter:{ type: Boolean, @@ -795,6 +801,14 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: tableObjectRef.value.params = { masterId: row.masterId||row.id } + if (props.extendRowKeyValue) { + // params 扩展的字段 + props.extendRowKeyValue.forEach(item => { + tableObject.params[item.key] = row[item.value] + masterParmas.value[item.key] =row[item.value] + + }) + } await getList() } isShowDrawer.value = true @@ -1139,6 +1153,25 @@ const searchFormClick = async (searchData) => { ? searchData.filters : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }] } + if (props.extendRowKeyValue) { + // params 扩展的字段 + props.extendRowKeyValue.forEach(item => { + let findItem = tableObjectRef.value.params.filters.find(item1=>item1.column == [item.key]) + if(findItem){ + findItem.value = masterParmas.value[item.key] + }else{ + tableObjectRef.value.params.filters.push({ + column : item.key, + action : "==", + value : masterParmas.value[item.key] + }) + } + + }) + } + + + tableObjectRef.value.params.filters // const { tableObject, tableMethods } = useTable({ // getListApi: props.apiPage // 分页接口 // }) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 57bdadce7..841762eac 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -411,6 +411,7 @@ export enum DICT_TYPE { RECEIVE_STATUS = 'receive_status', // 收货确认状态 LINE_SCRAP_REASON = 'Reason_or_scrapping_of_production_line', // 线边报废原因(现场史力维护的字典) CUSTOMER_STATEMENT_TYPE = 'customer_statement_type', // wms客户对账单 模具分摊状态 + CUSTOMER_TOOL_APPORT_STATEMENT_TYPE = 'customer_tool_apport_statement_type', // wms客户对账单 模具分摊状态 DELIVER_METHOD = 'deliver_method', CUSTOMER_SALE_INVOICE_TYPE = 'customer_saleInvoice_type' // 销售开票 diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index db7948081..f1463f58a 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -162,6 +162,15 @@ export const dateFormatter = (row, column, cellValue) => { } return formatDate(cellValue) } + +export const dateFormatterYM = (row, column, cellValue) => { + if (!cellValue) { + return + } + return formatDate(cellValue, 'YYYY-MM') +} + + /** * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式 * diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index a3c7a12e7..0544c52b0 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -204,29 +204,65 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isDetail:true, + isForm: false, + isTable:false + }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, - isTable:false, - isDetail:true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, + isTable:false, + isForm: false, + table:{ + width:180 + } + }, + { + label: '更新者', + field: 'updater', + sort: 'custom', + isDetail:true, isForm: false, + isTable:false }, { - label: '最后更新时间', + label: '更新时间', field: 'updateTime', sort: 'custom', formatter: dateFormatter, - isTable:false, - isDetail:true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, + isTable:false, isForm: false, + table:{ + width:180 + } }, ])) // 表单校验 diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index e3736494e..48a011078 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -38,6 +38,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isForm: false, + fixed: 'left', table:{ width:180 } @@ -231,6 +232,14 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ width:150 } }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isDetail:true, + isForm: false, + isTable:false + }, { label: '创建时间', field: 'createTime', @@ -247,13 +256,37 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, - form: { + isTable:false, + 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: { - type: 'datetime', - valueFormat: 'x', + 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 diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts new file mode 100644 index 000000000..915536333 --- /dev/null +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts @@ -0,0 +1,220 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter , dateFormatterYM } from '@/utils/formatTime' +import { validateTwoNum } from '@/utils/validator' +import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' + +let custormList = [] +try { + custormList = await CustomerSaleInvoiceMainApi.getCustomerList() + if(custormList.length>0){ + custormList.unshift({ + customerCode:'ALL', + customerName:t('ts.全选'), + }) + } + console.log('custormList11',custormList) +} catch (error) { + +} + + +export const CustomerStatementShareRecordMain = useCrudSchemas(reactive([ + + { + label: '单据号', + field: 'number', + sort: 'custom', + fixed: 'left', + isSearch: true, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.CUSTOMER_TOOL_APPORT_STATEMENT_TYPE, + dictClass: 'string', + form: { + //value: '',//可以添加默认值 有无都可 + component: 'Select', + }, + }, + { + label: '版本号', + field: 'versionNumber', + sort: 'custom', + isTable: false + }, + { + label: '客户代码', + field: 'customerCode', + sort: 'custom', + isSearch: true, + search:{ + component:'Select', + value:custormList.length>1?[custormList[0]['customerCode']]:[], + componentProps: { + showAll:true,// 备用做全选 + multiple:true, + // emptyValues:[null, undefined], + valueOnClear:null, + options:custormList.length>0?custormList.map(item=>({ + label:item.customerName, + value:item.customerCode + })):[] + + } + + }, + }, + { + label: '客户名称', + field: 'customerName', + 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' + }, + 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 CustomerStatementShareRecordDetail = useCrudSchemas(reactive([ + + { + label: '厂家编号', + field: 'factoryCode', + sort: 'custom', + isSearch: true, + isForm: false, + }, + + { + label: '厂家名称', + field: 'factoryName', + sort: 'custom', + isForm: false, + }, + { + label: '帐票号', + field: 'invoiceNumber', + sort: 'custom', + isSearch: true, + isForm: false, + }, + { + label: '品号', + field: 'articleNumber', + sort: 'custom', + isForm: false, + }, + { + label: '车型', + field: 'vehicleType', + sort: 'custom', + isForm: false, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + isSearch: true, + isForm: false, + }, + { + label: '模具分摊金额', + field: 'amount', + sort: 'custom', + isSearch: true, + isForm: false, + }, + { + label: '调整金额', + field: 'adjustmentAmount', + sort: 'custom', + isForm: false, + } +])) + + diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue new file mode 100644 index 000000000..b99e25fc1 --- /dev/null +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue @@ -0,0 +1,251 @@ + + + From cbfcac0a95096e7ce4fabe965d9a22f12b9e5c8c Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 20 Nov 2024 14:41:57 +0800 Subject: [PATCH 05/18] =?UTF-8?q?YT-1049=E9=A1=BA=E5=BC=95=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=85=A5=E5=90=8E=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=B8=94=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue index b58ee094b..140d0a30d 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue @@ -418,7 +418,7 @@ const butttondata = (row,$index) => { hasPermi: '', link: true // 文本展现按钮 }, - defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 + // defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 From 976ba754b4ef11f9a6e6b5caa76c89f23bdb3309 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 20 Nov 2024 15:06:44 +0800 Subject: [PATCH 06/18] =?UTF-8?q?YT-1108=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=AE=A1=E6=89=B9=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=B4=A2=E8=B5=94=E6=98=8E=E7=BB=86=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseClaimRequestDetail/index.ts | 4 ++++ .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchaseClaimRequestDetail/index.ts b/src/api/wms/purchaseClaimRequestDetail/index.ts index 0d4a45117..96ef340e5 100644 --- a/src/api/wms/purchaseClaimRequestDetail/index.ts +++ b/src/api/wms/purchaseClaimRequestDetail/index.ts @@ -13,6 +13,10 @@ export const getPurchaseClaimRequestDetailPage = async (params) => { export const getPurchaseClaimRequestDetailList = async (supplierCode) => { return await request.get({ url: `/wms/purchaseClaim-request-detail/getPurchaseclaim?supplierCode=` + supplierCode }) } +//获得采购索赔子列表 +export const getPurchaseClaimRequestDetailListForUpdate = async (supplierCode, id) => { + return await request.get({ url: `/wms/purchaseClaim-request-detail/getPurchaseclaimForUpdate?supplierCode=${supplierCode}&id=${id}`}) +} // 创建采购索赔子 export const createPurchaseClaimRequestDetail = async (data) => { return await request.post({ url: `/wms/purchaseClaim-request-detail/create`, data }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 301831a0b..789459a60 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -879,7 +879,6 @@ const openForm = async (type: string, row?: any) => { if (item.field == 'supplierCode') { item.componentProps.isSearchList = false item.componentProps.disabled = true - claimDetails(defaultSupplierCode.value) } // 订单类型 if (item.field == 'orderType') { @@ -909,6 +908,7 @@ const openForm = async (type: string, row?: any) => { } } }) + await claimDetailsForUpdate(row.supplierCode,row.id) } else { // 新增 SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => { @@ -918,7 +918,6 @@ const openForm = async (type: string, row?: any) => { item.value = defaultSupplierCode.value item.componentProps.isSearchList = true item.componentProps.disabled = false - claimDetails(defaultSupplierCode.value) } // 订单类型 if (item.field == 'orderType') { @@ -969,6 +968,11 @@ const claimDetailsList = ref([]) const claimDetails = async (supplierCode) => { claimDetailsList.value = await PurchaseClaimRequestDetailApi.getPurchaseClaimRequestDetailList(supplierCode) formRef.value.formRef.formModel.claimAmount = claimDetailsList.value.map(item => item.claimAmount).reduce((prev, item) => prev + item).toFixed(5) + +} + // 编辑的时候获取索赔明细 +const claimDetailsForUpdate = async (supplierCode,id) => { + claimDetailsList.value = await PurchaseClaimRequestDetailApi.getPurchaseClaimRequestDetailListForUpdate(supplierCode,id) } // 校验是否可以开票 const checkInvoicingCalendar = async () => { From 2af8d0b356c65eb77318614ca8db51ee23bc0d1a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 20 Nov 2024 15:13:08 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=85=BC=E5=AE=B9pageapi=E5=8F=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 976055482..786ca72e8 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -1171,7 +1171,6 @@ const searchFormClick = async (searchData) => { } - tableObjectRef.value.params.filters // const { tableObject, tableMethods } = useTable({ // getListApi: props.apiPage // 分页接口 // }) @@ -1186,6 +1185,7 @@ const searchFormClick = async (searchData) => { // tableMethodsRef.value = tableMethods // tableObjectRef.value.tableList = [] // const { getList } = tableMethods + const { getList } = tableMethodsRef.value await getList() updateKey.value += 1 // tableObjectRef.value.params = { From 977e1cf758f7e44454561809ad154b24e30cb59e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 20 Nov 2024 16:19:47 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95=E9=A2=84=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.ts | 124 ----- .../index.ts | 31 +- .../index.ts | 19 +- src/components/Detail/src/Detail.vue | 2 +- .../ImportCustomerStatementForecastForm.vue | 468 ++++++++++++++++++ .../customerStatementShareRecordMain.data.ts | 1 + ...merToolApportStatementForecastMain.data.ts | 96 +++- .../index.vue | 173 +++++-- 8 files changed, 744 insertions(+), 170 deletions(-) create mode 100644 src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue diff --git a/src/api/wms/customerStatementShareRecordDetail/index.ts b/src/api/wms/customerStatementShareRecordDetail/index.ts index 79ae1f06e..5eeb8dfeb 100644 --- a/src/api/wms/customerStatementShareRecordDetail/index.ts +++ b/src/api/wms/customerStatementShareRecordDetail/index.ts @@ -1,41 +1,4 @@ import request from '@/config/axios' - -export interface CustomerStatementDetailVO { - id: number - number: string - masterId: number - invoiceType: string - releaseNumber: string - ingress: string - ingress2: string - itemCode: string - articleNumber: string - articleName: string - backNumber: string - checkTime: Date - uom: string - qty: number - price: number - amount: number - allocationPrice: number - tftmQuantity: number - intexQuantity: number - quantityVariance: number - tftmPrice: number - intexPrice: number - priceVariance: number - tftmAmount: number - intexAmount: number - amountVariance: number - dischargingTime: Date - acceptCheckTime: Date - remark: string - available: string - siteId: string - concurrencyStamp: string -} - - export const getCustomerStatementShareRecordMainPage = async (params) => { if (params.isSearch) { delete params.isSearch @@ -66,90 +29,3 @@ export const exportCustomerStatementShareRecordDetail = async (params) => { return await request.download({ url: `/wms/customer-tool-apport-statement-detail/export-excel-detail`, params }) } } - -// // 查询客户对账单子信息明细表（WMS）列表或者查询客户对账单对账差异列表 二者共用一个 -// export const getCustomerStatementDetailPage = async (params) => { -// if (params.isSearch) { -// delete params.isSearch -// const data = {...params} -// return await request.post({ url: '/wms/customer-statement-detail/senior', data }) -// } else { -// return await request.get({ url: `/wms/customer-statement-detail/page`, params }) -// } -// } -// // 查询客户对账单子信息明细表（WMS）列表或者查询客户对账单对账差异列表 二者共用一个 -// export const getCustomerStatementReconciliationPage = async (params) => { -// if (params.isSearch) { -// delete params.isSearch -// const data = { ...params } -// return await request.post({ url: '/wms/customer-statement-detail/senior', data }) -// } else { -// return await request.get({ url: `/wms/customer-statement-detail/page`, params }) -// } -// } -// // 查询模具分摊明细列表 -// export const getCustomerToolApportStatementPage = async (params) => { -// if (params.isSearch) { -// delete params.isSearch -// const data = { ...params } -// return await request.post({ url: '/wms/customer-tool-apport-statement-detail/senior', data }) -// } else { -// return await request.get({ url: `/wms/customer-tool-apport-statement-detail/page`, params }) -// } -// } - -// // 查询客户对账单子信息表（WMS）详情 -// export const getCustomerStatementDetail = async (id: number) => { -// return await request.get({ url: `/wms/customer-statement-detail/get?id=` + id }) -// } - -// // 新增客户对账单子信息表（WMS） -// export const createCustomerStatementDetail = async (data: CustomerStatementDetailVO) => { -// return await request.post({ url: `/wms/customer-statement-detail/create`, data }) -// } - -// // 修改客户对账单子信息表（WMS） -// export const updateCustomerStatementDetail = async (data: CustomerStatementDetailVO) => { -// return await request.put({ url: `/wms/customer-statement-detail/update`, data }) -// } - -// // 删除客户对账单子信息表（WMS） -// export const deleteCustomerStatementDetail = async (id: number) => { -// return await request.delete({ url: `/wms/customer-statement-detail/delete?id=` + id }) -// } - -// // 下载用户导入模板 -// export const importTemplate = () => { -// return request.download({ url: '/wms/customer-statement-detail/get-import-template' }) -// } - -// //导出明细数据需要传masterId -// export const exportCustomerStatementDetail = async (params) => { -// if (params.isSearch) { -// const data = {...params} -// return await request.downloadPost({ url: `/wms/customer-statement-detail/export-excel-senior`, data }) -// }else{ -// return await request.download({ url: `/wms/customer-statement-detail/export-excel`, params }) -// } -// } - -// //导出详情对账差异列表数据 需要传masterId -// export const exportCustomerStatementCompareDetail = async (params) => { -// if (params.isSearch) { -// const data = {...params} -// return await request.downloadPost({ url: `/wms/customer-statement-detail/export-excel-compare-senior`, data }) -// }else{ -// return await request.download({ url: `/wms/customer-statement-detail/export-excel-compare`, params }) -// } -// } - - -// // 客户模具分摊对账单修改调整金额 -// export const updateAdjustmentAmount = async (id: number, masterId: number, amount: number) => { -// return await request.get({ url: `wms/customer-tool-apport-statement-detail/updateAdjustmentAmount?id=` + id + '&masterId=' + masterId + '&amount=' + amount }) -// } - -// // 客户对账单直接创建开票申请查询子分页数据 -// export const pageInvoice = async (params) => { -// return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params }) -// } diff --git a/src/api/wms/customerToolApportStatementForecastDetail/index.ts b/src/api/wms/customerToolApportStatementForecastDetail/index.ts index 7dcef738d..29a06f6e4 100644 --- a/src/api/wms/customerToolApportStatementForecastDetail/index.ts +++ b/src/api/wms/customerToolApportStatementForecastDetail/index.ts @@ -25,6 +25,18 @@ export const getCustomerToolApportStatementForecastDetailPage = async (params) = } } +// 查询预测与对账单差异 +export const getCustomerToolApportStatementForecastComparisonPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/tool-apport-statement-forecast-comparison/senior', data }) + } else { + return await request.get({ url: `/wms/tool-apport-statement-forecast-comparison/page`, params }) + } +} + + // 查询客户模具分摊对账单预测子表（WMS）详情 export const getCustomerToolApportStatementForecastDetail = async (id: number) => { return await request.get({ url: `/wms/customer-tool-apport-statement-forecast-detail/get?id=` + id }) @@ -47,7 +59,24 @@ export const deleteCustomerToolApportStatementForecastDetail = async (id: number // 导出客户模具分摊对账单预测子表（WMS） Excel export const exportCustomerToolApportStatementForecastDetail = async (params) => { - return await request.download({ url: `/wms/customer-tool-apport-statement-forecast-detail/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/customer-tool-apport-statement-forecast-detail/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/customer-tool-apport-statement-forecast-detail/export-excel`, params }) + } +} + + + +// 导出预测与对账单差异 Excel +export const exportCustomerToolApportStatementForecastComparisonDetail = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/tool-apport-statement-forecast-comparison/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/tool-apport-statement-forecast-comparison/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/customerToolApportStatementForecastMain/index.ts b/src/api/wms/customerToolApportStatementForecastMain/index.ts index 553a2fe63..769fefa1c 100644 --- a/src/api/wms/customerToolApportStatementForecastMain/index.ts +++ b/src/api/wms/customerToolApportStatementForecastMain/index.ts @@ -43,10 +43,25 @@ export const deleteCustomerToolApportStatementForecastMain = async (id: number) // 导出客户模具分摊对账单预测主表（WMS） Excel export const exportCustomerToolApportStatementForecastMain = async (params) => { - return await request.download({ url: `/wms/customer-tool-apport-statement-forecast-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/customer-tool-apport-statement-forecast-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/customer-tool-apport-statement-forecast-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customer-tool-apport-statement-forecast-main/get-import-template' }) -} \ No newline at end of file +} + +// 导入客户对账单前校验是否有相同客户代码和年月的数据存在 +export const verifyDataExist = async (yearsMonthStr: String,customerCode:String) => { + return await request.get({ url: `/wms/customer-tool-apport-statement-forecast-main/verifyDataExist?yearsMonthStr=` + yearsMonthStr+'&customerCode='+customerCode }) +} + +// 客户对账单重新比对 +export const recontrast = async (id: number) => { + return await request.get({ url: `/wms/customer-tool-apport-statement-forecast-main/recontrast?id=` + id}) +} diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 786ca72e8..8f771709d 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -960,7 +960,7 @@ const buttonBaseClick = (val, item) => { }else{ openForm('create') } - } else if (val == 'export') { + } else if (val.includes('export')) { // 刷新 emit('buttonBaseClick',val, item,tableObject) } else if (val == 'refresh') { diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue new file mode 100644 index 000000000..a9ca25e88 --- /dev/null +++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue @@ -0,0 +1,468 @@ + + + + + diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts index 915536333..3bec8d33d 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts @@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter , dateFormatterYM } from '@/utils/formatTime' import { validateTwoNum } from '@/utils/validator' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' +const { t } = useI18n() // 国际化 let custormList = [] try { diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts index d9a30c4a3..38f6d0e33 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts @@ -1,6 +1,23 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' +const { t } = useI18n() // 国际化 +let custormList = [] +try { + custormList = await CustomerSaleInvoiceMainApi.getCustomerList() + + if(custormList.length>0){ + custormList.unshift({ + customerCode:'ALL', + customerName:t('ts.全选'), + }) + } + console.log('custormList11',custormList) + +} catch (error) { + +} // 表单校验 export const CustomerToolApportStatementForecastMainRules = reactive({ customerCode: [required], @@ -20,6 +37,22 @@ export const CustomerToolApportStatementForecastMain = useCrudSchemas(reactive1?[custormList[0]['customerCode']]:[], + componentProps: { + showAll:true,// 备用做全选 + multiple:true, + // emptyValues:[null, undefined], + valueOnClear:null, + options:custormList.length>0?custormList.map(item=>({ + label:item.customerName, + value:item.customerCode + })):[] + + } + + }, }, { label: '客户名称', @@ -49,28 +82,61 @@ export const CustomerToolApportStatementForecastMain = useCrudSchemas(reactive - + @@ -32,8 +32,8 @@ {{ row.number }} -