diff --git a/src/main.js b/src/main.js index efeb51e8..7a085bda 100644 --- a/src/main.js +++ b/src/main.js @@ -17,7 +17,7 @@ import VueCookies from 'vue-cookies' Vue.use(VueCookies); import global from '@/utils/global'; -import { getDicts } from "@/utils/data"; +import { getDicts ,getConfigKey } from "@/utils/data"; import { houseGetDicts } from '@/utils/data'; import { selectDictLabel , selectDictScheme , onClickLeft , getNowFormatDate , format } from "@/utils/utils"; import vueEsign from 'vue-esign' @@ -25,6 +25,7 @@ Vue.use(vueEsign) //全局方法挂载 Vue.prototype.getDicts = getDicts +Vue.prototype.getConfigKey = getConfigKey Vue.prototype.houseGetDicts = houseGetDicts Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictScheme = selectDictScheme diff --git a/src/utils/data.js b/src/utils/data.js index 37b18cb6..495aa914 100644 --- a/src/utils/data.js +++ b/src/utils/data.js @@ -15,3 +15,10 @@ export function houseGetDicts(dictType) { method: 'get' }) } +// 根据参数键名查询参数值 +export function getConfigKey(configKey) { + return request({ + url: '/system/config/configKey/' + configKey, + method: 'get' + }) +} diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue index db759726..a9a0b9fc 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue @@ -20,12 +20,13 @@ +
@@ -49,7 +50,11 @@
- +
+ + + +

收款方信息

@@ -164,6 +169,7 @@ isAsc: "desc", }, capitalExpenditureOpen:false, + contractOpen:false, projectForm:{ projectId:null, projectName:null, @@ -174,10 +180,19 @@ outId:null, ynType:'1' }, + infoForm:{ + infoId:null, + name:null, + code:null, + totalAmount:null, + contractionId:null, + transferId:null + }, projectFundType:'', // 审核意见默认值 pass: "true", comment: "同意", + templateList:[], }; }, created() { @@ -199,8 +214,28 @@ }); this.getDictionaries(); this.getFileList(); + this.getTemplateList(); }, methods: { + getTemplateList(){ + let templateQueryParams = { + // 分页 + pageNum: 1, + pageSize: 999, + }; + listTemplate(templateQueryParams).then(response => { + this.templateList = response.rows; + }); + }, + tempalteFormat(id){ + let name = "" + this.templateList.map(res => { + if(res.id==id){ + name = res.name + } + }) + return name + }, goFlow(){ window.location='approvalProcess2?id='+this.$route.query.id; }, @@ -222,15 +257,21 @@ this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType); this.projectForm = res.data }) + }else if(response.data.capitalExpenditureType==4){ + this.contractOpen = true + let param={ + 'transferId' : response.data.id + } + getInfoto(param).then(res => { + this.infoForm = res.data + }) }else{ this.showproject = false } this.form = response.data; }); - console.log(this.$route.query.id) listCashdetailByCashId(this.$route.query.id).then((response) => { this.chargeItme = response.data; - console.log(response) this.getPayeeList(); }); }, @@ -254,158 +295,6 @@ } }); }, - payeeDictLabel(datas, value) { - var actions = []; - Object.keys(datas).some((key) => { - if (datas[key].payeeId == ('' + value)) { - actions.push(datas[key].payee); - return true; - } - }) - return actions.join(''); - }, - onConfirmCapital(data){ - console.log(data) - if (data.value != 2){ - this.capitalExpenditureOpen = false; - this.projectForm = []; - }else{ - this.capitalExpenditureOpen = true; - } - this.capitalExpenditureType = data.text; - this.form.capitalExpenditureType = data.value; - this.showcapital = false; - }, - onConfirmFundType(data){ - console.log(data) - this.projectForm.projectFundType = data.value; - this.projectFundType = data.text; - this.showFundType = false; - }, - onConfirmProject(data){ - console.log(data) - this.projectList.map(res => { - console.log(res) - if(res.projectName==data.text){ - this.projectForm.projectId = res.id - this.projectForm.projectName = res.projectName - this.projectForm.projectContractor = res.projectContractor - this.projectForm.projectAmount = res.projectAmount - console.log(this.projectForm) - } - }) - this.showproject = false; - }, - onConfirmPayee(data){ - // this.chargeItme[this.chargeItme.length-1].payeeText = data.text; - this.chargeItme[this.chargeItme.length-1].payee = data.text; - this.chargeItme[this.chargeItme.length-1].payeeId = data.value; - console.log(this.chargeItme) - this.showpayee = false; - }, - onConfirmBankType(data){ - console.log(this.chargeItme) - this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text; - this.chargeItme[this.chargeItme.length-1].bankType = data.value; - this.showbankType = false; - }, - onConfirmLasj(data){ - this.form.applyDate = this.getNowFormatDate(data).substr(0,10); - this.showlasj = false; - }, - accountTypeChange(e){ - console.log(e) - this.payeeList = []; - this.queryParams.accountType = this.form.accountType - this.queryParams.status = "0" - listPayee(this.queryParams).then((response) => { - for (var i = 0; i < response.rows.length; i++) { - this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id}); - } - }); - }, - goAdd(){ - if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); - return; - } - if(this.form.capitalExpenditureType==2){ - if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称！'); - return; - } - if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号！'); - return; - } - } - this.$set(this.form, "payeeList", this.chargeItme); - 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); - updateTransfer(this.form).then(response => { - console.log(response); - this.projectForm.outId = this.form.id - this.$set(this.projectForm, "ynType", '1'); - console.log(this.projectForm) - if(this.form.capitalExpenditureType==2){ - addProjectto(this.projectForm).then(res => { - customSubmit(this.form.id).then(res => { - this.$toast.success('提交成功'); - setTimeout(function(){ - history.go(-1) - },2000) - }) - }) - }else{ - customSubmit(this.form.id).then(res => { - this.$toast.success('提交成功'); - setTimeout(function(){ - history.go(-1) - },2000) - }) - } - }); - }, - goUpdate(){ - if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); - return; - } - if(this.form.capitalExpenditureType==2){ - if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称！'); - return; - } - if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号！'); - return; - } - } - this.$set(this.form, "payeeList", this.chargeItme); - this.$set(this.form, "bankTypeList", this.chargeItme); - this.$set(this.form, "accountTypeList", this.chargeItme); - this.$set(this.form, "transferStatusList", this.chargeItme); - this.projectForm.outId = this.form.id - updateTransfer(this.form).then((response) => { - this.projectForm.outId = this.form.id - this.$set(this.projectForm, "ynType", '1'); - if(this.form.capitalExpenditureType==2){ - addProjectto(this.projectForm).then(res => { - this.$toast.success('修改成功'); - setTimeout(function(){ - history.go(-1) - },2000) - }) - }else{ - this.$toast.success('修改成功'); - setTimeout(function(){ - history.go(-1) - },2000) - } - }); - }, beforeRead(file) { this.uploadFiles.push(file.file); }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue index be330874..1a16ef82 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue @@ -19,12 +19,13 @@ +
@@ -42,6 +43,11 @@
+
+ + + +

出票方信息

@@ -163,7 +169,7 @@