From 6c1ed9ed84ae538fa0598c8e2d2e35dca63555c5 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Mon, 30 May 2022 09:11:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/payee/add/add.js | 68 +++++++++++++++++++++++++++++-------- pages/payee/list/list.js | 6 ++++ pages/payee/list/list.wxml | 14 ++++---- project.private.config.json | 2 +- utils/API.js | 6 +++- 5 files changed, 73 insertions(+), 23 deletions(-) diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js index d2478ba..a094c92 100644 --- a/pages/payee/add/add.js +++ b/pages/payee/add/add.js @@ -33,20 +33,10 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { + var that = this ; + that.setData({ + projectId:options.id + }) var that = this; // 所属银行字典查询 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { @@ -73,6 +63,44 @@ Page({ }) } }) + if(options.id){ + UTIL.httpRequest(API.URL_GET_PAYEEGET + options.id, {method:'GET'}, { + success: (res) => { + UTIL.httpRequest(API.URL_GET_DEPOSITLIST, {method:'GET',bankType:res.data.bankType,status:'0'}, { + success: (res2) => { + that.setData({ + depositOptions:res2.rows, + }) + console.log(res.data.bankType) + console.log(res2.rows) + if(res.data.bankType!="999"){ + res.data.bankDepositText = res2.rows.filter(function (e) { return e.id == res.data.bankDeposit; })[0].bankDeposit; + } + res.data.payeeTypeText = UTIL.getTransform(res.data.payeeType,that.data.payeeTypeOptions); + res.data.bankTypeText = UTIL.getTransform(res.data.bankType,that.data.bankTypeOptions); + that.setData({ + form:res.data, + }) + } + }) + + } + }) + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + }, back:function(){ @@ -176,7 +204,17 @@ Page({ that.setData({ ['form.method']:'POST' }) - UTIL.httpRequest(API.URL_GET_PAYEEADD, that.data.form, { + + let url = ''; + + if(this.data.projectId){ + url = API.URL_GET_PAYEEEDIT; + console.log("修改"); + }else{ + url = API.URL_GET_PAYEEADD; + console.log("新增"); + } + UTIL.httpRequest(url, that.data.form, { success: (res) => { if (res.code == API.SUCCESS_CODE) { wx.showToast({ diff --git a/pages/payee/list/list.js b/pages/payee/list/list.js index eb3210b..9fb575c 100644 --- a/pages/payee/list/list.js +++ b/pages/payee/list/list.js @@ -157,6 +157,12 @@ Page({ }, + goEdit(e){ + wx.navigateTo({ + url: '/pages/payee/add/add?id='+e.currentTarget.dataset.id, + }) + }, + /** * 生命周期函数--监听页面显示 */ diff --git a/pages/payee/list/list.wxml b/pages/payee/list/list.wxml index 8ff344f..cdd8b72 100644 --- a/pages/payee/list/list.wxml +++ b/pages/payee/list/list.wxml @@ -15,14 +15,11 @@ /> 新增 - + + @@ -39,7 +36,12 @@ {{item.payeeAccountText}}    {{item.bankTypeText}} - + + + + + + diff --git a/project.private.config.json b/project.private.config.json index 4967bf6..95c2f7d 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,6 +1,6 @@ { "setting": { - "compileHotReLoad": true + "compileHotReLoad": false }, "condition": { "miniprogram": { diff --git a/utils/API.js b/utils/API.js index a059007..c57b187 100644 --- a/utils/API.js +++ b/utils/API.js @@ -274,6 +274,9 @@ const URL_GET_PASSWORDEDIT = `${URL_PREFIX}/cashier/account/editPassWord`; //收款人修改 const URL_GET_PAYEEEDIT = `${URL_PREFIX}/yinnong/payee/edit`; +//收款人查询 +const URL_GET_PAYEEGET = `${URL_PREFIX}/yinnong/payee/get/`; + /****************接口地址end****************/ @@ -380,5 +383,6 @@ export { URL_GET_PROJECTADD, URL_GET_PROJECTDELETE, URL_GET_PASSWORDEDIT, - URL_GET_PAYEEEDIT + URL_GET_PAYEEEDIT, + URL_GET_PAYEEGET } \ No newline at end of file From 54f1ce2a3287c887894e07f777e7148c784f0a89 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Mon, 30 May 2022 10:13:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/paymentTemplate/add/add.js | 3 +- pages/payee/list/list.js | 53 +++++++++++++++++--------- pages/payee/list/list.json | 3 +- pages/payee/list/list.wxml | 2 +- pages/payee/list/list.wxss | 9 +++++ utils/API.js | 6 ++- 6 files changed, 54 insertions(+), 22 deletions(-) diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 48fcd1f..27675a3 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -754,13 +754,12 @@ Page({ // 所属银行字典查询 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { success: (res) => { - let array = res.data.filter(function (e) { return e.dictValue == event.detail.value.bankType; }); this.setData({ [event.currentTarget.dataset.name]: false, [event.currentTarget.dataset.value+'.payer']: event.detail.value.accountName, [event.currentTarget.dataset.value+'.cashierId']: event.detail.value.id, [event.currentTarget.dataset.value+'.payerAccount']: event.detail.value.bankAccountNumber, - [event.currentTarget.dataset.value+'.bankTypeText']: array[0].dictLabel, + [event.currentTarget.dataset.value+'.bankTypeText']: UTIL.getTransform(event.detail.value.bankType,that.data.bankTypeOptions), [event.currentTarget.dataset.value+'.bankType']: event.detail.value.bankType, [event.currentTarget.dataset.value+'.payerAccount']:event.detail.value.balance, }); diff --git a/pages/payee/list/list.js b/pages/payee/list/list.js index 9fb575c..f9cad8d 100644 --- a/pages/payee/list/list.js +++ b/pages/payee/list/list.js @@ -40,27 +40,29 @@ Page({ } console.log(prames); UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { - success: (res) => { + success: (res2) => { that.setData({ - bankTypeOptions:res.data, + bankTypeOptions:res2.data, }) - } - }) - UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, { - success: (res) => { - let array = res.rows ; - var payeeType = that.data.payeeType; - var list = []; - array.map(res=>{ - res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2"); - res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel; - list.push(res) - }) - that.setData({ - list:list, + UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, { + success: (res) => { + let array = res.rows ; + var list = []; + res.rows.map(res3=>{ + res3.payeeAccountText = res3.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2"); + res3.bankTypeText = UTIL.getTransform(res3.bankType,that.data.bankTypeOptions); + + list.push(res3) + }) + console.log(list); + that.setData({ + list:list, + }) + } }) } }) + }, goAdd(){ wx.navigateTo({ @@ -156,7 +158,24 @@ Page({ onReady() { }, - + delete(e){ + var that = this; + UTIL.httpRequest(API.URL_GET_PAYEEREMOVE + e.currentTarget.dataset.id, {method:'GET'},{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + that.data.list.splice(e.currentTarget.dataset.index, 1); + wx.showToast({ + title: '删除成功！', + icon: 'success', + duration: 2000 + }) + that.setData({ + list : that.data.list, + }) + } + } + }) + }, goEdit(e){ wx.navigateTo({ url: '/pages/payee/add/add?id='+e.currentTarget.dataset.id, diff --git a/pages/payee/list/list.json b/pages/payee/list/list.json index fc8dd62..ed1ce25 100644 --- a/pages/payee/list/list.json +++ b/pages/payee/list/list.json @@ -6,6 +6,7 @@ "van-cell-group": "@vant/weapp/cell-group/index", "van-search": "@vant/weapp/search/index", "van-radio": "@vant/weapp/radio/index", - "van-radio-group": "@vant/weapp/radio-group/index" + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "van-radio-group": "@vant/weapp/radio-group/index" } } \ No newline at end of file diff --git a/pages/payee/list/list.wxml b/pages/payee/list/list.wxml index cdd8b72..81bdbc2 100644 --- a/pages/payee/list/list.wxml +++ b/pages/payee/list/list.wxml @@ -38,7 +38,7 @@ - + diff --git a/pages/payee/list/list.wxss b/pages/payee/list/list.wxss index 5746d72..d69529d 100644 --- a/pages/payee/list/list.wxss +++ b/pages/payee/list/list.wxss @@ -63,4 +63,13 @@ van-search { .van-radio-group{ padding-bottom: 100px; +} + +.deleteBox{ + width: 65px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; } \ No newline at end of file diff --git a/utils/API.js b/utils/API.js index c57b187..6d04ff7 100644 --- a/utils/API.js +++ b/utils/API.js @@ -277,6 +277,9 @@ const URL_GET_PAYEEEDIT = `${URL_PREFIX}/yinnong/payee/edit`; //收款人查询 const URL_GET_PAYEEGET = `${URL_PREFIX}/yinnong/payee/get/`; +//收款人删除 +const URL_GET_PAYEEREMOVE = `${URL_PREFIX}/yinnong/payee/remove/`; + /****************接口地址end****************/ @@ -384,5 +387,6 @@ export { URL_GET_PROJECTDELETE, URL_GET_PASSWORDEDIT, URL_GET_PAYEEEDIT, - URL_GET_PAYEEGET + URL_GET_PAYEEGET, + URL_GET_PAYEEREMOVE } \ No newline at end of file