diff --git a/pages/Bookkeeping/Bookkeeping.js b/pages/Bookkeeping/Bookkeeping.js index 718f8d4..4047f5e 100644 --- a/pages/Bookkeeping/Bookkeeping.js +++ b/pages/Bookkeeping/Bookkeeping.js @@ -56,7 +56,7 @@ Page({ pageSize:'999', accountType:'', checkedStatus:that.data.checkedStatus, - incomeExpensesType:that.data.incomeExpensesType, + incomeExpensesType:'1', } UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data ,{ success: (res) => { @@ -83,7 +83,7 @@ Page({ pageSize:'999', accountType:'', checkedStatus:that.data.checkedStatus, - incomeExpensesType:that.data.incomeExpensesType, + incomeExpensesType:'2', } UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data2 ,{ success: (res) => { @@ -114,7 +114,6 @@ Page({ showGroup:e.currentTarget.dataset.gid, result:[], result2:[], - incomeExpensesType:e.currentTarget.dataset.gid == true?'1':'2', }) if(e.currentTarget.dataset.gid){ //收入事项 diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js index 6d61ba4..0bcabad 100644 --- a/pages/apply/approval/approval.js +++ b/pages/apply/approval/approval.js @@ -149,6 +149,14 @@ Page({ }, confirmTem:function(e){ + if(this.data.result.length == 0){ + wx.showToast({ + title: "请选择审批人", + duration: 2000, + icon:"error" + }) + return; + } let data={ approvalTemplate:{ name:this.data.temName, diff --git a/pages/apply/index.js b/pages/apply/index.js index 8bba406..e70e7b8 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -98,7 +98,7 @@ swichPaymentApply:function(e){ onShow: function () { var that = this; wx.showLoading({ - title: '正在加载账户列表', + title: '正在加载账户', mask:true }) UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss index e902d64..4df67ef 100644 --- a/pages/apply/index.wxss +++ b/pages/apply/index.wxss @@ -42,27 +42,27 @@ } .XJ{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_XJ.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .ICBC{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .ABC{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .CCB{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .RCB{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .gwk{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .addBtn{ display: flex; diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index d0fb266..a7c5cca 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -195,7 +195,7 @@ Page({ } }) // 获取合同信息列表 - UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, { + UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET',contractionStatus:1}, { success: (res) => { that.setData({ contractionOptions:res.rows, diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml index 31f9590..1fc673c 100644 --- a/pages/apply/paymentTemplate/add/add.wxml +++ b/pages/apply/paymentTemplate/add/add.wxml @@ -613,10 +613,6 @@ - { + setTimeout(function(){ + UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{ + success: (res) => { + for (let i = 0; i < res.rows.length; i++) { + if(res.rows[i].bankAccountNumber==null){continue;} + res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 "); + res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2); + res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions); + } + console.log(res.rows) + that.setData({ + accountList:res.rows + }) + wx.hideLoading(); + } + }) + + UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{ + success: (res) => { for (let i = 0; i < res.rows.length; i++) { if(res.rows[i].bankAccountNumber==null){continue;} - res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 "); - res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2); - res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions); + res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ") } console.log(res.rows) that.setData({ - accountList:res.rows + accountListXJ:res.rows }) - } - }) - - UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{ - success: (res) => { - for (let i = 0; i < res.rows.length; i++) { - if(res.rows[i].bankAccountNumber==null){continue;} - res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ") } - console.log(res.rows) - that.setData({ - accountListXJ:res.rows - }) - } - }) + }) + },1000) + }, delete(e){ console.log(e); diff --git a/pages/drawee/drawee.wxss b/pages/drawee/drawee.wxss index 104bf07..ff7caa9 100644 --- a/pages/drawee/drawee.wxss +++ b/pages/drawee/drawee.wxss @@ -43,28 +43,28 @@ .XJ{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_XJ.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .ICBC{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .ABC{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .CCB{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .RCB{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .gwk{ background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center; - background-size: 100% 100%; + background-size: 105% 105%; } .bankName{ diff --git a/pages/payee/add/add.wxml b/pages/payee/add/add.wxml index ddf37df..5ddc1e2 100644 --- a/pages/payee/add/add.wxml +++ b/pages/payee/add/add.wxml @@ -1,7 +1,7 @@ - 新增收款方 + 收款人