From 38faad731554bc0e083d0dea9b4f6abe610b9a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Fri, 24 Sep 2021 15:35:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bankAgriculture/paymentApproval.js | 9 + src/router/index.js | 9 + .../paymentApproval/approvalAdd.vue | 173 +++++----- .../paymentApproval/approvalApproval.vue | 306 ++++++++++++++++++ src/views/onlineHome/done.vue | 3 + .../homestead/homeApproval/approvalForm.vue | 151 ++------- 6 files changed, 449 insertions(+), 202 deletions(-) create mode 100644 src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 7b6eb300..42db29b4 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -116,3 +116,12 @@ export function getQmyeFlow(id) { method: 'post' }) } + +// 查询当前账期余额 +export function approval(data) { + return request({ + url: '/activiti/process/complete', + method: 'post', + params:data + }) +} diff --git a/src/router/index.js b/src/router/index.js index dea24b0d..81cbbd00 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1014,6 +1014,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve) }, + { + path: '/approvalApproval', + name: 'approvalApproval', + meta: { + title: '付款审批', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve) + }, { path: '/approvalModify', name: 'approvalModify', diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index a4cb31e2..930d48a2 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -10,14 +10,14 @@

添加付款申请

- +

基础信息

- +

关联项目

@@ -97,6 +97,8 @@ @click="showproject = true" input-align="right" right-icon="arrow-down" + required + :rules="[{ required: true , message:'请选择项目名称' }]" /> - - + + - + +

付款方信息

@@ -142,7 +147,7 @@ right-icon="arrow-down" label-width="auto" required - :rules="[{ required: true }]" + :rules="[{ required: true , message:'请选择付款方' }]" /> - +

收款方信息

