From 21340805a7928dff96e2d510f2fd2d63ff365101 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 4 Jul 2024 14:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=9C=89=E4=BB=B7=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 27 ++++++++++ .../supplierinvoiceRequestMain/index.vue | 32 +++++++++--- .../supplierinvoiceRequestMain.data.ts | 52 ++++++++++++++++++- 3 files changed, 103 insertions(+), 8 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 7ef6dcaf1..03b7ecd70 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -144,6 +144,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isForm:false, isTableForm:false }, + { label: '系统税额', field: 'taxAmount', @@ -190,6 +191,32 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isForm:false, isTableForm:false }, + { + label: '是否有价差', + field: 'balanceStatementStatus', + dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:3, + }, + { + label: '价差说明', + field: 'balanceStatement', + isTable: false, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, { label: '系统价税合计',//税后金额 field: 'afterTaxAmount', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 1e036417e..850836e95 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -131,7 +131,15 @@ :footButttondata="undefined" @success="submitFormFinance" /> - + + { selectionRows.value = [] setSearchParams(model) @@ -522,7 +532,12 @@ const handleImport = () => { } else if (val == 'open_detail') { // 查看明细 openDetail(row, '单据号', row.number) }else if (val == 'purchase_mainPlanSub') { // 采购审批通过 - handleApp(row.id) + // handleApp(row.id) + if(row.balanceStatementStatus){ + formPurchasePassRef.value.open('update', row,null,'采购审批通过','采购审批通过') + }else{ + submitPurchasePass(row.id) + } } else if (val == 'purchase_mainPlanTur') { // 采购驳回按钮 resonSubmit(val, row) // handleTur(row.id) @@ -777,15 +792,20 @@ const handleImport = () => { } /** 采购审批通过按钮操作 */ - const handleApp = async (id : number) => { + const submitPurchasePass = async (id, submitData) => { + console.log(submitData) + const id1 =submitData?.id || id + + console.log(id1) try { // 审批通过的二次确认 await message.confirm(t('ts.是否审批通过所选中数据？')) tableObject.loading = true // 发起审批通过 - await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id) + await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id1,submitData?.balanceStatement) message.success(t('ts.审批通过成功!')) tableObject.loading = false + formPurchasePassRef.value.dialogVisible = false // 刷新列表 await getList() } catch { }finally{ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index a493d1bdc..234035685 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -459,6 +459,32 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, isTableForm:false, }, + { + label: '是否有价差', + field: 'balanceStatementStatus', + dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, + { + label: '价差说明', + field: 'balanceStatement', + isTable: false, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, { label: '未税差额', field: 'beforeTaxDiffAmount', @@ -861,7 +887,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'supplierCreator', sort: 'custom', isTable:false, - isTable:false, isDetail:false, sortTableDefault:1006, table: { @@ -874,7 +899,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'supplierCreatorName', sort: 'custom', isTable:false, - isTable:false, isDetail:true, sortTableDefault:1006, table: { @@ -1576,3 +1600,27 @@ export const SupplierinvoiceRequestDetailRules = reactive({ { validator: validateSinglePrice, trigger: 'change' } ], }) +// 采购通过 +export const PurchasePass = useCrudSchemas(reactive([ + { + label: '价差通过说明', + field: 'balanceStatement', + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + componentProps:{ + type:'textarea' + } + }, + }, +])) +//表单校验 +export const PurchasePassRules = reactive({ + balanceStatement: [ + { required: true, message: '请输入价差通过说明', trigger: 'blur'}, + { max: 100, message: '最多100字符', trigger: 'blur'} + ], +})