From 68cd257fa7d479750433faa8b7ea317d8220da21 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Mon, 11 Apr 2022 17:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- image/apply/ABC.png | Bin 0 -> 833 bytes image/apply/CCB.png | Bin 0 -> 706 bytes image/apply/ICBC.png | Bin 0 -> 795 bytes image/apply/RCB.png | Bin 0 -> 824 bytes pages/apply/index.js | 4 +- pages/apply/index.wxml | 31 +++++--------- pages/apply/index.wxss | 40 +++++++++++++++--- pages/apply/paymentTemplate/add/add.js | 7 ++- .../apply/paymentTemplate/paymentTemplate.js | 19 ++++++++- .../paymentTemplate/paymentTemplate.wxml | 24 ++++++----- project.private.config.json | 2 +- utils/API.js | 1 - 12 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 image/apply/ABC.png create mode 100644 image/apply/CCB.png create mode 100644 image/apply/ICBC.png create mode 100644 image/apply/RCB.png diff --git a/image/apply/ABC.png b/image/apply/ABC.png new file mode 100644 index 0000000000000000000000000000000000000000..ad9676a8a8eca7bc1a565b26176e86122439c543 GIT binary patch literal 833 zcmV-H1HSx;P) z8vlYOe?jBqB<;{a?T}>f2l%5gSg2G?A`XH>ULC4~k%V?>9pd>;?|t69q!AAsa&v!t z_dDM?=RS+}u~w@U;HBH_QT8yqt+qP+TVc<$7c9$abc3+GlL~N_=Tqze?_~hZvfuY! z&<3nPR}@15bhfw1?(3)Y$93YvG&ge2oilDk1Thob1y-On&9eA?lQQLX!f)%&U9uiN z5FCu7PYblc7tW83Qz97B_+TH>-~#Mr3U-0Aa_T6$qdJ3lAKY zu)6_cuCcpA_M;_g{@$gPt8t1B9tHTGBn*t~&tnE42+`Q&0w-QR7e@KZlN8Q9p~}<^ z`LD?U6z7!902uWcNA^RHmnhiRN6z#uS6^J#WM&aQ=xl9C(kj2|l0I{qefG& zUeNscaY~&U{x2!Cj7GH8j^u?84YaY*QlPX@^nTw#kp$K8ujD0p!vZ#;qzd1hwsO;l z&6ai%p|z_0_;K63Ov()}807F*>OW~DzbuSUIssL$Nj4?T(h# zdI3B)F{!($t)+FsW=d}a)F?A7?X@&Uigl5PXYgNxV~mbMZ6+B6mgNTriG~C)4`>xf z@WOeYO_2l#AWLd()olnGsgO%&{9ff*me`p;4lP$8_uJ`&_1a zV!uxl9wxZ3?_o$3K26!4pC%JP>7L*@xXmv5vw@w%j>jv%-^cV12G79dEyd+}00000 LNkvXXu0mjfkUD^I literal 0 HcmV?d00001 diff --git a/image/apply/CCB.png b/image/apply/CCB.png new file mode 100644 index 0000000000000000000000000000000000000000..441d7546bfe582cae11a526d6425347da94be2e0 GIT binary patch literal 706 zcmV;z0zLhSP)i?M?Ec=o z|IF@s6f=S#NN{M3Eyb2(^TVli{;jc<*(#pr?YR)1?F@nU*`H?vyx9P>$TnraAOa4d z)iA>&n2|8PV8DcHa0vYomu2nSFDkzJOp7aDDS6=xrLXqT_}$AU9ocsaT!G^lTTe(F1ansSqC>N(ZlNlPz=Dbd;@FVL9_xWJKdiS8ZzrQGv1DsOHdk|TSg zm#!txX*ja4&SXsZ1ZQ3FYzY7zxc5e9=@Qz8*mrK}xX*RH#L*dzEv@uvWWCPTCyV2Dpv18g@%hGXLuiXFg%i#`Hnk*} zg`Egpak|0KPO$Wq9#{W1BnWR5*Fhi2{3wmXxXx7O$6ZZ0m|&`)O$M^W)l_VHHJN}= o_cZ%pzM(&|gJd|o%5j(Jf2`>wx0gM}9ybi*rxS!>51N4cIevg0;KdA} zP3)KK2`s=SXotyg0!+&?z96iF=YdVoPddx-&%-ou_aS}n?xFPij|$1Xc%kyLhRx(& zvPee<`vn57fSs7WJ$*re!X{0dN`J1sznqpHJ4CaBl@u#qp_c3WUsLK?C%xgszlXmn_Eq<;>))j zg^do31euXh0)dfaKY3PHQ}Eh(;gyqwfl>X7h(go0a2-u4okKM(_Z4XR-3Q9B3|$NY zt7^VME?#%dD^=j_k*$h3SmVn~+W}zoV;us*HgM)Rc{fEUdHE(KuiVlLlz)~zLyuZ0 zapaULCce(Xv*q4ks*9iz1!aTPO7wHqcF zEoVPbP6q_ZFhgvumSz~A}1Nz2e69)%|>d)q*Th_Qm*Az=R z3CtVCY0z7k7h-FR=b1{p(A9*&1Xl$uVql4@sj2AIqyw0`*K-W+V;B9w4w7Mb#R^@f Ze*tNDjpeMb$Or%c002ovPDHLkV1iQ+Z;Wq^$-i;-DEqh&B3%qZxF;>Zt32Pu4)FC1pkej__XZAN z3v|+A_#aG17+=t&gDYSQG~s5sJp6*P14ERHf0an34Rz#eJ3*Db*WDX~eXR{HfxVcf zJ1*1m$jhS4u|dt`D-woZk1OUjaEPP5dd6btK4tqJtSg7F;|v**$L^dyW*rh<68tg( zWM&rCBH^#14S_wBoB8Gd+Mbw}^O_YTVPI7Mp&nU@eWX-Vs{^zqHX#B2Mqd*NAtlHs zW@%IKFzdeG&AJo7IFG9+JV3$HomW&c3RM-lA;(MML0Y(WQ^m@Hhol@X*5d$9a@Jlu z69wDIh0zy}HI`HPxwA55>dhG49?v)!3S$fHNW}F*#sO^FSvFH&`)SH2=V;~KC(8H) z9q8H3za~%S<_dl@#-$S_L+@w$Rq-b2r5o(|~31I(ROEfVH2{D=eAjUt5z>w%j!a-pOD}YF(-L1gUIw;{ z-0Jz{ca>6h>>yQh16fvRX$&mZG5%YRF`8hBKQ%x5LoF_?-zS>{p!Q7%_7yCZ-8`H; z!yd#9=e{uzE6b3@PMtqr6VN6 + + + {{item.bankType == 1 ? '中国银行':item.bankType == 2 ? '农商行（山东省）':item.bankType == 3 ? '农业银行':item.bankType == 4 ? '建设银行':''}} + + + {{item.bankAccountNumber}}卡号 可用余额 - 10,288.83 + {{item.balance}} - + @@ -63,7 +54,7 @@ - + {{item.templateName}}默认 diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss index a0d02b2..f61fe60 100644 --- a/pages/apply/index.wxss +++ b/pages/apply/index.wxss @@ -26,7 +26,7 @@ color: #fff; } .main{ - width: 94%; + width: 100%; margin: 0 auto; margin-top: 3vw; } @@ -37,13 +37,38 @@ .bank_content{ color: #fff; - background:linear-gradient(to right, #176AB7, #318DE5); width: 100%; - border-radius: 10px; - /* height: 100%; */ - padding: 2vh 2vh 3vh; + padding: 2vh; +} + +.ICBC{ + background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center; + background-size: 100% 100%; +} +.ABC{ + background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center; + background-size: 100% 100%; +} +.CCB{ + background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center; + background-size: 100% 100%; +} +.RCB{ + background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center; + background-size: 100% 100%; } +.bankName{ + margin-top: 0!important; +} +.bankName image{ + vertical-align: middle; + margin-right: 5px; +} +.bankName text{ + margin: 0!important; + display: inline-block; +} .bank_content view{ margin-top: 1vh; } @@ -55,6 +80,11 @@ .bank_box{ position: relative; + box-shadow: 0px 5px 9px #ccc; + overflow: hidden; + border-radius: 15px; + width: 94%; + margin: 0 auto; margin-top: 20px; } .zt { diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 89272e3..e0eaec9 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -520,8 +520,13 @@ Page({ 'Authorization':'Bearer '+getApp().globalData.userInfo.token }, formData:element, - success (res){ + success (response){ console.log(res); + if((i+1) == that.data.fileForm.length){ + wx.navigateTo({ + url: '/pages/apply/approval/approval?id='+res.data.id, + }) + } }, fail(res){ console.log(res) diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index 7273b79..5cfe14e 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -1,4 +1,6 @@ // pages/apply/paymentTemplate/paymentTemplate.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; const app = getApp(); Page({ @@ -7,7 +9,8 @@ Page({ */ data: { isIPX: app.globalData.isIPX, - show: false + show: false, + form:{} }, showPopup() { this.setData({ show: true }); @@ -31,7 +34,19 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + var that = this ; + UTIL.httpRequest(API.URL_GET_APPROVALITEMSBYID + options.id, {method:'GET'}, { + success: (res) => { + let transList = res.data.transfers; + transList.forEach(item => { + item.num = UTIL.convertToChinaNum(transList.length) + }); + res.data.transfers = transList + that.setData({ + form:res.data + }); + } + }) }, /** diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index 3fb239c..eb00c06 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -6,29 +6,29 @@ 审批事项 - + 支出总金额 ￥ - 提交单位：龙华村联合社 - 提交日期：2022年1月18日 - 提 交 人：报账员 - 联系电话：13906311234 + 提交单位：{{form.submitCompany}} + 提交日期：{{form.submitDate}} + 提 交 人：{{form.submitter}} + 联系电话：{{form.telephone}} - -事项一 + +事项{{item.num}} 支出金额 - ￥ + ￥ - + 事由： - + - + @@ -39,6 +39,8 @@ + + diff --git a/project.private.config.json b/project.private.config.json index 7fb9557..c9b84ca 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -35,7 +35,7 @@ { "name": "支出模板查看", "pathName": "pages/apply/paymentTemplate/paymentTemplate", - "query": "", + "query": "id=32", "launchMode": "default", "scene": null }, diff --git a/utils/API.js b/utils/API.js index c0191a6..4c0ba61 100644 --- a/utils/API.js +++ b/utils/API.js @@ -161,7 +161,6 @@ export { URL_POST_APPROVALITEMSEDIT, URL_POST_TEMPLATEEDIT, URL_POST_APPROVALITEMSSUBMIT, - URL_GET_SELECTACCOUNTLIST, URL_GET_MONEYORDERLIST, URL_GET_PAYEESELECTLIST, URL_GET_DEPOSITLIST,