-
@@ -359,6 +365,10 @@ ynType:'1' } }, + getChange(){ + console.log(this.$refs.submit) + + }, getDictionaries(){ this.getDicts("capital_expenditure_type").then((res) => { for (var i = 0; i < res.data.length; i++) { @@ -372,6 +382,10 @@ }); this.getPayeeList(); }, + getError(e){ + console.log(e) + this.$notify({ type: 'danger', message: e.errors[0].message }); + }, addChargeItme(index){ if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){ this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' }); @@ -507,17 +521,23 @@ this.$set(this.form, "expenditureAmount", total); }, goAdd(){ + console.log('aaa'); + return; + if(this.chargeItme.length<1){ + this.$notify({ type: 'danger', message: '请添加收款方信息' }); + return; + } if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); + this.$notify({ type: 'danger', message: '付款事由禁止包含！' }); return; } if(this.form.capitalExpenditureType==2){ if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称！'); + this.$notify({ type: 'danger', message: '请选择项目名称！' }); return; } if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号！'); + this.$notify({ type: 'danger', message: '请输入工程发票号！' }); return; } } @@ -525,12 +545,9 @@ this.$set(this.form, "bankTypeList", this.chargeItme); this.$set(this.form, "accountTypeList", this.chargeItme); this.$set(this.form, "transferStatusList", this.chargeItme); - console.log(this.form); addTransfer(this.form).then(response => { - console.log(response); this.projectForm.outId = response.data.id this.$set(this.projectForm, "ynType", '1'); - console.log(this.projectForm) if(this.form.capitalExpenditureType==2){ addProjectto(this.projectForm).then(res => { customSubmit(response.data.id).then(res => { @@ -551,17 +568,23 @@ }); }, goUpdate(){ + console.log('aaa'); + return; + if(this.chargeItme.length<1){ + this.$notify({ type: 'danger', message: '请添加收款方信息' }); + return; + } if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); + this.$notify({ type: 'danger', message: '付款事由禁止包含！' }); return; } if(this.form.capitalExpenditureType==2){ if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称！'); + this.$notify({ type: 'danger', message: '请选择项目名称！' }); return; } if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号！'); + this.$notify({ type: 'danger', message: '请输入工程发票号！' }); return; } } diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue new file mode 100644 index 00000000..974ea166 --- /dev/null +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 300d4620..5a9ce90f 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -129,6 +129,9 @@ case 'accepting': this.$router.push({name:'approvalForm',query: {id:item.formData.id}}) break; + case 'yinnong_transfer': + this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId}}) + break; } } }, diff --git a/src/views/onlineHome/homestead/homeApproval/approvalForm.vue b/src/views/onlineHome/homestead/homeApproval/approvalForm.vue index 5e1728f9..f39dec0a 100644 --- a/src/views/onlineHome/homestead/homeApproval/approvalForm.vue +++ b/src/views/onlineHome/homestead/homeApproval/approvalForm.vue @@ -7,9 +7,6 @@ placeholder @click-left="$router.back(-1)" > - 申请 @@ -244,6 +241,30 @@
+
+ + 村级
审核
意见 + + + 同意 + 驳回 + + + + +
+
+ + 镇级
审核
意见 + + + 同意 + 驳回 + + + + +
@@ -324,7 +345,6 @@
- @@ -395,25 +415,6 @@ this.getDetail(); }, methods: { - goFlow(){ - window.location='flowChart?id='+this.id; - }, - //更新文件回显 - afterRead(file) { - this.$forceUpdate(); - }, - //删除图片 - deleteFile(elIndex){ - if(elIndex.id != ''){ - removeFile(elIndex.id).then(response => {}); - } - this.$forceUpdate(); - return (file, name) => { - let fileIndex = name.index - this.fileList[elIndex].splice(fileIndex, 1) - this.upLoadList[elIndex].splice(fileIndex, 1) - } - }, //获取数据集合 getDetail(){ allInformation(this.id).then(response => { @@ -462,7 +463,6 @@ this.showHouse = true; } }); - console.log(response.data.tHouseApplyProposer.auditStatus != 0) this.applicationDetail = response.data; this.parameter.houseApplyStatus = response.data.tHouseApplyProposer.houseApplyStatus; let currentProcessKey = response.data.currentProcessKey; @@ -489,7 +489,6 @@ for (let j = 0 ; j < res2.data.length ; j++){ this.fileArray[i].findList[j] = {url: process.env.VUE_APP_BASE_ROUTING_URL + res2.data[j].fileUrl, isImage: true , id:res2.data[j].id} ; this.$forceUpdate(); - console.log(this.fileArray[i].findList[j]) } }); } @@ -500,108 +499,6 @@ },2000) }); }, - onConfirmApplyTime(date) { - this.applicationDetail.tHouseApplyProposer.applyTime = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; - this.showApplyTime = false; - }, - //基地开工时间 - onConfirmStartDate(date) { - this.applicationDetail.tHouseApplyStart.startDate = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; - this.showStartDate = false; - }, - //基地竣工时间 - onConfirmEndDate(date) { - this.applicationDetail.tHouseApplyStart.endDate = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; - this.showEndDate = false; - }, - //选择建房类型 - onConfirmBuildingType(data){ - this.buildingTypeValue = data.text; - this.applicationDetail.tHouseApplyProposedSituation.buildingType = data.value; - this.showBuildingType = false; - }, - //选择宅基地处置情况 - onConfirmLandIsposal(data){ - this.landIsposalValue = data.text; - this.applicationDetail.tHouseApplyCurrentSituation.landIsposal = data.value; - this.showLandIsposal = false; - }, - //选择房屋构造 - onConfirmHousingStructure(data){ - this.housingStructureValue = data.text; - this.applicationDetail.tHouseApplyProposedSituation.housingStructure = data.value; - this.showHousingStructure = false; - }, - //选择户型 - onConfirmHouseType(data){ - this.houseTypeValue = data.text; - this.applicationDetail.tHouseApplyProposedSituation.houseTypeId = data.value; - this.showHouseType = false; - }, - //选择性别 - onConfirmSex(data){ - this.sexValue = data.text; - this.applicationDetail.tHouseApplyProposer.sex = data.value; - this.showSex = false; - }, - //添加家庭成员 - addFamily(){ - this.applicationDetail.tHouseApplyFamilyMembers.push({ - applyProposerId:this.applicationDetail.tHouseApplyFamilyMembers[0].applyProposerId, - memberName:'', - age:'', - familyStatusName:'', - idcard :'', - householdRegister:'', - }); - }, - //删除家庭成员 - deleteFamily(index){ - this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1) - }, - //是否有宅基地选项改变 - existHomesteadChange(name){ - if (name == 'Y'){ - if (this.applicationDetail.tHouseApplyCurrentSituation == null){ - //现宅基地情况 - this.applicationDetail.tHouseApplyCurrentSituation = { - //宅基地面积 - landArea: '', - //人均宅基地面积 - landPerArea: '', - //不动产单元号 - landCertificateNo: '', - //农民房屋幢号 - houseCertificateNo: '', - //建筑面积 - buildingArea: '', - //人均建筑面积 - buildingPerArea: '', - //现宅基地处置情况 字典 land_isposal - landIsposal: "" - }; - this.CurrentSituation = true ; - //处置情况字典查询 - this.houseGetDicts("land_isposal").then((res) => { - res.data.map(item => { - this.landIsposal.push({ value:item.dictValue, text: item.dictLabel}); - }); - this.landIsposalValue= this.selectDictLabel(res.data, this.applicationDetail.tHouseApplyCurrentSituation.landIsposal); - }); - } - this.CurrentSituation = true; - }else{ - this.CurrentSituation = false; - } - }, - //图纸选择改变 - designPaperChange(name){ - if(name == 2){ - this.showHouse = true; - }else{ - this.showHouse = false; - } - }, base64toFile(dataurl, filename = "file") { let arr = dataurl.split(","); let mime = arr[0].match(/:(.*?);/)[1]; From 976a726c56404443f44bf3c8e41da6d5b3413d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Fri, 24 Sep 2021 17:14:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bankAgriculture/paymentApproval.js | 7 ++ .../paymentAccount/paymentAccountDetail.vue | 2 +- .../paymentApproval/approvalAdd.vue | 24 +++-- .../paymentApproval/approvalApproval.vue | 4 +- .../paymentApproval/approvalList.vue | 25 ++++- .../paymentApproval/approvalModify.vue | 93 ++++++++++++------- src/views/onlineHome/done.vue | 2 +- 7 files changed, 108 insertions(+), 49 deletions(-) diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 42db29b4..70fff9a8 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -125,3 +125,10 @@ export function approval(data) { params:data }) } +// 删除银行转账 +export function delTransfer(id) { + return request({ + url: '/yinnong/transfer/remove/' + id, + method: 'get' + }) +} diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue index 95e7ab55..716d40f1 100644 --- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue +++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

基础信息

diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index 930d48a2..8031432d 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -223,11 +223,11 @@ - 保存 + 保存 - 保存并提交 + 保存并提交
@@ -250,6 +250,8 @@ showFundType:false, showpayer:false, + buttonType:'a', + minDate: new Date(), maxDate: new Date(2025, 10, 1), currentDate: new Date(), @@ -366,8 +368,14 @@ } }, getChange(){ - console.log(this.$refs.submit) - + console.log(this.buttonType) + if(this.buttonType == 'update'){ + console.log('update') + this.goUpdate(); + }else if(this.buttonType == 'add'){ + console.log('add') + this.goAdd(); + } }, getDictionaries(){ this.getDicts("capital_expenditure_type").then((res) => { @@ -521,8 +529,6 @@ this.$set(this.form, "expenditureAmount", total); }, goAdd(){ - console.log('aaa'); - return; if(this.chargeItme.length<1){ this.$notify({ type: 'danger', message: '请添加收款方信息' }); return; @@ -568,8 +574,6 @@ }); }, goUpdate(){ - console.log('aaa'); - return; if(this.chargeItme.length<1){ this.$notify({ type: 'danger', message: '请添加收款方信息' }); return; @@ -598,13 +602,13 @@ this.$set(this.projectForm, "ynType", '1'); if(this.form.capitalExpenditureType==2){ addProjectto(this.projectForm).then(res => { - this.$toast.success('修改成功'); + this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) },2000) }) }else{ - this.$toast.success('修改成功'); + this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) },2000) diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue index 974ea166..f87141da 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -58,7 +58,7 @@ -
+
审批
意见 @@ -71,7 +71,7 @@
-
+
提交 diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue index b3d10056..9311a2f9 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue @@ -35,6 +35,9 @@ + + + @@ -46,7 +49,7 @@