From 7abab17e760b1e409ed5d37dad4bb432abeef316 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 14 Nov 2024 09:50:04 +0800 Subject: [PATCH 01/35] =?UTF-8?q?SCP=E5=BE=85=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceInvoiced/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index 0981356d6..827f95a2c 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > @@ -148,7 +148,7 @@ const butttondata = (row) =>{ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除 // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), { - label: t('ts.审核通过'), + label: t('审核通过'), name: 'agree', hide: isShowMainButton(row, ['1']), type: 'primary', @@ -157,7 +157,7 @@ const butttondata = (row) =>{ hasPermi: 'wms:supplierinvoice-invoiced:agree' }, { - label: t('ts.作废'), + label: t('作废'), name: 'refuse', hide: isShowMainButton(row, ['1']), type: 'danger', @@ -194,7 +194,7 @@ const formsSuccess = async (formType,data) => { }); if(isHave){ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error(t('ts.失效时间要大于生效时间')) + message.error(t('失效时间要大于生效时间')) return; } } @@ -234,11 +234,11 @@ const handleDelete = async (id: number) => { const handleAgree = async (id : number) => { try { // 审批通过的二次确认 - await message.confirm(t('ts.是否审批通过所选中数据？')) + await message.confirm(t('是否审批通过所选中数据？')) tableObject.loading = true // 发起审批通过 await SupplierinvoiceInvoicedApi.agreeSupplierinvoiceInvoiced(id) - message.success(t('ts.审批通过成功!')) + message.success(t('审批通过成功!')) tableObject.loading = false // 刷新列表 await getList() @@ -252,11 +252,11 @@ const handleAgree = async (id : number) => { const handleRefuse = async (id : number) => { try { // 审批通过的二次确认 - await message.confirm(t('ts.是否审批拒绝所选中数据？')) + await message.confirm(t('是否审批拒绝所选中数据？')) tableObject.loading = true // 发起审批通过 await SupplierinvoiceInvoicedApi.refuseSupplierinvoiceInvoiced(id) - message.success(t('ts.审批成功!')) + message.success(t('审批成功!')) tableObject.loading = false // 刷新列表 await getList() From 7abbacf0a79973541246202b082fa106188e278c Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 18 Nov 2024 17:18:13 +0800 Subject: [PATCH 02/35] =?UTF-8?q?YT-1039=EF=BC=9A=E7=9B=B4=E7=BA=B3?= =?UTF-8?q?=E5=93=81=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 30bd3f3e8..c7e1663eb 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -20,24 +20,24 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ sortTableDefault:1 }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - sortTableDefault:2 - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - }, - sortTableDefault:3 - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // sortTableDefault:2 + // }, + // { + // label: '任务单号', + // field: 'jobNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // sortTableDefault:3 + // }, { label: '发货单号', field: 'asnNumber', @@ -411,15 +411,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, - { - label: '发货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:12, - }, + // { + // label: '发货数量', + // field: 'shippedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:12, + // }, { label: '收货数量', field: 'qty', @@ -516,9 +516,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ // 表单校验 export const PurchasereceiptRecordMainRules = reactive({ - requestNumber: [ - { required: true, message: '请选择申请单号', trigger: 'change' } - ], + // requestNumber: [ + // { required: true, message: '请选择申请单号', trigger: 'change' } + // ], supplierCode: [ { required: true, message: '请选择供应商代码', trigger: 'change' } ], From 6940d3859014c57cc38dcf3314620ad5c276c34c Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 18 Nov 2024 17:29:18 +0800 Subject: [PATCH 03/35] =?UTF-8?q?YT-1039:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c7e1663eb..fc56577e1 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -83,7 +83,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isSearch: false, sortSearchDefault:2, isTable:false }, From 52ebe60fb292a639d462d74dd480328dec4e5e35 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 09:20:06 +0800 Subject: [PATCH 04/35] =?UTF-8?q?YT-785=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=94=B3=E8=AF=B7=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A1.=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=202.?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=80=BC=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 5a8d7379d..9aca36df4 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -360,7 +360,12 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = false itemColumns.componentProps.disabled = true } + if(itemColumns.field == 'workStationCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } }) + } else { // 修改 tableform 属性 ProductredressRequestMain.allSchemas.formSchema.map(itemColumns => { @@ -368,6 +373,10 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = true itemColumns.componentProps.disabled = false } + if(itemColumns.field == 'workStationCode') { + itemColumns.componentProps.isSearchList = true + itemColumns.componentProps.disabled = false + } }) } formRef.value.open(type, row) From dcf689d18d9fd7668b98b0f3fc54dd0a664e05da Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 10:03:00 +0800 Subject: [PATCH 05/35] =?UTF-8?q?YT-1060=E4=B8=8A=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BC=9A=E6=B8=85=E7=A9=BA=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 9e5525a12..d6a23d0eb 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1059,13 +1059,13 @@ const blurWarehouse = async ({module='config',type})=>{ console.log('库区verifyRes',verifyRes) }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ // 库位组 - let verifyRes = await LocationgroupApi.verifyLocationgroup({ + verifyRes = await LocationgroupApi.verifyLocationgroup({ code:warehouseValue }) console.log('库位组verifyRes',verifyRes) }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ // 库位 - let verifyRes = await LocationApi.verifyLocation({ + verifyRes = await LocationApi.verifyLocation({ code:warehouseValue }) console.log('库位verifyRes',verifyRes) From e70f066ab92f6dfbadeb49ad4fd23ae8415b54c7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 10:18:43 +0800 Subject: [PATCH 06/35] =?UTF-8?q?YT-1057=E7=BC=96=E8=BE=91=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E7=AD=96=E7=95=A5=E8=AE=BE=E7=BD=AE=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E5=BC=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index d6a23d0eb..a179cfd74 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -82,7 +82,7 @@ @@ -1045,6 +1045,7 @@ const blurWarehouse = async ({module='config',type})=>{ return } let verifyRes = [] + console.log(222,warehouseValue) if(module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ // 仓库 verifyRes = await WarehouseApi.verifyWarehouse({ @@ -1240,7 +1241,9 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& !Array.isArray(item.Value)) { - item.Value = item.Value.split(',') + if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' &&item.ParamCode != 'LocationGroupCode' &&item.ParamCode != 'LocationCode' ) { + item.Value = item.Value.split(',') + } } }) } From 8f9d41b50bc037faaf1efd2496e346ccd59fda34 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 19 Nov 2024 12:38:58 +0800 Subject: [PATCH 07/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=BA=E5=BC=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/outerApiHis/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/infra/outerApiHis/index.vue b/src/views/infra/outerApiHis/index.vue index 2751182d7..d0b555db2 100644 --- a/src/views/infra/outerApiHis/index.vue +++ b/src/views/infra/outerApiHis/index.vue @@ -128,7 +128,7 @@ const butttondata = (row) =>{ return [ // defaultButtons.mainListEditBtn({hasPermi:'wms:outerApiHis:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:outerApiHis:delete'}), // 删除 - defaultButtons.retryBtn({hide: row.times >= 3}), // 重试 + defaultButtons.retryBtn({hide: row.times >= 3 || row.success}), // 重试 ] } From ce84b6ed17666ea5ed68c365988ea36aefdbfed8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 13:10:54 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredressRequestMain/index.vue | 3 +++ .../productredressRequestMain.data.ts | 12 +----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 9aca36df4..d726ccf0c 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -77,6 +77,9 @@ :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" :detailValidate="detailValidate" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> @@ -157,7 +171,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const setV = {} if(formField == 'customerStatementNumber') { //客户对账单 - setV['customer'] = val[0]['customerCode'] + setV['customerCode'] = val[0]['customerCode'] setV['customerName'] = val[0]['customerName'] CustomerStatementDetailApi.getCustomerStatementDetailPage({ pageNo:1, @@ -170,6 +184,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => item['sumPrice'] = item['price'] + item['allocationPrice'] // 未税金额 默认等于数量*合计单价，可修改，必填，最多可输入2位小数 item['beforeTaxAmount'] = item['sumPrice']*item['qty'] + // 含税金额 未税价格+税额,四舍五入保留2位小数 item['afterTaxAmount'] = item['beforeTaxAmount'] + item['taxAmount'] //含税金额 // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 @@ -210,9 +225,9 @@ const Echo = [] const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:`wms:customer-sale-invoice-main:create` }), // 新增 - defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-main:import` }), // 导入 - defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-main:export` }), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:customer-sale-invoice-request-main:create` }), // 新增 + 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), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -264,14 +279,16 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:`wms:${routeName.value}:open`}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:reject`}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:publish`}), // 发布 - defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:`wms:${routeName.value}:resetting`}), // 重置 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:`wms:customer-sale-invoice-request-main:open`}), // 打开 + // defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:`wms:customer-sale-invoice-request-main:close`}), // 关闭 + // defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:customer-sale-invoice-request-main:submit`}), // 提交审批 + // defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:customer-sale-invoice-request-main:reject`}), // 驳回 + // defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:customer-sale-invoice-request-main:agree`}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:customer-sale-invoice-request-main:publish`}), // 发布 + // defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:`wms:customer-sale-invoice-request-main:resetting`}), // 重置 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:customer-sale-invoice-request-main:update`}), // 编辑 + defaultButtons.mainListCancelBtn({hide: isShowMainButton(row,['5']),hasPermi:'wms:customer-sale-invoice-request-main:cancel'}), //作废 + ] } @@ -334,7 +351,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanPub') { // 发布 await message.confirm('确认要发布吗？') tableObject.loading = true - CustomerSaleInvoiceMainApi.publish(row.masterId).then(() => { + CustomerSaleInvoiceMainApi.publish(row.id).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false buttonBaseClick('refresh',null) @@ -342,6 +359,19 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) + } else if (val == 'cancel') { // 作废 + tableObject.loading = true + try { + await message.confirm('确认要作废吗？') + await CustomerSaleInvoiceMainApi.nodeAbrogate(row.id) + await message.success(t('ts.作废成功')) + // 发起导出 + //exportLoading.value = true + } catch { + } finally { + // 刷新列表 + buttonBaseClick('refresh',null) + } } else if (val == 'mainPlanRes') { // 重置 await message.confirm('确认要重置吗？') tableObject.loading = true From 3448975c1770baf6290e2f48cdfabf373629fb96 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 14:23:02 +0800 Subject: [PATCH 12/35] =?UTF-8?q?YT-1058=E4=B8=8A=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E8=A7=84=E5=88=99=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E5=92=8CABC=E7=B1=BB?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itembasic/index.vue | 5 ++++- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index da269f299..078117066 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -371,11 +371,14 @@ const changeTabs = (item) => { tabsExtend.value = false allSchemas.value = Itembasic.allSchemas } - detailAllSchemas.value.tableColumns.map((item,index) => { + if (detailAllSchemas.value && detailAllSchemas.value.tableColumns) { + detailAllSchemas.value.tableColumns.map((item,index) => { if (item.field == 'action') { detailAllSchemas.value.tableColumns.splice(index,1) } }) + } + // 当前物料代码作为条件 tableObjectExtend.value = [{ key: 'itemCode', diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index a179cfd74..05a68ebac 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1241,8 +1241,10 @@ const open = async (type: string, strategyCode: string, id?: number) => { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& !Array.isArray(item.Value)) { - if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' &&item.ParamCode != 'LocationGroupCode' &&item.ParamCode != 'LocationCode' ) { + if (item.ParamCode != 'WarehouseCode' && item.ParamCode != 'AreaCode' && item.ParamCode != 'LocationGroupCode' && item.ParamCode != 'LocationCode') { + if (item.Value) { item.Value = item.Value.split(',') + } } } }) From 23d972ac131561c6aebbb4dd40ecd7701d7be422 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 19 Nov 2024 15:25:36 +0800 Subject: [PATCH 13/35] =?UTF-8?q?YT-1075=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E4=B8=AD?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 2c8645582..8d30ff991 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1514,6 +1514,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive Date: Tue, 19 Nov 2024 15:58:43 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/customerSaleInvoiceDetail/index.ts | 11 ++ src/api/wms/customerSaleInvoiceMain/index.ts | 22 ++- src/utils/dict.ts | 4 +- .../customerSaleInvoiceRecordMain.data.ts | 108 ++++++++++----- .../customerSaleInvoiceRecordMain/index.vue | 28 +++- .../customerSaleInvoiceRequestMain.data.ts | 120 +++++++++++++--- .../customerSaleInvoiceRequestMain/index.vue | 128 +++++++----------- 7 files changed, 277 insertions(+), 144 deletions(-) diff --git a/src/api/wms/customerSaleInvoiceDetail/index.ts b/src/api/wms/customerSaleInvoiceDetail/index.ts index 19d594304..af4c750bd 100644 --- a/src/api/wms/customerSaleInvoiceDetail/index.ts +++ b/src/api/wms/customerSaleInvoiceDetail/index.ts @@ -27,6 +27,17 @@ export const getCustomerSaleInvoiceDetailPage = async (params) => { return await request.get({ url: `/wms/customer-sale-invoice-detail/page`, params }) } } +// 查询客户销售开票子信息表（WMS）列表 +export const getCustomerSaleInvoiceRecordDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/customer-sale-invoice-record-detail/senior', data }) + } else { + return await request.get({ url: `/wms/customer-sale-invoice-record-detail/page`, params }) + } +} + // 查询客户销售开票子信息表（WMS）详情 export const getCustomerSaleInvoiceDetail = async (id: number) => { diff --git a/src/api/wms/customerSaleInvoiceMain/index.ts b/src/api/wms/customerSaleInvoiceMain/index.ts index 32ce70ad8..7bad6f0c0 100644 --- a/src/api/wms/customerSaleInvoiceMain/index.ts +++ b/src/api/wms/customerSaleInvoiceMain/index.ts @@ -57,6 +57,15 @@ export const exportCustomerSaleInvoiceMain = async (params) => { return await request.download({ url: `/wms/customer-sale-invoice-main/export-excel`, params }) } } +// 导出销售开票记录 Excel +export const exportCustomerSaleInvoiceRecordMain = async (params) => { + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/wms/customer-sale-invoice-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/customer-sale-invoice-record-main/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customer-sale-invoice-main/get-import-template' }) @@ -66,8 +75,8 @@ export const importTemplate = () => { export const getCustomerSaleInvoiceRecodeMainPage = async (params) => { if (params.isSearch) { delete params.isSearch - // const data = {...params} - // return await request.post({ url: '/wms/customer-sale-invoice-main/senior', data }) + const data = {...params} + return await request.post({ url: '/wms/customer-sale-invoice-record-main/senior', data }) } else { return await request.get({ url: `/wms/customer-sale-invoice-record-main/page`, params }) } @@ -81,3 +90,12 @@ export const publish = async (id: number) => { export const nodeAbrogate = async (id: number) => { return await request.get({ url: `/wms/customer-sale-invoice-main/nodeAbrogate?id=` + id}) } + +// 从客户对账单中获取客户代码 -- 销售申请 +export const getCustomerList = async () => { + return await request.get({ url: `/wms/customer-statement-main/getCustomerList`}) +} +// 从客户对账单中获取客户代码 -- 销售记录 +export const getRecordCustomerList = async () => { + return await request.get({ url: `/wms/customer-sale-invoice-record-main/getCustomerList`}) +} \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1db5931f7..8755f5c6e 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -410,5 +410,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客户对账单 模具分摊状态 - DELIVER_METHOD = 'deliver_method' + DELIVER_METHOD = 'deliver_method', + CUSTOMER_SALE_INVOICE_TYPE = 'customer_saleInvoice_type' // 销售开票 + } diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index 500d5d257..3955a8085 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -4,7 +4,23 @@ import { CustomerStatementMain, } from '../moldAllocation/customerStatement/customerStatementMain.data' import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain' +import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' +const { t } = useI18n() // 国际化 + +let custormList = [] +try { + custormList = await CustomerSaleInvoiceMainApi.getRecordCustomerList() + if(custormList.length>0){ + custormList.unshift({ + customerCode:'ALL', + customerName:t('ts.全选'), + }) + } + console.log('custormList11',custormList) +} catch (error) { + +} // 表单校验 export const CustomerSaleInvoiceMainRules = reactive({ customerStatementNumber: [required], @@ -25,12 +41,13 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '状态', - field: 'status', + label: '申请单号', sort: 'custom', isSearch: true, - isForm:false, - // 0：新增1：已发布2已作废 + field: 'requestNumber', + table:{ + width:150 + } }, { label: '客户对账单', @@ -52,6 +69,9 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ isMainValue: false }] } + }, + table:{ + width:180 } }, { @@ -63,6 +83,25 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ componentProps: { disabled: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 + })):[] + + } + + }, + table:{ + width:150 } }, { @@ -73,6 +112,9 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ componentProps: { disabled: true } + }, + table:{ + width:150 } }, { @@ -83,6 +125,9 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ componentProps: { disabled: true } + }, + table:{ + width:150 } }, { @@ -114,12 +159,18 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ componentProps: { disabled: true } + }, + table:{ + width:150 } }, { label: '金税票号', field: 'goldenTaxInvoiceNumber', sort: 'custom', + table:{ + width:150 + } }, { label: '开票日期', @@ -141,6 +192,9 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + table:{ + width:180 + } }, { @@ -148,21 +202,21 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', }, - { - 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')] - } - }, - isForm: false, - }, + // { + // 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')] + // } + // }, + // isForm: false, + // }, ])) // 表单校验 export const CustomerSaleInvoiceDetailRules = reactive({ @@ -237,22 +291,6 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ field: 'qty', sort: 'custom', isSearch: true, - form: { - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户对账单', // 输入框占位文本 - searchField: '', // 查询弹窗赋值字段 - searchTitle: '客户对账单信息', // 查询弹窗标题 - searchAllSchemas: CustomerStatementMain.allSchemas, // 查询弹窗所需类 - searchPage: CustomerStatementMainApi.getCustomerStatementMainPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, tableForm: { type: 'InputNumber', precision: 2, diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue index 180cc887c..e34e66657 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue @@ -1,7 +1,7 @@