From ec7ef32cb39ce95da64fc2394de767a10be90790 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 24 Oct 2024 09:16:21 +0800 Subject: [PATCH] =?UTF-8?q?YT-466=EF=BC=9A=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=96=B0=E5=A2=9E=20=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E8=8C=83=E5=9B=B4=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E6=98=AF=E5=A4=9A=E9=80=89=EF=BC=8C=E7=8E=B0=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E5=8D=95=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/customerStatementMain/index.ts | 14 +++++++++----- .../businesstype/businesstype.data.ts | 7 +++++++ .../documentSetting/businesstype/index.vue | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/api/wms/customerStatementMain/index.ts b/src/api/wms/customerStatementMain/index.ts index 5a1a62daa..0df610f06 100644 --- a/src/api/wms/customerStatementMain/index.ts +++ b/src/api/wms/customerStatementMain/index.ts @@ -32,11 +32,6 @@ export const getCustomerStatementMainPage = async (params) => { } } -// 查询客户对账单主信息表(WMS)详情 -export const getCustomerStatementMain = async (id: number) => { - return await request.get({ url: `/wms/customer-statement-main/get?id=` + id }) -} - // 新增客户对账单主信息表(WMS) export const createCustomerStatementMain = async (data: CustomerStatementMainVO) => { return await request.post({ url: `/wms/customer-statement-main/create`, data }) @@ -128,4 +123,13 @@ export const exportCustomerStatementShareMain = async (params) => { } } +// 客户对账单直接创建开票申请查询主数据 +export const getCustomerStatementMain = async (id: number) => { + return await request.get({ url: `/wms/customer-statement-main/get?id=` + id }) +} +// 客户对账单直接创建开票申请查询子分页数据 +export const pageInvoice = async (params) => { + return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params }) +} + diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index ee05b91d9..601678c8e 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -67,11 +67,18 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'itemStatuses', dictType: DICT_TYPE.ITEM_STATUS, dictClass: 'string', + dictAllOption:true,// 全选按钮 isTable: true, sort: 'custom', table: { width: 180 }, + form: { + component:'Select', + componentProps: { + multiple: true, + }, + } }, { label: '出库库区类型范围', diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index 6186113ba..74b409a91 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -170,6 +170,14 @@ const buttonTableClick = async (val, row) => { rowSplit.itemTypes = rowSplit.itemTypes.split(',') } + // 可用物料状态范围 + const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value)) + if(rowSplit.itemStatuses == allItemStatusesValue){ + rowSplit.itemStatuses = ['全选'] + }else{ + rowSplit.itemStatuses = rowSplit.itemStatuses.split(',') + } + // 出库库区类型范围 入库库区类型范围 const allValue = getStrDictOptions(DICT_TYPE.AREA_TYPE).map(item=>(item.value)) if(rowSplit.outAreaTypes == allValue){ @@ -234,6 +242,14 @@ const formsSuccess = async (formType, submitData) => { data.itemTypes = data.itemTypes.join(',') } + //可用物料状态范围 + const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value)) + if(data.itemStatuses[data.itemStatuses.length-1]=='全选'){ + data.itemStatuses = allItemStatusesValue.join(',') + }else{ + data.itemStatuses = data.itemStatuses.join(',') + } + // data.outAreaTypes = data.outAreaTypes.join(',') // data.inAreaTypes = data.inAreaTypes.join(',') //全选的值