From 2a06345e017b31826ec9242d3ca8662dbcdbc62a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 19 Oct 2023 08:41:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/finbillapplication/FinBillApplicationService.java | 5 +++++ .../biz/autoservice/invoiced/InvoicedService.java | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 058e1617df..4888a8d85d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -4461,6 +4461,11 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid()); BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData(); billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId); + if("1".equals(busSalesOrder.getPayTypeKey())){ + billApplicationIInfoVoss.setIsCanEdit(true); + }else{ + billApplicationIInfoVoss.setIsCanEdit(false); + } //开票单位 if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 0de473eb35..572866581f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -189,10 +189,9 @@ public class InvoicedService { String userSid = query.getUserSid(); String orgPath = query.getOrgPath(); List vins = query.getVins(); - /*if(vins.size() == 0){ + if(vins.size() == 0){ return rb.setMsg("请选择车辆"); - }*/ - vins.add("84c5dfbd-935b-45a2-a7da-7aa3ff30e408"); + } ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); if(billApplicationIInfoVoResultBean.getData() != null){ BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); @@ -231,6 +230,9 @@ public class InvoicedService { vo.setContractId(finBillApplicationDetailsVo.getContractNo()); vo.setDate(finBillApplicationDetailsVo.getApplyDate()); vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + if("1".equals(finBillApplicationDetailsVo.getShowBtnStr())){ + vo.setShowBtn(true); + } vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //根据合同查询销售订单 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); From b906256f4174ea38ea489cc52d4231df4cc720de Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Oct 2023 09:44:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrearsbilling/arrearsbillingAdd.vue | 63 +++++++------------ .../arrearsbilling/arrearsbillingInfo.vue | 20 ++---- .../arrearsbillingByDivisionDaiBanInfo.vue | 20 ++---- .../arrearsbillingDaiBanInfo.vue | 20 ++---- .../arrearsbillingEdit.vue | 63 ++++++++----------- .../arrearsbillingYiBanInfo.vue | 12 ++-- 6 files changed, 64 insertions(+), 134 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue index bded5a4dd8..c9a0e85b52 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue @@ -186,21 +186,15 @@
证件(营业执照或身份证)
- + -
客户开票申请书
+
车辆买卖合同
-
款项确认书(贷款业务上传)
- - - - -
车辆登记合同(开票名称与客户名称不一致时上传)
@@ -277,7 +271,6 @@ export default { openTickType_list: [], openTick_list: [], arrearsOpenYY_list: [], - image_list1: [], image_list2: [], image_list3: [], image_list4: [], @@ -293,6 +286,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -428,14 +422,6 @@ export default { this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.instanceId = res.data.procInstSid this.formobj.userSid = window.sessionStorage.getItem('userSid') - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push({ - name: e.fileName, - url: e.fileUrl - }) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push({ @@ -452,8 +438,8 @@ export default { }) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push({ name: e.fileName, url: e.fileUrl @@ -633,7 +619,6 @@ export default { handleSubmit() { this.$refs['form_obj'].validate((valid) => { if (valid) { - this.getUrl() if (this.formobj.finBillVehicles.length === 0) { this.$message({ showClose: true, type: 'error', message: '请选择车辆' }) return @@ -648,6 +633,21 @@ export default { return } } + if (this.formobj.isLQOrigInvoice === '是') { + if (this.image_list2.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传车辆买卖合同' }) + return + } + if (this.image_list5.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' }) + return + } + if (this.image_list7.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' }) + return + } + } + this.getUrl() this.submitdisabled = true submit(this.formobj).then((res) => { if (res.success) { @@ -695,27 +695,9 @@ export default { sid: '' }) } - this.formobj.khkpsqsApplicationAppendxs = bb - } else { - this.formobj.khkpsqsApplicationAppendxs = [] - } - if (this.image_list3.length > 0) { - const cc = [] - for (var m = 0; m < this.image_list3.length; m++) { - cc.push({ - attachType: '', - billAppSid: '', - createByName: window.sessionStorage.getItem('name'), - fileSid: '', - fileName: this.image_list3[m].name, - fileType: this.image_list3[m].name.substr(this.image_list3[m].name.lastIndexOf('.')), - fileUrl: this.image_list3[m].url, - sid: '' - }) - } - this.formobj.kpxxqrsApplicationAppendxs = cc + this.formobj.carBuyContractImages = bb } else { - this.formobj.kpxxqrsApplicationAppendxs = [] + this.formobj.carBuyContractImages = [] } if (this.image_list4.length > 0) { const cc = [] @@ -829,6 +811,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue index 63ae0217b0..90f1ebda06 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue @@ -148,20 +148,12 @@ -
客户开票申请书
+
车辆买卖合同
-
款项确认书(贷款业务上传)
- - - - - - -
车辆登记合同(开票名称与客户名称不一致时上传)
@@ -237,6 +229,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -299,16 +292,11 @@ export default { this.image_list1.push(e.fileUrl) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push(e.fileUrl) }) } - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push(e.fileUrl) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push(e.fileUrl) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue index 23f5c6c6e7..bb3ce3bc66 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue @@ -180,20 +180,12 @@ -
客户开票申请书
+
车辆买卖合同
-
款项确认书(贷款业务上传)
- - - - - - -
车辆登记合同(开票名称与客户名称不一致时上传)
@@ -312,6 +304,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -427,16 +420,11 @@ export default { this.image_list1.push(e.fileUrl) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push(e.fileUrl) }) } - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push(e.fileUrl) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push(e.fileUrl) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue index c3f8eb4735..b35a7437f7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue @@ -180,20 +180,12 @@ -
客户开票申请书
+
车辆买卖合同
-
款项确认书(贷款业务上传)
- - - - - - -
车辆登记合同(开票名称与客户名称不一致时上传)
@@ -311,6 +303,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -427,16 +420,11 @@ export default { this.image_list1.push(e.fileUrl) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push(e.fileUrl) }) } - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push(e.fileUrl) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push(e.fileUrl) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue index bfae28c9ef..3a0634af1a 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue @@ -186,18 +186,12 @@ -
客户开票申请书
+
车辆买卖合同
-
款项确认书(贷款业务上传)
- - - - -
车辆登记合同(开票名称与客户名称不一致时上传)
@@ -291,6 +285,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -400,14 +395,6 @@ export default { this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.instanceId = res.data.procInstSid this.formobj.userSid = window.sessionStorage.getItem('userSid') - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push({ - name: e.fileName, - url: e.fileUrl - }) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push({ @@ -416,8 +403,8 @@ export default { }) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push({ name: e.fileName, url: e.fileUrl @@ -611,7 +598,10 @@ export default { handleSubmit() { this.$refs['form_obj'].validate((valid) => { if (valid) { - this.getUrl() + if (this.formobj.finBillVehicles.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请选择车辆' }) + return + } for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { if (this.formobj.finBillVehicles[i].openTickName === '') { this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' }) @@ -622,6 +612,21 @@ export default { return } } + if (this.formobj.isLQOrigInvoice === '是') { + if (this.image_list2.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传车辆买卖合同' }) + return + } + if (this.image_list5.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' }) + return + } + if (this.image_list7.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' }) + return + } + } + this.getUrl() this.submitdisabled = true submit(this.formobj).then((res) => { if (res.success) { @@ -675,27 +680,9 @@ export default { sid: '' }) } - this.formobj.khkpsqsApplicationAppendxs = bb - } else { - this.formobj.khkpsqsApplicationAppendxs = [] - } - if (this.image_list3.length > 0) { - const cc = [] - for (var m = 0; m < this.image_list3.length; m++) { - cc.push({ - attachType: '', - billAppSid: '', - createByName: window.sessionStorage.getItem('name'), - fileSid: '', - fileName: this.image_list3[m].name, - fileType: this.image_list3[m].name.substr(this.image_list3[m].name.lastIndexOf('.')), - fileUrl: this.image_list3[m].url, - sid: '' - }) - } - this.formobj.kpxxqrsApplicationAppendxs = cc + this.formobj.carBuyContractImages = bb } else { - this.formobj.kpxxqrsApplicationAppendxs = [] + this.formobj.carBuyContractImages = [] } if (this.image_list4.length > 0) { const cc = [] diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue index 1ff3e06073..49429e7a41 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue @@ -179,7 +179,7 @@ -
客户开票申请书
+
车辆买卖合同
@@ -286,6 +286,7 @@ export default { billNo: '', billStateKey: '', billStateValue: '', + carBuyContractImages: [], cldjhtApplicationAppendxs: [], contractNo: '', contractSid: '', @@ -387,16 +388,11 @@ export default { this.image_list1.push(e.fileUrl) }) } - if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { - this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { + if (this.formobj.carBuyContractImages.length > 0) { + this.formobj.carBuyContractImages.forEach((e) => { this.image_list2.push(e.fileUrl) }) } - if (this.formobj.kpxxqrsApplicationAppendxs.length > 0) { - this.formobj.kpxxqrsApplicationAppendxs.forEach((e) => { - this.image_list3.push(e.fileUrl) - }) - } if (this.formobj.cldjhtApplicationAppendxs.length > 0) { this.formobj.cldjhtApplicationAppendxs.forEach((e) => { this.image_list4.push(e.fileUrl) From af8ba4f7bcf79bed4496fb9cce5c12ddf67426a1 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Oct 2023 09:46:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E9=A2=86=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrearscollection/arrearscollectionAdd.vue | 8 ++++++++ .../qiankuanlingpiaoFlow/arrearscollectionEdit.vue | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue index 12f255a699..424aa71f1e 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue @@ -377,6 +377,14 @@ export default { }) }, handleSubmit() { + if (this.image_list1.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' }) + return + } + if (this.image_list3.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' }) + return + } this.$refs['form_obj'].validate((valid) => { if (valid) { this.getUrl() diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue index d6dcf701e6..1ef238b661 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue @@ -385,6 +385,14 @@ export default { }) }, handleSubmit() { + if (this.image_list1.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传欠款承诺书' }) + return + } + if (this.image_list3.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传责任人担保承诺书' }) + return + } this.$refs['form_obj'].validate((valid) => { if (valid) { this.getUrl() From 6573c70600edafdfc7fc127383a322b68b830972 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 19 Oct 2023 09:53:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedistributor/BaseDistributorFeign.java | 2 +- .../BaseDistributorFeignFallback.java | 2 +- .../basedistributor/BaseDistributorRest.java | 4 ++-- .../BaseDistributorService.java | 15 ++++++++++--- .../FinCompanyInvoicingFeign.java | 10 +++++++++ .../FinCompanyInvoicingFeignFallback.java | 10 +++++++++ .../FinCompanyInvoicingRest.java | 10 +++++++++ .../FinCompanyInvoicingService.java | 21 +++++++++++++++++++ 8 files changed, 67 insertions(+), 7 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index beb7ec2af7..7ba6e1b64f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -201,7 +201,7 @@ public interface BaseDistributorFeign { @ApiOperation("移动端查询经销商和客户信息") @GetMapping("/invoiceName") - ResultBean> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search); + ResultBean> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search,@RequestParam("invoiceKey") String invoiceKey); @ApiOperation("移动端查询经销商和客户信息") @GetMapping("/invoiceName2") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index 3b274e0652..984dc6d9af 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -220,7 +220,7 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { } @Override - public ResultBean> invoiceName(String userSid, String orgPath, String search) { + public ResultBean> invoiceName(String userSid, String orgPath, String search,String invoiceKey) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index c852df3188..76d05988e0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -354,8 +354,8 @@ public class BaseDistributorRest implements BaseDistributorFeign { } @Override - public ResultBean> invoiceName(String userSid, String orgPath, String search) { - return baseDistributorService.invoiceName(userSid, orgPath, search); + public ResultBean> invoiceName(String userSid, String orgPath, String search,String invoiceKey) { + return baseDistributorService.invoiceName(userSid, orgPath, search,invoiceKey); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 32f46c634c..87d3de563d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -1320,14 +1320,23 @@ public class BaseDistributorService extends MybatisBaseService> invoiceName(String userSid, String orgPath, String search) { + public ResultBean> invoiceName(String userSid, String orgPath, String search,String invoiceKey) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); List finCompanyInvoicingBillListVos = new ArrayList<>(); if (StringUtils.isBlank(search)) { - finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(useOrgSid); + if("01".equals(invoiceKey)){ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(useOrgSid); + }else{ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid3(useOrgSid,invoiceKey); + } } else { - finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSid(useOrgSid, search); + if("01".equals(invoiceKey)){ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,""); + }else{ + finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qyAppSelByUseOrgSidTwo(useOrgSid, search,invoiceKey); + } + } List appDisAndCustms = new ArrayList<>(); for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index 233d9f6f44..5cc2464a88 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -131,11 +131,21 @@ public interface FinCompanyInvoicingFeign { @ResponseBody List qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid); + @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") + @PostMapping("/qySelByUseOrgSid3") + @ResponseBody + List qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey); + @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qyAppSelByUseOrgSid") @ResponseBody List qyAppSelByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search); + @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") + @PostMapping("/qyAppSelByUseOrgSidTwo") + @ResponseBody + List qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey); + @ApiOperation("企业开票信息管理移动端维护初始化") @GetMapping("/qyAppFetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index 48e570b7db..d5879dbef7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -125,11 +125,21 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig return null; } + @Override + public List qySelByUseOrgSid3(String orgSid, String invoiceKey) { + return null; + } + @Override public List qyAppSelByUseOrgSid(String useOrgSid, String search) { return null; } + @Override + public List qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) { + return null; + } + @Override public ResultBean qyAppFetchDetailsBySid(String sid) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index 30ab998acb..16661224a0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -156,11 +156,21 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid); } + @Override + public List qySelByUseOrgSid3(String orgSid, String invoiceKey) { + return finCompanyInvoicingService.qySelByUseOrgSid3(orgSid,invoiceKey); + } + @Override public List qyAppSelByUseOrgSid(String useOrgSid, String search) { return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search); } + @Override + public List qyAppSelByUseOrgSidTwo(String useOrgSid, String search,String invoiceKey) { + return finCompanyInvoicingService.qyAppSelByUseOrgSidTwo(useOrgSid,search,invoiceKey); + } + @Override public ResultBean qyAppFetchDetailsBySid(String sid) { return finCompanyInvoicingService.qyAppFetchDetailsBySid(sid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 7cba9a923f..a1edf840e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -536,4 +536,25 @@ public class FinCompanyInvoicingService extends MybatisBaseService qySelByUseOrgSid3(String orgSid, String invoiceKey) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", orgSid); + qw.eq("isDelete", 0); + qw.eq("invoiceTypeKey",invoiceKey); + List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); + return finCompanyInvoicingBillListVos; + } + + public List qyAppSelByUseOrgSidTwo(String useOrgSid, String search, String invoiceKey) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", useOrgSid); + qw.eq("isDelete", 0); + qw.like("name", search); + if(StringUtils.isNotBlank(invoiceKey)){ + qw.eq("invoiceTypeKey",invoiceKey); + } + List finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); + return finCompanyInvoicingBillListVos; + } } \ No newline at end of file From 3e44d8fc361d057646623ef8d635b35b95876549 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 19 Oct 2023 10:23:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/billingapplicationAdd.vue | 61 ++++++++++++++----- .../chukuguanli/relation/kaipiaoAdd.vue | 61 ++++++++++++++----- 2 files changed, 94 insertions(+), 28 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue index 9112ab825c..c9473a8cc0 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue @@ -346,33 +346,66 @@ export default { }, changeOpenTickType(val) { const choose = this.openTickType_list.filter((item) => item.dictValue === val) - this.formobj.openTickTypeKey = choose[0].dictKey - if (this.formobj.finBillVehicles.length > 0) { - for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { - this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue - this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey + if (choose !== null && choose.length > 0) { + this.formobj.openTickTypeKey = choose[0].dictKey + if (this.formobj.finBillVehicles.length > 0) { + for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { + this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue + this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey + } } + } else { + this.formobj.openTickTypeKey = '' } }, changeOpenTick(val) { + if (this.formobj.openTickTypeValue === '') { + this.$message({ showClose: true, type: 'error', message: '请选择开票类型' }) + return + } const choose = this.openTick_list.filter((item) => item.name === val) - this.formobj.openTickSid = choose[0].sid - if (this.formobj.finBillVehicles.length > 0) { - for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { - this.formobj.finBillVehicles[i].openTickName = choose[0].name - this.formobj.finBillVehicles[i].openTickSid = choose[0].sid - this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks + if (choose !== null && choose.length > 0) { + if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) { + this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' }) + } else { + this.formobj.openTickSid = choose[0].sid + if (this.formobj.finBillVehicles.length > 0) { + for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { + this.formobj.finBillVehicles[i].openTickName = choose[0].name + this.formobj.finBillVehicles[i].openTickSid = choose[0].sid + this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks + } + } } + } else { + this.formobj.openTickSid = '' } }, changeBillType(val, row) { const choose = this.openTickType_list.filter((item) => item.dictValue === val) - row.billTypeKey = choose[0].dictKey + if (choose !== null && choose.length > 0) { + row.billTypeKey = choose[0].dictKey + } else { + row.billTypeKey = '' + } }, changeOpenTickName(val, row) { + if (row.billTypeValue === '') { + this.$message({ showClose: true, type: 'error', message: '请选择开票类型' }) + return + } const choose = this.openTick_list.filter((item) => item.name === val) - row.openTickSid = choose[0].sid - row.openTickRemarks = choose[0].openTickRemarks + if (choose !== null && choose.length > 0) { + if (choose[0].openTickTypeValue !== row.billTypeValue) { + this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' }) + } else { + row.openTickSid = choose[0].sid + row.openTickRemarks = choose[0].openTickRemarks + } + } else { + row.openTickSid = '' + row.openTickRemarks = '' + } }, handleLookByDingDan() { this.viewState = 2 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue index 4442b5cbcb..a5b800683c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue @@ -346,33 +346,66 @@ export default { }, changeOpenTickType(val) { const choose = this.openTickType_list.filter((item) => item.dictValue === val) - this.formobj.openTickTypeKey = choose[0].dictKey - if (this.formobj.finBillVehicles.length > 0) { - for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { - this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue - this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey + if (choose !== null && choose.length > 0) { + this.formobj.openTickTypeKey = choose[0].dictKey + if (this.formobj.finBillVehicles.length > 0) { + for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { + this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue + this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey + } } + } else { + this.formobj.openTickTypeKey = '' } }, changeOpenTick(val) { + if (this.formobj.openTickTypeValue === '') { + this.$message({ showClose: true, type: 'error', message: '请选择开票类型' }) + return + } const choose = this.openTick_list.filter((item) => item.name === val) - this.formobj.openTickSid = choose[0].sid - if (this.formobj.finBillVehicles.length > 0) { - for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { - this.formobj.finBillVehicles[i].openTickName = choose[0].name - this.formobj.finBillVehicles[i].openTickSid = choose[0].sid - this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks + if (choose !== null && choose.length > 0) { + if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) { + this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' }) + } else { + this.formobj.openTickSid = choose[0].sid + if (this.formobj.finBillVehicles.length > 0) { + for (var i = 0; i < this.formobj.finBillVehicles.length; i++) { + this.formobj.finBillVehicles[i].openTickName = choose[0].name + this.formobj.finBillVehicles[i].openTickSid = choose[0].sid + this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks + } + } } + } else { + this.formobj.openTickSid = '' } }, changeBillType(val, row) { const choose = this.openTickType_list.filter((item) => item.dictValue === val) - row.billTypeKey = choose[0].dictKey + if (choose !== null && choose.length > 0) { + row.billTypeKey = choose[0].dictKey + } else { + row.billTypeKey = '' + } }, changeOpenTickName(val, row) { + if (row.billTypeValue === '') { + this.$message({ showClose: true, type: 'error', message: '请选择开票类型' }) + return + } const choose = this.openTick_list.filter((item) => item.name === val) - row.openTickSid = choose[0].sid - row.openTickRemarks = choose[0].openTickRemarks + if (choose !== null && choose.length > 0) { + if (choose[0].openTickTypeValue !== row.billTypeValue) { + this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' }) + } else { + row.openTickSid = choose[0].sid + row.openTickRemarks = choose[0].openTickRemarks + } + } else { + row.openTickSid = '' + row.openTickRemarks = '' + } }, handleLookByDingDan() { this.viewState = 2