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 0000000..544ab6c Binary files /dev/null and b/image/apply/icon_close.png differ diff --git a/image/apply/update.png b/image/apply/update.png new file mode 100644 index 0000000..e32f1f9 Binary files /dev/null and b/image/apply/update.png differ diff --git a/image/login/login_text.png b/image/login/login_text.png new file mode 100644 index 0000000..86d3ead Binary files /dev/null and b/image/login/login_text.png differ 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 @@ - - 农村事项审批与记账 - 报账简单，操作便捷 + + + -