From 9dc0030f30d0c60d81d903693843bcd5d3547b11 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Thu, 21 Apr 2022 19:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/env.js | 2 +- image/apply/icon_close.png | Bin 0 -> 626 bytes image/apply/update.png | Bin 0 -> 779 bytes image/login/login_text.png | Bin 0 -> 6948 bytes pages/apply/approval/approval.js | 20 +- pages/apply/approval/approval.wxml | 4 +- pages/apply/index.wxml | 5 +- pages/apply/paymentTemplate/add/add.js | 333 +++++++++++++--- pages/apply/paymentTemplate/add/add.json | 4 +- pages/apply/paymentTemplate/add/add.wxml | 377 +++++++++++++++--- pages/apply/paymentTemplate/add/add.wxss | 119 +++++- .../apply/paymentTemplate/paymentTemplate.js | 78 +++- .../paymentTemplate/paymentTemplate.wxml | 12 +- pages/index/index.wxml | 5 +- pages/payee/index.js | 2 + pages/user/login/login.wxml | 12 +- utils/API.js | 12 +- 17 files changed, 834 insertions(+), 151 deletions(-) create mode 100644 image/apply/icon_close.png create mode 100644 image/apply/update.png create mode 100644 image/login/login_text.png diff --git a/env/env.js b/env/env.js index 8253825..5f00249 100644 --- a/env/env.js +++ b/env/env.js @@ -6,7 +6,7 @@ module.exports = { PRE: { URL_PREFIX: 'http://192.168.31.178:8080/api', // URL_PREFIX: 'https://dazu.nongshen.net/api', - }, + }, PROD: { URL_PREFIX: 'http://192.168.31.178:8080/api', // URL_PREFIX: 'https://dazu.nongshen.net/api', diff --git a/image/apply/icon_close.png b/image/apply/icon_close.png new file mode 100644 index 0000000000000000000000000000000000000000..544ab6c4b84e8bca2f3a71a7d321e83cccea6b22 GIT binary patch literal 626 zcmV-&0*(ENP)*fb<6--T=fK85tQL;4_L5 zmn6^v2cTR%5QAu9zyYA5Mxcct8UtXp2x!R!pvrt=Ovj>T0?@KTba51mfEIv)W<3eM zz~vT@uL6M*yw2;A6Mh%(g&x5@LB}Y1v4nx(2=3S zAq>T!#pm`ibRAp+4&GMxc)Y&G8Fa|Hf)}?i+7m^Zvf(rjEsyAa2dmh zO#*6gJy0$Ip97HO7693e*et@Z0BAVKwez7aCenPcGLVlFftG-L1qUb=01XGZ7-Tpl z0AvZsM_>TAfRN#*pWI^DcjqF*(@$?0vMhZVG(=_bIU*3|6R-u)Fh7qiSoYqzz|eJY z4a2ifZy8KvR2e4vWiarua}n|(D7XwkaRRddp%Vc#t^!s4IFeJAjK!lusWs+J@^Vi790S|+ap_$w`n@V{=1jpLYWrc;D|*A ziL3h<&OEt|A_fX3kWY}nL68LxfCBO`L6FO=rxl}UY<7!d2++2Ki%mPeg<<-Mt>~c& z=0_VkGE_K(!Q?K0EclNvctCRK;SX~Cryt)KZoPSmVF?c#2gC7fM2N#J0J+?KPBp`q zUq3K3sf)^h!xq{5=<$TjAs{i7AVN--=(eE8!-lKJ8ESVeLQ!@!s~0_zFJeS8w#ai- z)?=9Dmx*E+dOUzK;r!4dba#Ox86}y5f+}QjE5q~8@4$*d8Ek%75k~F}UfhBb2iWon zP&+u8DgYTM84Z+y5?A$sEdUvgo`FE}pgaHrXekHT7m7HG3XmbZz=)LwW*~Hc?0P(g zLy8KJW~eVfwG=;wX-EQ~;49cPlL3^1Bzc7x${j)(oK;|z9E#45K%N1-u!C9xs%X~Z zvH;{GP{e|Y1dyRv3O8h}sKqr*hESb=&v!_2*ee_)OF%wZKq$DdSOyA~1iV!yk|m&& z)d0j8bp#GyECi`1s?tX`02=uqAHkX}`cV0cKpNI;*?_Ov0sz$XHAka;Xqx~4002ov JPDHLkV1o8oJpup# literal 0 HcmV?d00001 diff --git a/image/login/login_text.png b/image/login/login_text.png new file mode 100644 index 0000000000000000000000000000000000000000..86d3ead2591946dee2b608884bfd9e41e24cea3a GIT binary patch literal 6948 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 F^nWkBPx=4= literal 0 HcmV?d00001 diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js index c3930b1..cbc92c4 100644 --- a/pages/apply/approval/approval.js +++ b/pages/apply/approval/approval.js @@ -66,8 +66,8 @@ Page({ this.setData({itemId:options.id,deptId:options.deptId}); //this.getApprovalItemList(); this.groupList(); - this.townList(); - this.villageList(); + // this.townList(); + // this.villageList(); this.getApprovalItemsById(); }, getApprovalItemsById(){ @@ -265,8 +265,6 @@ Page({ }, groupList:function(){ let data = { - deptId : this.data.deptId, - deptLevel:1, method:"GET" } UTIL.httpRequest(API.URL_GET_USERLIST,data ,{ @@ -379,10 +377,15 @@ Page({ success: (res) => { if (res.code == API.SUCCESS_CODE) { wx.showToast({ - title: "暂存成功！", + title: "保存成功！", duration: 2000, icon:"success" }) + setTimeout(function(){ + wx.reLaunch({ + url: '/pages/index/index' + }) + },2000) } } }) @@ -401,10 +404,15 @@ Page({ }, success: function (response) { wx.showToast({ - title: "暂存成功！", + title: "保存成功！", duration: 2000, icon:"success" }) + setTimeout(function(){ + wx.reLaunch({ + url: '/pages/index/index' + }) + },2000) }, }) } diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml index 0c9df50..f557de6 100644 --- a/pages/apply/approval/approval.wxml +++ b/pages/apply/approval/approval.wxml @@ -44,7 +44,7 @@ {{item.roles[0].roleName}}:{{item.nickName}} - + diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml index 64f67a8..06dadbe 100644 --- a/pages/apply/index.wxml +++ b/pages/apply/index.wxml @@ -24,7 +24,10 @@ {{item.bankAccountNumber}}卡号 可用余额 - {{item.balance}} + + {{item.balance}} + + diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index da25dcd..ac35276 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -18,13 +18,6 @@ Page({ active:0, projectText:'', balance:0, - showCapitalExpenditureType:false, - showApplyDate:false, - showTransferType:false, - showProject:false, - showProjectFundType:false, - showAccount:false, - showDialog:false, capitalExpenditureTypeOptions:[], transferTypeOptions:[], projectOptions:[], @@ -32,6 +25,7 @@ Page({ contractionOptions:[], accountOptions:[], moneyorderOptions:[], + topInputTirme:false, form:{ approvalItemTemplate:{ approvalItems:'',//审批事项 @@ -39,15 +33,27 @@ Page({ submitDate:'',//提交日期 submitter:'',//提交人 telephone:'',//联系方式 - totalAmount:0,//合计金额 + totalAmount:"0.00",//合计金额 templateName:'',//模板名称 选择保存模板的时候添加 dataType:'',//数据类型 }, transfers:[{//事项信息集合以下是List对象信息 num:"一", + expenditureAmountTirme:false, + remarkTirme:false, + showCapitalExpenditureType:false, + showApplyDate:false, + showTransferType:false, + showProject:false, + showProjectFundType:false, + showAccount:false, + showDialog:false, + showContraction:false, SJimage:[], FPimage:[], QTimage:[], + showTitle:true, + collapseDis:false, capitalExpenditureType:'1',//资金支出类别 capitalExpenditureTypeText:'结算类',//资金支出类别（展示用） succeedAmount:'',//成功支付金额 @@ -94,21 +100,24 @@ Page({ outId:'', ynType:'1', }, + contractionForm:{ + contractionId:'', + name:'', + code:'', + totalAmount:'', + }, }], }, - contractionForm:{ - id:'', - name:'', - code:'', - totalAmount:'', - }, + accountForm:{}, fileForm:[], isUpdate:false, SJimage: [], FPimage: [], QTimage: [], - imgcount:0 + imgcount:0, + activeNames: 0, + applyDate:'' }, /** @@ -118,6 +127,7 @@ Page({ var that = this; console.log(options); if(options.id){ + UTIL.showLoadingHaveMask(); setTimeout(function(){ UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, { success: (res) => { @@ -125,27 +135,55 @@ Page({ console.log(that.data.capitalExpenditureTypeOptions); if(res.data.approvalItemTemplate == null){return;} res.data.transfers.forEach( (item,index) => { + + that.setData({ + applyDate: res.data.transfers[0].applyDate + }) + res.data.transfers[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions); + res.data.transfers[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions); - + res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions); - + + res.data.transfers[index].num = UTIL.convertToChinaNum(index+1); + res.data.transfers[index].payeeList.forEach( (response,i) => { + res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions); + }) - let prames = { - outId:res.data.transfers[index].id, - ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2' + res.data.transfers[index].showTitle = false; + if(res.data.transfers[index].capitalExpenditureType == 2){ + let prames = { + outId:res.data.transfers[index].id, + ynType: res.data.transfers[index].transferType=='1'||res.data.transfers[index].transferType=='2'||res.data.transfers[index].transferType=='4'?'1':'2' + } + // 工程项目查询 + UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, { + success: (res) => { + res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions); + that.setData({ + ["form.transfers["+index+"].projectForm"]:res.data, + }) + } + }) } - // 工程项目查询 - UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, { - success: (res) => { - res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions); - that.setData({ - ["form.transfers["+index+"].projectForm"]:res.data, - }) + + if(res.data.transfers[index].capitalExpenditureType == 4){ + let prames = { + transferId:res.data.transfers[index].id, } - }) + // 关联合同查询 + UTIL.httpRequest(API.URL_GET_GETSELECTINFOBYOUTID , prames, { + success: (res) => { + that.setData({ + ["form.transfers["+index+"].contractionForm"]:res.data, + }) + } + }) + } + UTIL.httpRequest( API.URL_GET_FINDLIST, { @@ -269,8 +307,10 @@ Page({ }) }) that.setData({ - form:res.data + form:res.data, + activeNames:null }) + UTIL.hideLoadingHaveMask(); } } }) @@ -451,20 +491,25 @@ Page({ success: (res) => { that.setData({ accountOptions:res.rows, + ["form.transfers[0].applyDate"]: UTIL.formatDate(new Date()), + applyDate: UTIL.formatDate(new Date()), }) } }) - } }, - + onChangeBox(event) { + console.log(event); + this.setData({ + activeNames: event.detail, + }); + }, /** * 生命周期函数--监听页面初次渲染完成 */ onReady() { }, - /** * 生命周期函数--监听页面显示 */ @@ -535,6 +580,7 @@ Page({ }, openBox(even){ + console.log(even.currentTarget.dataset.name); this.setData({ [even.currentTarget.dataset.name]:true }) @@ -695,9 +741,9 @@ Page({ this.setData({ [event.currentTarget.dataset.name]: false, [event.currentTarget.dataset.value]: event.detail.value.name, - ['contractionForm.code']: event.detail.value.code, - ['contractionForm.totalAmount']: event.detail.value.totalAmount, - ['contractionForm.id']: event.detail.value.id, + ['form.transfers['+event.detail.index+'].contractionForm.code']: event.detail.value.code, + ['form.transfers['+event.detail.index+'].contractionForm.totalAmount']: event.detail.value.totalAmount, + ['form.transfers['+event.detail.index+'].contractionForm.contractionId']: event.detail.value.id, }); }, onConfirmMoneyorder(event) { @@ -720,7 +766,7 @@ Page({ event.currentTarget.dataset.accounttype = '' } wx.navigateTo({ - url: '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index, + url: '/pages/payee/index?isPeers='+event.currentTarget.dataset.ispeers+'&bankType='+event.currentTarget.dataset.banktype+'&accountType='+event.currentTarget.dataset.accounttype+'&transferType='+event.currentTarget.dataset.transfertype + '&index='+event.currentTarget.dataset.index+'&money='+this.data.form.transfers[event.currentTarget.dataset.index].expenditureAmount, }) }, onChange(event){ @@ -729,13 +775,39 @@ Page({ [event.currentTarget.dataset.value]: event.detail, }) }, + onChangeTime(event){ + console.log(event); + this.setData({ + applyDate: event.detail, + }) + }, + onConfirmTime(event){ + this.setData({ + [event.currentTarget.dataset.name]: false, + applyDate: UTIL.formatDate(event.detail), + }); + for (let i = 0; i < this.data.form.transfers.length; i++) { + this.setData({ + ["form.transfers["+i+"].applyDate"]:UTIL.formatDate(event.detail), + }) + } + }, onChangeMoney(event){ console.log(event); var that = this; + if(event.detail == ''){ + this.setData({ + ["form.approvalItemTemplate.totalAmount"]:parseFloat(0).toFixed(2), + }) + return + } this.setData({ - ["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail, + // ["form.transfers["+event.currentTarget.dataset.index+"].payeeList["+event.currentTarget.dataset.childrenindex+"].incomeAmount"]: event.detail, + ["form.transfers["+event.currentTarget.dataset.index+"].payeeList[0].incomeAmount"]: event.detail, + ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail, // ["form.transfers["+event.currentTarget.dataset.index+"].expenditureAmount"]:event.detail, }) + console.log(that.data.form); var moneyCount = 0 ; for (let i = 0; i < that.data.form.transfers.length; i++) { const element = that.data.form.transfers[i]; @@ -743,15 +815,17 @@ Page({ const element2 = element.payeeList[j]; var allCount = 0 ; moneyCount = parseFloat(moneyCount)+parseFloat(element2.incomeAmount); - allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount); - this.setData({ - ["form.transfers["+i+"].expenditureAmount"]:allCount, - }) + // allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount); + // this.setData({ + // ["form.transfers["+i+"].expenditureAmount"]:allCount, + // }) } } + this.setData({ ["form.approvalItemTemplate.totalAmount"]:moneyCount.toFixed(2), }) + console.log(that.data.form); console.log(moneyCount.toFixed(2)); console.log(allCount.toFixed(2)); }, @@ -782,6 +856,9 @@ Page({ approvalItems = list.approvalItemTemplate.approvalItems; if(approvalItems == ''){ UTIL.showToastNoneIcon('请填写审批事项名称！'); + that.setData({ + topInputTirme:true + }) return; } @@ -792,7 +869,18 @@ Page({ return; } if(element.remark == ''){ + UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出原因！'); + that.setData({ + ["form.transfers["+i+"].remarkTirme"]:true + }) + return; + } + if(element.expenditureAmount == ''){ + UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'的支出金额！'); + that.setData({ + ["form.transfers["+i+"].expenditureAmountTirme"]:true + }) return; } if(element.payer == ''){ @@ -830,15 +918,30 @@ Page({ success: (res) => { if (res.code == API.SUCCESS_CODE) { for (let j = 0; j < res.data.transfers.length; j++) { - that.data.form.transfers[j].projectForm.ynType = res.data.transfers[j].transferType=='1'||res.data.transfers[j].transferType=='2'||res.data.transfers[j].transferType=='4'?'1':'2'; - that.data.form.transfers[j].projectForm.outId = res.data.transfers[j].id; - that.data.form.transfers[j].projectForm.method = 'POST'; - // 工程项目提交 - UTIL.httpRequest(API.URL_GET_ADDPROJECTTO , that.data.form.transfers[j].projectForm, { - success: (res) => { - - } - }) + if(that.data.form.transfers[j].capitalExpenditureType == 2){ + that.data.form.transfers[j].projectForm.ynType = res.data.transfers[j].transferType=='1'||res.data.transfers[j].transferType=='2'||res.data.transfers[j].transferType=='4'?'1':'2'; + that.data.form.transfers[j].projectForm.outId = res.data.transfers[j].id; + that.data.form.transfers[j].projectForm.method = 'POST'; + // 工程项目提交 + UTIL.httpRequest(API.URL_GET_ADDPROJECTTO , that.data.form.transfers[j].projectForm, { + success: (res) => { + + } + }) + } + if(that.data.form.transfers[j].capitalExpenditureType == 4){ + + that.data.form.transfers[j].contractionForm.transferId = res.data.transfers[j].id; + that.data.form.transfers[j].contractionForm.method = 'POST'; + + // 关联合同提交 + UTIL.httpRequest(API.URL_GET_GETRELATIONADD , that.data.form.transfers[j].contractionForm, { + success: (res) => { + + } + }) + } + if(that.data.form.transfers[j].fileForm == undefined){continue;} for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) { that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id @@ -871,18 +974,30 @@ Page({ url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId, }) } - // if(e.currentTarget.dataset.type != 0){ - // wx.showToast({ - // title: '保存成功', - // icon: 'success', - // duration: 2000, - // complete(){ - // setTimeout(function(){ - // that.back(); - // },2000) - // } - // }) - // } + if(e.currentTarget.dataset.type == 2){ + wx.showToast({ + title: '保存成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + } + if(e.currentTarget.dataset.type == 1){ + wx.showToast({ + title: '保存成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + } if(e.currentTarget.dataset.type == 3){ UTIL.httpRequest(API.URL_GET_TOREVIEWSUBMIT+res.data.approvalItemTemplate.id , {method:'POST'}, { success: (res2) => { @@ -917,6 +1032,24 @@ Page({ ["form.approvalItemTemplate.approvalItems"]: even.detail.value, }) }, + errorPd(e){ + console.log(e); + this.setData({ + [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false + }) + }, + errorJE(e){ + console.log(e); + this.setData({ + [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false + }) + }, + errorYY(e){ + console.log(e); + this.setData({ + [e.currentTarget.dataset.formname+"Tirme"]:e.detail.value == '' ? true:false + }) + }, SJtakephoto(e){ var that = this; let fileForm = that.data.form.transfers[e.currentTarget.dataset.index].fileForm?that.data.form.transfers[e.currentTarget.dataset.index].fileForm:[]; @@ -1026,12 +1159,32 @@ Page({ }) }, addList(){ + var that = this; let transList = this.data.form.transfers; + console.log(this.data.form); + for (let i = 0; i < transList.length; i++) { + const element = transList[i]; + if(element.applyDate == '' || element.remark == '' || element.payer == '' || element.payeeList[0].payee == '' || element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined){ + UTIL.showToastNoneIcon('事项'+UTIL.convertToChinaNum(i+1)+'的信息填写不完整，检查后重试！'); + return; + } + } transList.push({ num:UTIL.convertToChinaNum(transList.length+1), + expenditureAmountTirme:false, + remarkTirme:false, + showCapitalExpenditureType:false, + showApplyDate:false, + showTransferType:false, + showProject:false, + showProjectFundType:false, + showAccount:false, + showDialog:false, + showContraction:false, SJimage:[], FPimage:[], QTimage:[], + showTitle:true, capitalExpenditureType:'',//资金支出类别 capitalExpenditureTypeText:'',//资金支出类别（展示用） succeedAmount:'',//成功支付金额 @@ -1043,7 +1196,7 @@ Page({ operatorCode:'',//操作员代码 enterpriseCode:'',//企业编码 expenditureAmount:'',//支出总金额 - applyDate:'',//申请时间 + applyDate:UTIL.formatDate(that.data.applyDate),//申请时间 transferStatus:'',//转账状态 auditStatus:'0',//审批状态 paymentState:'',//支付状态 @@ -1068,10 +1221,37 @@ Page({ bankType:'',//所属银行0其他银行1中国银行2农商行（山东省）3农业银行4建设银行5工商银行 payeeAccount:'',//收款账户 }], + projectForm:{ + projectId:'', + projectName:'', + projectContractor:'', + projectAmount:'', + projectBillNum:'', + projectFundType:'', + outId:'', + ynType:'1', + }, + contractionForm:{ + contractionId:'', + name:'', + code:'', + totalAmount:'', + }, }); this.setData({ - ["form.transfers"] : transList + ["form.transfers"] : transList, + activeNames:transList.length-1 + }) + for (let i = 0; i < this.data.form.transfers.length; i++) { + const element = this.data.form.transfers[i]; + this.setData({ + ["form.transfers["+i+"].showTitle"] : false, + }) + } + this.setData({ + ["form.transfers["+(transList.length-1)+"].showTitle"] : true, }) + console.log(this.data.form); }, openPreview(e){ let array = []; @@ -1103,6 +1283,10 @@ Page({ }, deleteTransfers(e){ var that = this ; + console.log(e.currentTarget.dataset.index); + that.setData({ + ["form.transfers["+e.currentTarget.dataset.index+"].collapseDis"]:true + }) if(that.data.form.transfers.length<2){ UTIL.showToastNoneIcon('最少保留一条事项'); return; @@ -1112,6 +1296,27 @@ Page({ form:that.data.form }) }, + onOpen(e){ + var that = this ; + console.log(that.data.activeNames); + console.log(e); + for (let i = 0; i < this.data.form.transfers.length; i++) { + const element = this.data.form.transfers[i]; + this.setData({ + ["form.transfers["+i+"].showTitle"] : false, + }) + } + that.setData({ + ["form.transfers["+e.detail+"].showTitle"]:true + }) + }, + onCloseSecond(e){ + var that = this ; + console.log(e); + that.setData({ + ["form.transfers["+e.detail+"].showTitle"]:false + }) + }, /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/apply/paymentTemplate/add/add.json b/pages/apply/paymentTemplate/add/add.json index c230a0f..fad0550 100644 --- a/pages/apply/paymentTemplate/add/add.json +++ b/pages/apply/paymentTemplate/add/add.json @@ -15,6 +15,8 @@ "van-popup": "@vant/weapp/popup/index", "van-picker": "@vant/weapp/picker/index", "van-calendar": "@vant/weapp/calendar/index", - "van-dialog": "@vant/weapp/dialog/index" + "van-dialog": "@vant/weapp/dialog/index", + "van-collapse": "@vant/weapp/collapse/index", + "van-collapse-item": "@vant/weapp/collapse-item/index" } } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml index cc0d000..c859432 100644 --- a/pages/apply/paymentTemplate/add/add.wxml +++ b/pages/apply/paymentTemplate/add/add.wxml @@ -4,7 +4,7 @@ 支出申请 - + + + + 审批事项 + + + 支出总金额 + ￥ + 提交单位：{{form.approvalItemTemplate.submitCompany}} + + 提交人：{{form.approvalItemTemplate.submitter}} + + + 联系电话：{{form.approvalItemTemplate.telephone}} + + - - 事项{{form.transfers[index].num}} + + + + 事项{{form.transfers[index].num}} + + + + + 事项{{item.num}} + + 支出金额 + ￥ + + + 事由： + + + + + + + + + + + + + + + + + + 基础信息 + + + + + + + + + + + + + + + + 关联项目 + + + + + + + + + + + + + + + + + + + 关联合同 + + + + + + + + + + + + + 付款方信息 + + + + + + + + + + + + 付款方必填 + + + + + + + + + + + + + + + + + + + + + + + 收款方信息 + + + + + + 公户 + 私户 + + + + + + + + + + 姓名收款方 + + + + + + + + + + + + + + + 附件可拍照 + + + 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 + + + + + + 收\n据 + + + + + + + + + 发\n票 + + + + + + + + + 其\n他 + + + + + + + + + + + + + + + + @@ -202,9 +523,6 @@ - 附件可拍照 @@ -242,46 +560,8 @@ - - - - + --> @@ -296,13 +576,14 @@ - 提交复核 + + 上一步 下一步 - 保存 + 保存 diff --git a/pages/apply/paymentTemplate/add/add.wxss b/pages/apply/paymentTemplate/add/add.wxss index 4ce5f26..171486a 100644 --- a/pages/apply/paymentTemplate/add/add.wxss +++ b/pages/apply/paymentTemplate/add/add.wxss @@ -17,13 +17,16 @@ text{display: block;} width: 100%; font-size: 16px; } -.input_tit{ +.input_tittop input{ border: 1px solid #DCDCDC; padding: 0px 10px; height: 32px; line-height: 32px; border-radius: 5px; - margin-bottom: 15px; + width: 100%; +} +.error input{ + border: 1px solid red!important; } .bgPage{ width: 140%; @@ -33,7 +36,8 @@ text{display: block;} z-index: -1; } .center{ - padding-bottom: 28px; + padding-bottom: 15px; + background: #f2f2f2; } .main-title{ background-image: linear-gradient(to right, #2C8E68 , #B3DB62); @@ -57,9 +61,23 @@ text{display: block;} .title{ padding: 10px calc(3% + 20px); } +.topBox .van-cell{ + padding: 0!important; + margin-bottom: 15px; +} +.topBox .van-cell .van-cell__title, .topBox .van-cell .van-cell__value , .topBox .van-cell .van-field__label{ + font-size: 15px; + color: #000000!important; +} +.topBox .van-cell .van-cell__title{ + margin-right: 0!important; + max-width: 76px!important; + min-width: 76px!important; +} + .top-box{ - margin-top: 20px; - margin-bottom: 28px; + /* margin-top: 20px; + margin-bottom: 28px; */ } .top-box text{ margin-bottom: 15px; @@ -93,7 +111,7 @@ text{display: block;} border: 1px solid red; color: red; } -.van-cell{ +.table-box .van-cell{ padding: 0!important; } @font-face { @@ -113,7 +131,7 @@ text{display: block;} text-align: center; border-radius: 5px; white-space:pre-wrap; - padding: 22px 15px; + padding: 22px 8px; } .fj-li{ margin-top: 20px; @@ -133,6 +151,7 @@ text{display: block;} width: 94%; margin: 0 auto; justify-content:space-between; + margin-top: 30px; } .bottomBtn view{ display: flex; @@ -341,4 +360,88 @@ text{display: block;} } .van-cell--required:before { left: -8px!important; - } \ No newline at end of file + } + .input_money{ + padding: 0px 10px; + height: 32px; + line-height: 32px; + color: #E90000; + font-size: 26px; + display: inline-block; + width: 50%; + text-align: center; + } + + .money_box{ + font-size: 26px; + border-bottom:1px solid #DCDCDC; + width: 70%; + margin: 0 auto; + margin-bottom: 15px; + color: #E90000; + display: flex; + align-items: center; + justify-content: center; + } + + .btnBox{ + text-align: center; + position: relative; + height: 26px; + } + .down{ + width: 15px; + height: 8px; + margin: 0 auto; + margin-top: 18px; + } + + .update{ + width: 26px; + height: 26px; + position: absolute; + right: 41px; + } + .delete{ + width: 26px; + height: 26px; + position: absolute; + right: 0; + } + + .van-collapse-item { + background: transparent; + margin: 0 auto; + width: 100%; + margin: 0 auto; + margin-top: 15px; + } + .van-collapse-item__content{ + padding: 0!important; + } + + .van-collapse .van-cell{ + padding: 0; + background: transparent; + } + + .van-collapse .tit_box .title{ + text-align: center; + font-size: 18px; + } + .van-collapse .main-box{ + /* padding: 0; + box-shadow: none; */ + } + .van-collapse .tit_box{ + width: 94%; + background: #ffffff; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); + padding: 20px; + } + .van-collapse .tit_box .top-box .van-cell{ + margin-bottom: 15px; + } + \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index adfc6eb..ec1f1ff 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -142,14 +142,83 @@ Page({ */ onLoad(options) { var that = this ; + //所属银行 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { + success: (res) => { + this.setData({ + bankTypeOptions:res.data + }); + } + }) + // 资金支出类别字典查询 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'capital_expenditure_type', {method:'GET'}, { + success: (res) => { + that.setData({ + capitalExpenditureTypeOptions:res.data, + }) + } + }) + // 付款方式类型字典查询 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, { + success: (res) => { + that.setData({ + transferTypeOptions:res.data, + }) + } + }) + // 项目工程列表 + UTIL.httpRequest(API.URL_GET_GETPROJECTLIST , {method:'GET'}, { + success: (res) => { + that.setData({ + projectOptions:res.rows, + }) + } + }) + // 工程款类型字典查询 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'project_fund_type', {method:'GET'}, { + success: (res) => { + that.setData({ + projectFundTypeOptions:res.data, + }) + } + }) + // 获取合同信息列表 + UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, { + success: (res) => { + that.setData({ + contractionOptions:res.rows, + }) + } + }) UTIL.httpRequest(API.URL_GET_APPROVALITEMS + options.id, {method:'GET'}, { success: (res) => { let transList = res.data.transfers; - let countMoney = that.data.countMoney transList.forEach((item,index) => { item.num = UTIL.convertToChinaNum(index+1) - countMoney += parseInt(item.expenditureAmount); + + transList[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions); + transList[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions); + + transList[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions); + + transList[index].payeeList.forEach( (response,i) => { + transList[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions); + }) + + if(item.capitalExpenditureType == 2){ + let prames = { + outId:item.id, + ynType: item.transferType=='1'||item.transferType=='2'||item.transferType=='4'?'1':'2' + } + // 工程项目查询 + UTIL.httpRequest(API.URL_GET_GETPROJECTTO , prames, { + success: (res) => { + res.data.projectFundTypeText = UTIL.getTransform(res.data.projectFundType,that.data.projectFundTypeOptions); + array.transfers[index].projectForm = res.data; + } + }) + } //收据附件 UTIL.httpRequest( API.URL_GET_FINDLIST, @@ -277,7 +346,6 @@ Page({ that.setData({ form:res.data, - countMoney:countMoney }); } @@ -296,13 +364,13 @@ Page({ UTIL.showToastNoneIcon('最少保留一条事项'); return; } - let countMoney = that.data.countMoney; + let countMoney = that.data.form.approvalItemTemplate.totalAmount; console.log(that.data.form); countMoney -= parseInt(that.data.form.transfers[e.currentTarget.dataset.index].expenditureAmount); that.data.form.transfers.splice(e.currentTarget.dataset.index, 1); that.setData({ form : that.data.form, - countMoney:countMoney + ["that.data.form.approvalItemTemplate.totalAmount"]:countMoney }) UTIL.showToastNoneIcon('删除成功！'); }, diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index 09c2da7..a8be09a 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -8,7 +8,7 @@ 审批事项 支出总金额 - ￥ + ￥ 提交单位：{{form.approvalItemTemplate.submitCompany}} 提交日期：{{form.approvalItemTemplate.submitDate}} 提 交 人：{{form.approvalItemTemplate.submitter}} @@ -55,11 +55,11 @@ 关联项目 - - - - - + + + + + diff --git a/pages/index/index.wxml b/pages/index/index.wxml index e357362..a841c6e 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,8 +4,9 @@ - - + + + {{userInfoObj.nickName}} diff --git a/pages/payee/index.js b/pages/payee/index.js index 5c971a6..65279d7 100644 --- a/pages/payee/index.js +++ b/pages/payee/index.js @@ -26,6 +26,7 @@ Page({ bankType:options.bankType,//所属银行 accountType:options.accountType,//账户类型 payeeType:options.transferType,//申请转帐类型 + money:options.money,//申请转帐类型 index:options.index }) var that = this; @@ -144,6 +145,7 @@ Page({ return; } let array = that.data.list.filter(function (e) { return e.id == that.data.result; }); + array[0].incomeAmount = that.data.money; console.log(array); let pages = getCurrentPages(); let currentPage = null; //当前页面 diff --git a/pages/user/login/login.wxml b/pages/user/login/login.wxml index 0bd7c94..ed6ad61 100644 --- a/pages/user/login/login.wxml +++ b/pages/user/login/login.wxml @@ -2,13 +2,14 @@ - - 农村事项审批与记账 - 报账简单，操作便捷 + + + -