uZ#PA9(MKm&ijQQn1`SW!S literal 0 HcmV?d00001 diff --git a/image/index/nav_dlzh.png b/image/index/nav_dlzh.png deleted file mode 100644 index ab6b29d73ad9e339038befba5386f0fdc0f281f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vvDP) >lXf00004b3#c}2nYxW zd =(KT>TQ z=!&T?qS;WI7JSI|p`lixTcHmoK{t@3keZ*is87Mvhhh|LKr7u{H5(LZo2c1_Y_c=E zb3A9vtkY%x(gYFl!ouFUXU_fZcfNbhy~7<&C$N901^j-VZYut-1A??%;{a2eO%8Bg zhcrA-esg04;8Y+G@N6~^hr{7voOk~ZL}&KD%ShXJS0hu|5yn{^W8BIZEHYqIz}du5 z^VtCyY0YQh_*NNssbmsL;=s#*sgcGH{VxZ9laFp#Bd&3`H3pV(bc6s>w?||0mmN#D z-?KqnPPS+p3LgCC*T_M7?(f?3G%IE^{J^D^WV^rfNQzxUAQX^3=ZshDF9NVI=P(1n zt0ktEmgC$-s>&>&{?xj>@OBx4W#c49Am1O~yB`=RW?+7P^wO-+E+de`V_iN3afDs~ zfH^J*uEC}=TCRZ)o)jnZ_jG Es$5nPuk4@ z8fs!e6ry%tlXp>fB= c`vqBnsPQKUiguIeiZ89T9kfzAeHU8FT z_vl$#Acsf0+??}sWTXOrb-3k>FA<t=r-jUaR-7T1xAG6!SW$zdau9Z&_KqqK{<) zg4sMQwvT*~5lGwE2`?IG&Q-3~3^% *x>UI9E2*f5{y!3vFCJL^Ljy%E8zYo!#P*LT z(*vOd2AuK-wW-18clOaA=xupCE|_*28R;!7>xppFE_${*7CBwNx-^|D5VAA3k6g{T zeNiW*i@h2EU_RVAoqhAaJciqNt3J_C!9(ryg1DdhCQ$Fbxjf%)1euKy?Y&jydPX3J z#*bGEAl%R$qsl`yO5~GDWkrc_v+a(_TpwfnVSPM#>*f-goERaaL!&2MoPn2fR!aRX zafOxR&)5WD%R6GL{VzqsllKi^CmSPKHDYu~$qi}uP?pV8 CRIUhSniRW|M2ndKt-@M^XVvXeBALX0pwg;xV)GY?(Ea za~jiYO*Xp?*P3h-Q1y+OcGeqH{dzQ#bM;LJ#BR4+B}r =;9H^VsfZ z%vOG5-6u31NJT|O9j=-H+*f0090ARMs&)o@YNl7_<+6OyT!KlilvvudGpoI-$}R$Y zge$L0>=?WeV#)L|Jgw D&MuXHvI4=FhVeUw z=Lf%^4$Pa{NF%y_G6Jb|I=xCX>d8e14~kIRg_7hA1_G{hKK=w6386{EZduX*0000< KMNUMnLSTYcgpwNo diff --git a/image/index/nav_jymx.png b/image/index/nav_jymx.png deleted file mode 100644 index cae1d0dd08f924cd79b74db75ebd79d73a96d556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmV-p1DyPcP) E$qN_7Igx9?~KNIarw4IN6wh z6cY;*0|Tg71B0J`{&9c!{#y~mwvZPNKJoDFI&3aSE(fWai~r9wX8p~mq|L;{D2vVF znst|SI=0 S^M@|C2oV{%~=dGBPl6;Yv5?4r~e1 zyYipm-#3 Sm{=qT exo2m}{KQ&b1FFT_tA;*E_@i`Fe$e;gDGiI-T zf!BdC>&lD%|NozX(?TZ3rlo $LDe2>%9_1+ zLr_agtB8@25qCL=<^xt{CRSEvMmBVh=}U6%oDn3yo)iZ%|6{z#n6~m3UI*&v=-@90 zi40;bagH_1B9#^q>p*5;A KL|kbQRQ7RYZ+r|hizW_))hrBLyau@HW^@O( z2k9MU`1bh%a$AsK6cd@m@GAR1D_rdl(?2Ej_93zZ{q!YcH(h)VZ*(9VNV5<`clG~O zp_~k_fh`?YCO(jyW$PXtU_WFnR2@;BCaU&HhzNZLpc;}!78U?CfH1uPs9`aIln|ts t!?4*yR1^ |XNQcNgTW1t`p;UXvUvMuEi1HKA{7~V)FVgv%M7L*cbuCMFsZpZnSow~i= z?p@nI`E#=~|NQ&S_s`7#?-8ME63xtKFnvRrhG%FwQ>UVb*zaMb-8JuC)+E5$Z!^1G z1xSEX1b{4HS{CR8Z##eBz|eXxP_^tCFRoOafia8Hj%UAdUM~T-#R|J!!l?&tC-ao1 z^7b`rI|5(=K(Qz=Jy^8>0L1)TPg@KfyFc@p4jm5g6#IU~wCm_E9DR@R~rK_yTuX z1q^KA1w9cg77Ke;aRLSb*spklQ-?C0&35?p5P-o4u>+#Eovq&PYW2JV^I`qW^KNXN zR!mZgn)Ift!GR%wgY=j&`sEl?D~TR18pI)Rc;&X!JURbFp0laVY7$A~xmAg_X9o3g z8mVxN%rC0&1yT(T2GLBh$KnGZMAL+Rk<`x}EXEMQ5UMsR`L!w{b=%njw?xguBYT(r zv344+8bKuVz7Qsqdo#(w xW_=Bz~u8mAra$Ro9?L{#jZO( z=k(3{bI@0~aDr{-=qP!d3bf7G!T`QkbeG$6aGbRsg%gZ f#fdQ2pqf5|%sE^=_Wtbvf? z=I1xP+CHE*-JU$c!#4j9A>r1-;J$etVlbN|>0VC#ovbL2yHV|=;O86GCHpVS`)&99 z7c$-)|5$q{(I>Xh3kWZmD`Se3)1#2O?J2KUiAHm7_&_^=86?^`yQL=k<)%8HCowpq zXdgnG{$ljH9qHrFsKHZ7dSJ>ZKCK3an;R^4S?I=B!z;u3PFok&f33@4l&_BX*4njc z4K?SqoDE!jIIp_CWn{|OsP%gnOh86z7wkQgt>}Azqe`#On>+2`B8www1CqO@xHiv- zS`{&5XSEnK1x6!UUG}97)kpN^aB#1U8nE?n=A>iZwxZ`|2XF~Wh}-P|tc?bp5GX0% zlbnx?;Zrh;m+Y!B7~jHRq^GqszxIy2pY+7K?7Nj!HLmfa2U`xEUp4isPT-o` P&u=NOYYw{I;*n%0mHanSTQat;L2DV2ci== zFz2R0tac;3Mk_OtmLwkL)PqZ74AdZBL%1?l)c=$1eKNIx`UR(i6@?>8Z mXh-@QKlD;?j6Nfsd`UCm&%A;A=s~e_RLQEC+ zHzjq*9+)e->Q9o)V|AP 5hZesWPE!a;~ZQXYx7!8mpx1ZKtiPWJu^SWymq05vqIc;LL3XX zNo#eSHKTzvp3h0NjT&TWPi-Pgp~O~riqBQ=F|dYHS;-UyfbPYs^>Vs-)}!uT0;}aZ z1N^Au%E(WS{+Wll6Nf&s@6?LP`?wzf6I}J>2&XS_@vM`l5dhT t4gB8$aRzmdn&{zVv!gGu>JQ>d)`w?& z0O@^WAlrZ~0O7^!U#yMn)1_|{J#bhERu9&AnEB!W6biu$`M(4BRaets3k!mFd29Fs z$HCyGxNNa{{?`H@^Y!~1>qPjv1&TWi6r38sF!nG>=|H -{<$6`OVBhplKZ={s{o!A?;Yc`h(t^kj8d~Xwv{9ghH5nfF?py8VC-n zE40oGqRBz;Eo{u%)-mkw0T5m#RxJf=AMM(jE9x?ECPtfj5@def06RvyQLcb^;`PBF zAMXIW-F2a;;!=d=&k$P=7QWT+5Jf>U8H49u# _58{6bNP>}NG|&42 zK{`OnB00FSypI8h)h?GOmHJ6jB>Me|fSlkupN&%i(i920zn_y>&ru^SO_5~mMQP?0 z0eqtl7JEwTID0{nm=u;4XCgrwFjd2`&{pi=-G+0vI7@-cQKD! {1Lin3-?u9C~30=t5(b0TM^){?;Zd0dWAMmI9{wyayP@ zRz?eHltEcehk4(KbxTa3(A{G$$>F5_Ph$kgCgPLi8D?n)70AA}T@r(;XtJ0MP^n(u z)33ya<$wxge`~!2fbp4#b*lm5YbXjkhu*3I<_8epDk7}FPcGyAs0Sqbjzgg!c_ic& zP&J;oce0!-;P*fPxz(0j1?+09>b~7v`$&CaX|;LDp#FRWOH8>4L^os@7X*w$*#>_f z17oCL;x1_X9Ti@$7DV0w*C-bCnmvMb6Pq4z07pQ+8`;#XQDtx=!Sud1H{id_+?u}s Y0GF4%6$JB!X#fBK07*qoM6N<$f<}d&Y5)KL diff --git a/image/index/nav_sztj.png b/image/index/nav_sztj.png deleted file mode 100644 index e8310d6792443c0d8050bf586eee0f53acaece48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 840 zcmV-O1GoH%P) ka7CsZuZ#8Gb>%=wrZ zIMo;!8TtP)Fmj z!Q}h4-zuyeM|6LVsJ@gnRMm0yhZE&(;WMmK~#X-nwS$;4c z<7?mh79>U$N0Aa`xE#&I@c-MLr=Jd)%sTs 8I>q?5KRBQryqAv?kHednxvwceV2 McPIS{xC5MVRO{K zKYw3P 9uRYomG3G#m5 zL$RYiRXPjzXsJ)8hNJ%fXLu{zu#fVP0;Q|M6?s!%vvFoo5`CbGS%~lFK~Rf<;*bJ4 zDsF8_(?3S$T8bR?>(2#POMxnmidkFM0Bq3Jv;6z}uJ7tOl8XdT*(BI--~v^fE-*&{ z4Shc0{0V<17G?>2WfiQPlK=X7Y5v`7C1MQ+ULdQdYDj?`wIrxh>Q#e-1REoxHnyfP z$a0vY{{Q{gvNW{27Tp6haTLrFc&C9K()j!R`}cPS)}J5q^z5%QGB8R3#|xU426fic z)ls;jFnV3t(;@AsMxf7D6R1o>f%356h7WMS6Z(IK*MI*rI1;LmnVJ6Y1GdD)h>1Qz zW?_qZuozPABgu>*=O}BEyoXSH6vm9$P$bLzmsyTfbN({_eY7H=58mH{=?4I-oatAa Sm-7Yy0000 diff --git a/image/index/nav_zzdz.png b/image/index/nav_zzdz.png deleted file mode 100644 index f8119169ee8fd42124dc8571156f18708a988448..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 962 zcmV;z13mnSP) |&9J zOgt%}h#u6?pgbrfl5Q&Ip^^kwqA&?M=phd#mPE43?wYH%JM;D4$ga~kyE`+@3V{Q2 zm^bfx-*5ik``-KJ0U-qGebASSIxNuY6#h3z_H|QQzs_L43Tk(X-iDQIq{a;fooh8? zBAh#f)GAk$euqj*;*^cv&*PD#2td38j<(Ms#ma{3Dh7&M`ZOplDQQdKXI9&bE+?fC zFI;hM#j=wxK`|4je595-0Xp%~)nC*aUgye39-xSDBN8Y+EzSvYd}?ORSohD3o!pbj ziE}IMm+BcD5)4>Cbdyd00^EJ&Qv)^)k`1l|#YY$IL0fVjb&|r~XVi=}D Q zYH&dbYAU206njdt1b|$*!&s2J$`Y@|j 6La_C*_uIQSN9|e6p&ZZ% zB#Ppiwd%!tQz6rWzq{IeD-%jZj4H|2P-~_0wW*L9!gf!S_s6(dkW!}G@oh{ RN*KgQ`Ok#KzvW z#R=fJR5egNi@B6EY(CP;C}!e>oGC)TuT }v GB+JThW|~2yGDaS4J5F!Ir)qKHQXN(| kBn!boU+jqHo>r%S0AbO#F?{d6B>(^b07*qoM6N<$f+S704gdfE diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml index 6a16545..b324045 100644 --- a/pages/apply/approval/approval.wxml +++ b/pages/apply/approval/approval.wxml @@ -111,9 +111,6 @@ - - - diff --git a/pages/apply/paymentTemplate/add/upLoad/upLoad.wxml b/pages/apply/paymentTemplate/add/upLoad/upLoad.wxml index 9ba3ca2..0bea633 100644 --- a/pages/apply/paymentTemplate/add/upLoad/upLoad.wxml +++ b/pages/apply/paymentTemplate/add/upLoad/upLoad.wxml @@ -85,12 +85,16 @@ 三、农业银行 1、导入收款方的所属银行需要根据页面选择的是否同行相匹配。 2、联行号为必填项。 -四、建设银行 -1、导入收款方的所属银行需要根据页面选择的是否同行相匹配。 -2、单笔跨行、批量跨行转账时联行号为必填项。 -五、农商行(重庆) +四、农商行(重庆) 1、导入收款方最多可以有500条。 2、联行号为必填项。 +五、其他银行 +1、联行号为必填项。 + + +diff --git a/pages/apply/paymentTemplate/addNew/addNew.js b/pages/apply/paymentTemplate/addNew/addNew.js index 88c244f..344aa61 100644 --- a/pages/apply/paymentTemplate/addNew/addNew.js +++ b/pages/apply/paymentTemplate/addNew/addNew.js @@ -164,6 +164,7 @@ Page({ SJimage:[], FPimage:[], QTimage:[], + SYLGKimage:[], activeName:0, showTitle:true, collapseDis:false, @@ -250,6 +251,7 @@ Page({ SJimage: [], FPimage: [], QTimage: [], + SYLGKimage: [], imgcount:0, activeNames: 0, applyDate:'', @@ -343,7 +345,6 @@ Page({ ["form.approvalTemplateId"]:res.rows[0].id, ["form.approvalTemplateName"]:res.rows[0].name, }) - // 审批模板 UTIL.httpRequest(API.URL_GET_selectApprovalByTemplateId+res.rows[0].id , {method:'GET'}, { success: (rres) => { @@ -525,6 +526,39 @@ Page({ }) } }) + //四议两公开 + UTIL.httpRequest( + API.URL_GET_FINDLIST, + { + method:'GET', + tableName:'t_yinnong_transfer', + tableId:res.data.id, + fileType:4 + }, + { + success: (res) => { + let list = []; + res.data.forEach((item2,index2)=>{ + let fileForm = res.data.fileForm?res.data.fileForm:[]; + fileForm.push({ + file: wx.getStorageSync('dressCode')+item2.fileUrl, + fileType:'4', + bizPath:'transfer', + tableName:'t_yinnong_transfer', + tableId:res.data.id + }) + list.push({ + tempFilePath:wx.getStorageSync('dressCode')+item2.fileUrl, + id:item2.id + }) + that.setData({ + ["form.fileNum"]:that.data.form.fileNum+1, + ["form.SYLGKimage"]:list, + ["form.fileForm"]:fileForm + }); + }) + } + }) let query = { method:'GET', @@ -1406,6 +1440,12 @@ Page({ showFile:true }) // console.log(that.data.form) + }else{ + wx.showToast({ + title: res.msg, + icon: 'error', + duration: 2000 + }) } } }) @@ -1563,7 +1603,7 @@ Page({ goCustomSubmit(){ var that = this; - UTIL.httpRequest(API.URL_GET_TRANSFERCUSTOMSUBMIT+this.data.form.id, {method : 'POST'}, { + UTIL.httpRequest(API.URL_GET_TRANSFERCUSTOMSUBMIT2+this.data.form.id, {method : 'POST'}, { success: (res) => { if (res.code == API.SUCCESS_CODE) { wx.showToast({ @@ -1576,6 +1616,12 @@ Page({ },2000) } }) + }else{ + wx.showToast({ + title: res.msg, + icon: 'error', + duration: 2000 + }) } } }) @@ -1588,7 +1634,7 @@ Page({ }) that.goKeepNew(); setTimeout(() => { - UTIL.httpRequest(API.URL_GET_TRANSFERCUSTOMSUBMIT+this.data.form.id, {method : 'POST'}, { + UTIL.httpRequest(API.URL_GET_TRANSFERCUSTOMSUBMIT2+this.data.form.id, {method : 'POST'}, { success: (res) => { if (res.code == API.SUCCESS_CODE) { wx.hideLoading(); @@ -1602,6 +1648,12 @@ Page({ },2000) } }) + }else{ + wx.showToast({ + title: res.msg, + icon: 'error', + duration: 2000 + }) } } }) @@ -1667,7 +1719,8 @@ Page({ let SJlength = that.data.form.SJimage == undefined ? 0:that.data.form.SJimage.length; let FPlength = that.data.form.FPimage == undefined ? 0:that.data.form.FPimage.length; let QTlength = that.data.form.QTimage == undefined ? 0:that.data.form.QTimage.length; - let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ; + let SYLGKlength = that.data.form.SYLGKimage == undefined ? 0:that.data.form.SYLGKimage.length; + let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) + parseInt( SYLGKlength ) ; that.setData({ ["form.fileNum"]:fileNum, }) @@ -1737,7 +1790,8 @@ Page({ let SJlength = that.data.form.SJimage == undefined ? 0:that.data.form.SJimage.length; let FPlength = that.data.form.FPimage == undefined ? 0:that.data.form.FPimage.length; let QTlength = that.data.form.QTimage == undefined ? 0:that.data.form.QTimage.length; - let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ; + let SYLGKlength = that.data.form.SYLGKimage == undefined ? 0:that.data.form.SYLGKimage.length; + let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) + parseInt( SYLGKlength ) ; that.setData({ ["form.fileNum"]:fileNum, }) @@ -1804,7 +1858,76 @@ Page({ let SJlength = that.data.form.SJimage == undefined ? 0:that.data.form.SJimage.length; let FPlength = that.data.form.FPimage == undefined ? 0:that.data.form.FPimage.length; let QTlength = that.data.form.QTimage == undefined ? 0:that.data.form.QTimage.length; - let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) ; + let SYLGKlength = that.data.form.SYLGKimage == undefined ? 0:that.data.form.SYLGKimage.length; + let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) + parseInt( SYLGKlength ) ; + that.setData({ + ["form.fileNum"]:fileNum, + }) + + const element = fileForm[0]; + wx.uploadFile({ + url: wx.getStorageSync('dressCode')+API.URL_GET_UPLOAD, + filePath: res.tempFiles[0].tempFilePath, + name: 'file', + header: { + "Content-Type": "multipart/form-data",//记得设置 + "chartset":"utf-8", + 'Authorization':'Bearer '+getApp().globalData.userInfo.token + }, + formData:element, + success (response){ + wx.showToast({ + title: '上传成功', + icon: 'success', + duration: 2000, + }) + }, + fail(res){ + console.log(res) + } + }) + + },fail(err){ + console.log(err); + } + }) + }, + SYLGKtakephoto(e){ + var that = this; + let fileForm = []; + wx.chooseMedia({ + mediaType: ['image'], + sourceType: ['album', 'camera'], + camera: 'back', + count: 1, + success(res) { + console.log(res); + res.tempFiles.forEach(item => { + fileForm.push({ + file: item.tempFilePath, + fileType:'4', + bizPath:'transfer', + tableName:'t_yinnong_transfer', + tableId:that.data.form.id + }) + }) + console.log(fileForm); + let tem = that.data.form.SYLGKimage?that.data.form.SYLGKimage:[]; + + res.tempFiles.forEach(r=>{ + tem.push({ + tempFilePath:r.tempFilePath + }) + }) + that.setData({ + ["form.SYLGKimage"]:tem, + ["form.fileForm"]:fileForm + }) + let SJlength = that.data.form.SJimage == undefined ? 0:that.data.form.SJimage.length; + let FPlength = that.data.form.FPimage == undefined ? 0:that.data.form.FPimage.length; + let QTlength = that.data.form.QTimage == undefined ? 0:that.data.form.QTimage.length; + let SYLGKlength = that.data.form.SYLGKimage == undefined ? 0:that.data.form.SYLGKimage.length; + let fileNum = parseInt( SJlength ) + parseInt( FPlength ) + parseInt( QTlength ) + parseInt( SYLGKlength ) ; that.setData({ ["form.fileNum"]:fileNum, }) @@ -2114,6 +2237,12 @@ Page({ } }) + }else{ + wx.showToast({ + title: res.msg, + icon: 'error', + duration: 2000 + }) } } }) @@ -2312,6 +2441,15 @@ Page({ ["form.payeeList"]:this.data.form.payeeList, }) }, + removePayer(e){ + console.log(e); + let i = e.currentTarget.dataset.index; + let list = this.data.form.payeeList; + list.splice(i,1); + this.setData({ + ["form.payeeList"]:list, + }) + }, onChangePayeeMoney(event){ console.log(event); this.setData({ diff --git a/pages/apply/paymentTemplate/addNew/addNew.wxml b/pages/apply/paymentTemplate/addNew/addNew.wxml index 82777e6..0b74472 100644 --- a/pages/apply/paymentTemplate/addNew/addNew.wxml +++ b/pages/apply/paymentTemplate/addNew/addNew.wxml @@ -257,7 +257,7 @@ + -+ ++ + ++ + 收款方 选择 @@ -316,11 +319,11 @@ -+ - +- 上传附件 总数 {{form.fileNum?form.fileNum:0}}张 + diff --git a/pages/apply/paymentTemplate/addNew/addNew.wxss b/pages/apply/paymentTemplate/addNew/addNew.wxss index 7b80138..2e4eed8 100644 --- a/pages/apply/paymentTemplate/addNew/addNew.wxss +++ b/pages/apply/paymentTemplate/addNew/addNew.wxss @@ -54,6 +54,7 @@ text{display: block;} margin: 0 auto; border-radius: 10px; box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); + position: relative; } .main-box block{ float: right; diff --git a/pages/contract/list/list.js b/pages/contract/list/list.js index 7760ad4..edebc55 100644 --- a/pages/contract/list/list.js +++ b/pages/contract/list/list.js @@ -251,7 +251,7 @@ Page({ upload(e){ this.setData({itemId:e.currentTarget.dataset.id}); this.asyncFun(e.currentTarget.dataset.id) - this.setData({"fileList":[]}) + this.setData({fileList:[]}) }, asyncFun(id){ let uploadList = this.data.uploadOptions @@ -260,7 +260,7 @@ Page({ uploadList.map( res => { let oData = { tableId: id, - tableName: "t_contraction_info", //上传表 + tableName: "t_contraction_fill", //上传表 bizPath: "contraction", fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字 method:'GET' @@ -367,7 +367,7 @@ Page({ let fileForm={ file: event.detail, fileType:event.currentTarget.dataset.idx, - tableName: "t_contraction_info", //上传表 + tableName: "t_contraction_fill", //上传表 bizPath: "contraction", //上传目录 tableId:_this.data.itemId } diff --git a/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.js b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.js new file mode 100644 index 0000000..88fa88f --- /dev/null +++ b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.js @@ -0,0 +1,166 @@ +// pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + expressionOptions:[], + // 格数据 + loading: false, + finished: false, + pageDataList: [], + searchDate: { + bookDate: "", + templateName: '收支公开榜', + signature: false, // 添加底部落款 + }, + // 查询参数 + queryParams: { + // 分页 + pageNum: 1, + pageSize: 50, + startYyyy_MM: null, + endYyyy_MM: null, + title: '收支公开榜', + combineTitle: false, + // 查询排序 + //orderByColumn: "id", + //isAsc: "desc", + }, + + list: [], + accountingYear: "", + accountingMonth: "", + // 显示搜索条件 + visible: false, + showPickerTime: false, + + minDate: new Date(2020, 0, 1), + maxDate: new Date().getTime(), + currentDate: new Date(), + date:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + UTIL.httpRequest(API.getLoginBook,{}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + let currentDays = res.data.currentDay; + if (currentDays == null) { + UTIL.showToastNoneIcon("当前账套未开启!"); + return false; + } + + let mindate = res.data.startDay.split('-') + let dealDays = currentDays.split("-"); + this.setData({ + accountingYear:dealDays[0], + accountingMonth:dealDays[1], + date: dealDays[0]+'年'+dealDays[1]+'月', + ['searchDate.bookDate']:currentDays, + ['queryParams.startYyyy_MM']:res.data.currentDay, + ['queryParams.endYyyy_MM']:res.data.currentDay, + minDate: new Date(mindate[0],mindate[1]-1).getTime(), + ['queryParams.deptId']:JSON.parse(wx.getStorageSync('user')).loginDeptId, + ['queryParams.bookType']:JSON.parse(wx.getStorageSync('user')).bookType, + ['queryParams.bookId']:JSON.parse(wx.getStorageSync('user')).loginBookId, + bookName:JSON.parse(wx.getStorageSync('user')).bookName, + }) + this.initPage() + } + } + }) + }, + initPage() { + var that = this; + UTIL.httpRequest(API.financialIncomeExpenditurePublic,this.data.queryParams, { + success: (res) => { + this.setData({ + pageDataList:res.rows, + total:res.total + }) + } + }); + }, + onConfirm(time) { + console.log(time.detail); + let date = UTIL.formatDates(time.detail).split('-'); + this.setData({ + date:date[0] + '年' + date[1] + '月', + ['queryParams.startDate']:UTIL.formatDates(time.detail), + showPickerTime : false + }) + this.getList(); + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + openPick(){ + this.setData({ + showPickerTime:true + }) + }, + closePick(){ + this.setData({ + showPickerTime:false + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.json b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.json new file mode 100644 index 0000000..5e24167 --- /dev/null +++ b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-datetime-picker": "@vant/weapp/datetime-picker/index" + } +} \ No newline at end of file diff --git a/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxml b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxml new file mode 100644 index 0000000..8ed27be --- /dev/null +++ b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxml @@ -0,0 +1,68 @@ + ++ @@ -365,6 +368,20 @@ + + +四议两公开 可拍照 ++ ++ ++ + + ++ + + ++ 公开表 ++ \ No newline at end of file diff --git a/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxss b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxss new file mode 100644 index 0000000..d219242 --- /dev/null +++ b/pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxss @@ -0,0 +1,221 @@ +/* pages/finance/detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic.wxss */ +@charset "UTF-8"; +.balance-main { + background: #fff; +} +.balance-main .main-title { + margin-bottom: 5PX; + padding: 0 10PX; + height: 33PX; + line-height: 33PX; + color: #333; + font-size: 13PX; + display: flex; + justify-content: space-between; +} +.balance-main .main-title .nper { + text-align: center; +} +.balance-main .main-title .amountOf { + text-align: right; +} +.balance-main .main-center { + border: 1PX solid #CACBCC; + border-bottom: 0; + overflow-x: scroll; +} +.balance-main .main-center .datagrid { + min-height: 100PX; + width: 250%; + /* 确保收入和支出部分的宽度相同 */ +} +.balance-main .main-center .datagrid .header { + background: #f8f8f9; + font-weight: bold; + display: flex; +} +.balance-main .main-center .datagrid .header-title { + font-weight: bold; + text-align: center; + margin-bottom: 5px; /* 根据需要调整间距 */ +} +.balance-main .main-center .datagrid .header-title.income, .balance-main .main-center .datagrid .header.income { + width: 50%; + border-bottom: 1PX solid #CACBCC; +} +.balance-main .main-center .datagrid .header-title.expenditure, .balance-main .main-center .datagrid .header.expenditure { + width: 50%; + border-bottom: 1PX solid #CACBCC; +} +.balance-main .main-center .datagrid .kmbm, +.balance-main .main-center .datagrid .header-title.expenditure, +.balance-main .main-center .datagrid .header-title.income, +.balance-main .main-center .datagrid .xmmc, +.balance-main .main-center .datagrid .qj, +.balance-main .main-center .datagrid .zy, +.balance-main .main-center .datagrid .jfje, +.balance-main .main-center .datagrid .dfje, +.balance-main .main-center .datagrid .fx, +.balance-main .main-center .datagrid .ye { + height: 29PX; + line-height: 29PX; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid .xmmc { + width: 12%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .qj { + width: 26%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .zy { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .dfje { + width: 12%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .fx { + width: 26%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} +.balance-main .main-center .datagrid .mok_list { + display: block; + overflow-y: scroll; + height: calc(100vh - 200PX); +} +.balance-main .main-center .datagrid .list { + width: 100%; +} +.balance-main .main-center .datagrid ul { + margin: 0; + padding: 0; +} +.balance-main .main-center .datagrid ul li { + display: block; + overflow: hidden; + list-style: none; +} +.balance-main .main-center .datagrid ul li.header { + background: #f8f8f9; + font-weight: bold; +} +.balance-main .main-center .datagrid ul li .kmbm, +.balance-main .main-center .datagrid ul li .xmmc, +.balance-main .main-center .datagrid ul li .qj, +.balance-main .main-center .datagrid ul li .zy, +.balance-main .main-center .datagrid ul li .jfje, +.balance-main .main-center .datagrid ul li .dfje, +.balance-main .main-center .datagrid ul li .fx, +.balance-main .main-center .datagrid ul li .ye { + height: 29PX; + line-height: 29PX; + float: left; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid ul li .xmmc { + width: 12%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .qj { + width: 26%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .zy { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .dfje { + width: 12%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .fx { + width: 26%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} + +.date_box { + display: flex; + align-items: center; +} +.date_box image { + width: 30PX; + height: 30px; + border-radius: 100%; + box-shadow: 0px 6px 10px rgba(63, 68, 75, 0.5); +} +.date_box p { + font-size: 14PX; + margin-left: 5PX; + color: #2facfe; +} +.search_info { + padding: 20px 23px; + display: flex; + justify-content: space-between; + align-items: center; +} +.search_info .search_block { + height: 35px; + flex: 1; + border-radius: 59px; + background: #fff; + display: flex; + padding-right: 35px; + align-items: center; + box-shadow: 0px 6px 5px rgba(63, 68, 75, 0.2); +} +.search_info .search_block .icon { + width: 15px; + height: 15px; + display: block; + margin: 0 8px 0 26px; +} +.search_info .search_block .delete_icon { + width: 15PX; + height: 15PX; + display: block; + margin: 0 8px 0 26px; +} +.search_info .search_block .ipt { + flex: 1; + font-size: 14px; + background: none; + border: 0 none; + line-height: 59px; +} +.home_wrapper{ + background: #e9e9e9; + /* min-height: 100vh; */ + width: 100vw; +} \ No newline at end of file diff --git a/pages/finance/detailed_liabilities/detailed_liabilities.js b/pages/finance/detailed_liabilities/detailed_liabilities.js new file mode 100644 index 0000000..6c072f8 --- /dev/null +++ b/pages/finance/detailed_liabilities/detailed_liabilities.js @@ -0,0 +1,222 @@ +// pages/finance/detailed_liabilities/detailed_liabilities.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + expressionOptions:[], + searchDate: { + bookDate: "", + templateName: '资产负债表', + signature: false, // 添加底部落款 + }, + + list: [], + accountingYear: "", + accountingMonth: "", + // 显示搜索条件 + visible: false, + showPickerTime: false, + subjectName:'请选择科目查询', + minDate: new Date().getTime(), + maxDate: new Date().getTime(), + currentDate: new Date(), + date:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + UTIL.httpRequest(API.getLoginBook,{}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + let currentDays = res.data.currentDay; + if (currentDays == null) { + UTIL.showToastNoneIcon("当前账套未开启!"); + return false; + } + + let mindate = res.data.startDay.split('-') + let dealDays = currentDays.split("-"); + this.setData({ + accountingYear:dealDays[0], + accountingMonth:dealDays[1], + date: dealDays[0]+'年'+dealDays[1]+'月', + ['searchDate.bookDate']:currentDays, + minDate: new Date(mindate[0],mindate[1]-1).getTime(), + }) + this.initPage() + } + } + }); + UTIL.httpRequest(API.expressionReportByCategory+'资产负债表',{}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + let content = res.data; + this.setData({ + expressionOptions:content + }) + } + } + }); + }, + initPage() { + var that = this; + UTIL.httpRequest(API.assetLiabilityReportByExpTpl,this.data.searchDate, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + let content = res.data; + this.setData({ + list:content.list.map((x) => { + x.ncyeLeft = that.formatNum(x.ncyeLeft); + x.qmyeLeft = that.formatNum(x.qmyeLeft); + x.ncyeRight = that.formatNum(x.ncyeRight); + x.qmyeRight = that.formatNum(x.qmyeRight); + return x; + }) + }) + } + } + }); + }, + formatNum(value) { + if(value === undefined || value === null) + return ''; + if(typeof(value) === "string") + { + if(value.indexOf(',') !== -1) + return value; + value = Number(value); + if(isNaN(value)) + return ''; + } + if(value === 0) + return ''; + return this.numFormat(value); + }, + numFormat(value) { + if (value == null) { + return ""; + } + if (!value) return "0.00"; + value = value.toFixed(2); + let is_neg = value < 0; + var intPart = Math.abs(Math.trunc(value)); // 获取整数部分 + var intPartFormat = intPart.toString() + .replace(/(\d)(?=(?:\d{3})+$)/g, "$1,"); // 将整数部分逢三一断 + if(is_neg) + intPartFormat = '-' + intPartFormat; + var floatPart = ".00"; // 预定义小数部分 + var value2Array = value.split("."); + // =2表示数据有小数位 + if (value2Array.length === 2) { + floatPart = value2Array[1].toString(); // 拿到小数部分 + if (floatPart.length === 1) { + // 补0,实际上用不着 + return intPartFormat + "." + floatPart + "0"; + } else { + return intPartFormat + "." + floatPart; + } + } else { + return intPartFormat + floatPart; + } + }, + openPick(){ + this.setData({ + showPickerTime:true + }) + }, + closePick(){ + this.setData({ + showPickerTime:false + }) + }, + onConfirm(time) { + console.log(time.detail); + let date = UTIL.formatDates(time.detail).split('-'); + this.setData({ + date:date[0] + '年' + date[1] + '月', + ['queryParams.startDate']:UTIL.formatDates(time.detail), + showPickerTime : false + }) + this.getList(); + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + closePickEx(){ + this.setData({ + visible : false + }) + }, + openPickEx(){ + this.setData({ + visible : true + }) + }, + onConfirmExpression(data){ + console.log(data); + this.setData({ + subjectName:data.detail.value.name, + ['searchDate.templateName']: data.detail.value.name, + visible : false + }) + this.initPage(); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/finance/detailed_liabilities/detailed_liabilities.json b/pages/finance/detailed_liabilities/detailed_liabilities.json new file mode 100644 index 0000000..ea1c144 --- /dev/null +++ b/pages/finance/detailed_liabilities/detailed_liabilities.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-picker": "@vant/weapp/picker/index", + "van-datetime-picker": "@vant/weapp/datetime-picker/index" + } +} \ No newline at end of file diff --git a/pages/finance/detailed_liabilities/detailed_liabilities.wxml b/pages/finance/detailed_liabilities/detailed_liabilities.wxml new file mode 100644 index 0000000..0b99667 --- /dev/null +++ b/pages/finance/detailed_liabilities/detailed_liabilities.wxml @@ -0,0 +1,71 @@ + ++ + ++ ++ {{date}}
++ + + ++ + ++ +单位:{{ bookName }} +{{ accountingYear }}年{{ accountingMonth }}期 +金额:元 ++ + ++ ++ +收入 +支出 ++ +日期 +项目 +金额 +日期 +项目 +金额 ++ ++
+- +
+{{ item.incomeDate == null ? '' : item.incomeDate }} +{{ item.incomeSummary == null ? '' : item.incomeSummary }} +{{ item.incomeAmount == null ? '' : item.incomeAmount }} +{{ item.expenditureDate == null ? '' : item.expenditureDate }} +{{ item.expenditureSummary == null ? '' : item.expenditureSummary }} +{{ item.expenditureAmount == null ? '' : item.expenditureAmount }} ++ + ++ 负债表 ++ \ No newline at end of file diff --git a/pages/finance/detailed_liabilities/detailed_liabilities.wxss b/pages/finance/detailed_liabilities/detailed_liabilities.wxss new file mode 100644 index 0000000..5d0e9d4 --- /dev/null +++ b/pages/finance/detailed_liabilities/detailed_liabilities.wxss @@ -0,0 +1,214 @@ +/* pages/finance/detailed_liabilities/detailed_liabilities.wxss */ +.balance-main { + background: #fff; +} +.balance-main .main-title { + margin-bottom: 5PX; + padding: 0 10PX; + height: 33PX; + line-height: 33PX; + color: #333; + font-size: 13PX; + display: flex; + justify-content: space-between; +} +.balance-main .main-title .nper { + text-align: center; +} +.balance-main .main-title .amountOf { + text-align: right; +} +.balance-main .main-center { + border: 1PX solid #CACBCC; + border-bottom: 0; + overflow-x: scroll; +} +.balance-main .main-center .datagrid { + min-height: 100PX; + width: 250%; +} +.balance-main .main-center .datagrid .header { + background: #f8f8f9; + font-weight: bold; + display: flex; + color: #278dff; +} +.balance-main .main-center .datagrid .kmbm, +.balance-main .main-center .datagrid .xmmc, +.balance-main .main-center .datagrid .qj, +.balance-main .main-center .datagrid .zy, +.balance-main .main-center .datagrid .jfje, +.balance-main .main-center .datagrid .dfje, +.balance-main .main-center .datagrid .fx, +.balance-main .main-center .datagrid .ye { + height: 29PX; + line-height: 29PX; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid .xmmc { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .qj { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .zy { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .dfje { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .fx { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} +.balance-main .main-center .datagrid .mok_list { + display: block; + overflow-y: scroll; + height: calc(100vh - 200PX); +} +.balance-main .main-center .datagrid .list { + width: 100%; +} +.balance-main .main-center .datagrid ul { + margin: 0; + padding: 0; +} +.balance-main .main-center .datagrid ul li { + display: block; + overflow: hidden; + list-style: none; +} +.balance-main .main-center .datagrid ul li.header { + background: #f8f8f9; + font-weight: bold; +} +.balance-main .main-center .datagrid ul li:nth-child(even) { + background: #e9e9e9; +} +.balance-main .main-center .datagrid ul li .kmbm, +.balance-main .main-center .datagrid ul li .xmmc, +.balance-main .main-center .datagrid ul li .qj, +.balance-main .main-center .datagrid ul li .zy, +.balance-main .main-center .datagrid ul li .jfje, +.balance-main .main-center .datagrid ul li .dfje, +.balance-main .main-center .datagrid ul li .fx, +.balance-main .main-center .datagrid ul li .ye { + height: 29PX; + line-height: 29PX; + float: left; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid ul li .xmmc { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .qj { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .zy { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .dfje { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .fx { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} +.radio_box{ + display: flex; + justify-content: space-between; + align-items: center; + padding:20px 23px; +} +.date_box { + display: flex; + align-items: center; +} +.date_box image { + width: 30PX; + height: 30px; + border-radius: 100%; + box-shadow: 0px 6px 10px rgba(63, 68, 75, 0.5); +} +.date_box p { + font-size: 14PX; + margin-left: 5PX; + color: #2facfe; +} +.search_info { + padding: 20px 23px; + display: flex; + justify-content: space-between; + align-items: center; +} +.search_info .search_block { + height: 35px; + flex: 1; + border-radius: 59px; + background: #fff; + display: flex; + padding-right: 35px; + align-items: center; + box-shadow: 0px 6px 5px rgba(63, 68, 75, 0.2); + margin-left: 20px; +} +.search_info .search_block .icon { + width: 15px; + height: 15px; + display: block; + margin: 0 8px 0 15px; +} +.search_info .search_block .delete_icon { + width: 15PX; + height: 15PX; + display: block; + margin: 0 8px 0 26px; +} +.search_info .search_block .ipt { + flex: 1; + font-size: 14px; + background: none; + border: 0 none; + line-height: 59px; +} +.home_wrapper{ + background: #e9e9e9; + /* min-height: 100vh; */ + width: 100vw; +} \ No newline at end of file diff --git a/pages/finance/index.js b/pages/finance/index.js index 6342b59..342295c 100644 --- a/pages/finance/index.js +++ b/pages/finance/index.js @@ -11,7 +11,25 @@ Page({ isIPX: app.globalData.isIPX, list:[] }, - + goList(e){ + let type = e.currentTarget.dataset.type; + if(type == 'yeb'){ + wx.navigateTo({ + url: 'list_balance_ranking/list_balance_ranking', + }) + } + if(type == 'fzb'){ + wx.navigateTo({ + url: 'detailed_liabilities/detailed_liabilities', + }) + } + if(type == 'gkb'){ + wx.navigateTo({ + url: 'detailed_incomeAndExpenditurePublic/detailed_incomeAndExpenditurePublic', + }) + } + + }, /** * 生命周期函数--监听页面加载 */ @@ -43,8 +61,12 @@ Page({ if(res.code == 200){ for (let i = 0; i < res.rows.length; i++) { const element = res.rows[i]; - element.openPic = element.openPic.split(','); - element.openFile = element.openFile.split(','); + if(element.openPic){ + element.openPic = element.openPic.split(','); + } + if(element.openFile){ + element.openFile = element.openFile.split(','); + } } // wx.getStorageSync('dressCode')+ if (res.rows.length>0) { diff --git a/pages/finance/index.json b/pages/finance/index.json index d2cdd2c..254f48a 100644 --- a/pages/finance/index.json +++ b/pages/finance/index.json @@ -13,6 +13,8 @@ "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", "van-popup": "@vant/weapp/popup/index", "van-dialog": "@vant/weapp/dialog/index", + "van-grid": "@vant/weapp/grid/index", + "van-grid-item": "@vant/weapp/grid-item/index", "van-dropdown-item": "@vant/weapp/dropdown-item/index" } } \ No newline at end of file diff --git a/pages/finance/index.wxml b/pages/finance/index.wxml index 71fdf1b..5556265 100644 --- a/pages/finance/index.wxml +++ b/pages/finance/index.wxml @@ -13,7 +13,20 @@ bind:change="goSearch" />+ + ++ ++ {{date}}
++ ++ + ++ {{searchDate.templateName}} ++ + ++ + ++ +单位:{{ this.$store.getters.bookName }} +{{ accountingYear }}年{{ accountingMonth }}期 +金额:元 ++ ++ ++ +资产 +年初余额 +期末余额 +负债与所有者权益 +年初余额 +期末余额 ++ ++
+- +
+{{ item.subjectNameLeft }} +{{ item.ncyeLeft }} +{{ item.qmyeLeft }} +{{ item.subjectNameRight }} +{{ item.ncyeRight }} +{{ item.qmyeRight }} ++ + ++ 余额表 ++ ++ 负债表 ++ ++ 公开表 +diff --git a/pages/finance/index.wxss b/pages/finance/index.wxss index 963d26c..1759044 100644 --- a/pages/finance/index.wxss +++ b/pages/finance/index.wxss @@ -3,6 +3,37 @@ border: 1px solid #5CAE77!important; background: #fff!important; } +.van-grid-item__content--square { + padding-top: 0; + padding-bottom: 0; +} +.grid_main{ + width: 94%; + margin: 0 auto 2vh; + overflow: hidden; + border-radius: 15px; + box-shadow: 0 8px 20px rgba(3, 3, 67, .1); + display: flex; + justify-content: space-around; + align-items: center; + background-color: #ffffff; + padding: 2vh 0; +} +.grid_main view{ + font-size: 14px; + color: #333333; + display: flex; + flex-direction: column; + align-items: center; +} +.grid_main view text{ + font-size: 14px; + color: #333333; + margin-top: 5px; +} +.grid_main view image{ + height: 43px; +} van-search { flex: 0.8; } diff --git a/pages/finance/list_balance_ranking/list_balance_ranking.js b/pages/finance/list_balance_ranking/list_balance_ranking.js new file mode 100644 index 0000000..5832f3f --- /dev/null +++ b/pages/finance/list_balance_ranking/list_balance_ranking.js @@ -0,0 +1,319 @@ +// pages/finance/list_balance_ranking/list_balance_ranking.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + popupVisible:false, + subjects:[], + isIPX: app.globalData.isIPX, + subjectName:'', + visible:false, + subjectId:'', + radio:'1', + applicationList:[], + applicationListSecond:[], + assetStatusOptions:[], + auditStatus:[], + loading: false, + finished: false, + show: false, + showTab: false, + showPickerTime: false, + fileList:[], + listLength:'0', + searchInput:'', + queryParams:{ + pageNum:1, + pageSize:999, + startDate:'', + startSubjectId:'', + endSubjectId:'', + showSubSubject:false + }, + uploadFiles1:[], + projectId:'', + projectIndex:'', + showBtn:true, + yearMonth:[], + deptName:'', + minDate: new Date().getTime(), + maxDate: new Date().getTime(), + currentDate: new Date(), + date:'' + }, + + changeTabItem(e){ + console.log(e.detail.currentTarget.dataset.item); + console.log(e); + + this.setData({ + subjectName:e.detail.currentTarget.dataset.item.subjectId+ " " + e.detail.currentTarget.dataset.item.subjectName, + ['queryParams.endSubjectId']:e.detail.currentTarget.dataset.item.subjectId, + popupVisible:false + }) + this.getList(); + + }, + showSub(event){ + this.setData({ + ['queryParams.showSubSubject']:event.detail + }) + this.getList(); + }, + onClose(e){ + console.log(e); + this.setData({ + popupVisible:false + }) + }, + openTabs(e){ + console.log(e); + this.setData({ + tabsVisible:true + }) + this.selectComponent('#tabs').resize(); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + UTIL.httpRequest(API.getLoginBook,{}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + if (res.data.currentDay != null || res.data.startDay != null){ + let resDate = res.data.currentDay != null ? res.data.currentDay : res.data.startDay != null ? res.data.startDay : UTIL.formatDates(new Date()) + let date = resDate.split('-'); + let mindate = res.data.startDay.split('-') + this.setData({ + date:date[0] + '年' + date[1] + '月', + currentDate:new Date(date[0], date[1]-1, 1).getTime(), + ['queryParams.startDate']:resDate, + minDate: new Date(mindate[0],mindate[1]-1).getTime(), + }) + this.getList(); + this.getSubjects(); + } + } + } + }) + }, + getList(){ + var _this = this; + setTimeout(() => { + UTIL.httpRequest(API.trailBalanceList,_this.data.queryParams, { + success: (response) => { + // _this.data.listLength = response.total; + response.rows.map(res=>{ + res.bqjffs = Number(res.bqjffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + res.bqdffs = Number(res.bqdffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + res.qcjfye = Number(res.qcjfye).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + res.qcdfye = Number(res.qcdfye).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + res.qmjffs = Number(res.qmjffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + res.qmdffs = Number(res.qmdffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, ""); + }) + // _this.data.applicationList = response.rows; + _this.setData({ + listLength:response.total, + applicationList:response.rows, + }) + } + }); + }, 1000); + }, + openPick(){ + this.setData({ + showPickerTime:true + }) + }, + closePick(){ + this.setData({ + showPickerTime:false + }) + }, + onConfirm(time) { + console.log(time.detail); + let date = UTIL.formatDates(time.detail).split('-'); + this.setData({ + date:date[0] + '年' + date[1] + '月', + ['queryParams.startDate']:UTIL.formatDates(time.detail), + showPickerTime : false + }) + this.getList(); + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + getSubjects() { + this.data.subjects = []; + var that = this; + let map = {}; + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'subject_type', {method:'GET'}, { + success: (resp) => { + this.setData({ + subjects:resp.data.map((x) => { + let item = { + subjectId: x.dictValue, + subjectName: x.dictLabel, + subjectNameAll: x.dictLabel, + subjectType: x.dictValue, + subjectLevel: 0, + children: [], + visible: true, + }; + map[x.dictValue] = item; + return item; + }) + }); + console.log(this.data.subjects); + UTIL.httpRequest('/finance/subject/listAll',{year:this.data.queryParams.startDate ? this.data.queryParams.startDate.substr(0, 4) : null}, { + success: (resp) => { + let list = this.makeTree(resp.rows || resp.data); + console.log(list); + for(let v of list) + { + if(v.subjectId.length === 3) + { + map[v.subjectType].children.push(v); + } + } + this.setData({ + subjects:this.data.subjects + }) + + } + }); + } + }) + // this.getDicts('subject_type').then((resp) => { + + // let url = '/finance/subject/listAll?year='+this.yearNews; // '/open/villageAffairs/public/subjects/153' + // request(url).then((resp) => { + + // }) + // }); + }, + makeTree(list) { + function isnull(p) { + return p === null || p === undefined || p === ''; + } + function makeTree_r(l, p) { + const isRoot = isnull(p); + let res = []; + for(let v of l) + { + if((isRoot && isnull(v.parentId)) || (!isRoot && v.parentId == p)) + { + let arr = makeTree_r(l, v.subjectId); + if(arr.length > 0) + v.children = arr; + else + delete v.children; + res.push(v); + } + } + return res; + } + return makeTree_r(list.map((x) => { + x.visible = true; + return x; + })); + }, + openPup(){ + this.setData({ + popupVisible:true + }) + }, + onTabChanged(){ + this.setData({searchValue:''}) + this.onSearch(); + }, + onSearch(value) { + function handleTree_r(l, func) { + let res = 0; + for(let v of l) + { + let r = func(v) ? 1 : 0; + if(v.children && Array.isArray(v.children) && v.children.length > 0) + { + r += handleTree_r(v.children, func); + } + v.visible = r > 0; + res += r; + } + return res; + } + + for(let v of this.data.subjects) + { + if(v.subjectId === this.data.active && value) + { + handleTree_r(v.children, (x) => x.subjectId.startsWith(value) || x.subjectName.indexOf(value) !== -1); + } + else + { + handleTree_r(v.children, (x) => true); + } + } + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/finance/list_balance_ranking/list_balance_ranking.json b/pages/finance/list_balance_ranking/list_balance_ranking.json new file mode 100644 index 0000000..4501128 --- /dev/null +++ b/pages/finance/list_balance_ranking/list_balance_ranking.json @@ -0,0 +1,13 @@ +{ + "usingComponents": { + "childrenPage":"/component/SubjectTreeChooserNodeItem/childrenPage", + "van-popup": "@vant/weapp/popup/index", + "van-datetime-picker": "@vant/weapp/datetime-picker/index", + "van-checkbox": "@vant/weapp/checkbox/index", + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "van-collapse": "@vant/weapp/collapse/index", + "van-collapse-item": "@vant/weapp/collapse-item/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index" + } +} \ No newline at end of file diff --git a/pages/finance/list_balance_ranking/list_balance_ranking.wxml b/pages/finance/list_balance_ranking/list_balance_ranking.wxml new file mode 100644 index 0000000..c5bc2c7 --- /dev/null +++ b/pages/finance/list_balance_ranking/list_balance_ranking.wxml @@ -0,0 +1,94 @@ + + + ++ 余额表 ++ + + \ No newline at end of file diff --git a/pages/finance/list_balance_ranking/list_balance_ranking.wxss b/pages/finance/list_balance_ranking/list_balance_ranking.wxss new file mode 100644 index 0000000..d9eb6d3 --- /dev/null +++ b/pages/finance/list_balance_ranking/list_balance_ranking.wxss @@ -0,0 +1,229 @@ +.balance-main { + background: #fff; +} +.balance-main .main-title { + margin-bottom: 5PX; + padding: 0 10PX; + height: 33PX; + line-height: 33PX; + color: #333; + font-size: 13PX; + display: flex; + justify-content: space-between; +} +.balance-main .main-title .nper { + text-align: center; +} +.balance-main .main-title .amountOf { + text-align: right; +} +.balance-main .main-center { + border: 1PX solid #CACBCC; + border-bottom: 0; + overflow-x: scroll; +} +.balance-main .main-center .datagrid { + min-height: 100PX; + width: 250%; +} +.balance-main .main-center .datagrid .header { + background: #f8f8f9; + font-weight: bold; + display: flex; + color: #278dff; +} +.balance-main .main-center .datagrid .header_sec view { + width: 12.5%; +} +.balance-main .main-center .datagrid .kmbm, +.balance-main .main-center .datagrid .xmmc, +.balance-main .main-center .datagrid .qj, +.balance-main .main-center .datagrid .zy, +.balance-main .main-center .datagrid .jfje, +.balance-main .main-center .datagrid .dfje, +.balance-main .main-center .datagrid .fx, +.balance-main .main-center .datagrid .ye { + height: 29PX; + line-height: 29PX; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid .xmmc { + width: 25%; + text-align: center; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .qj { + width: 25%; + text-align: center; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .zy { + width: 25%; + text-align: center; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .dfje { + width: 25%; + text-align: center; + padding-left: 10PX; +} +.balance-main .main-center .datagrid .fx { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} +.balance-main .main-center .datagrid .mok_list { + display: block; + overflow-y: scroll; + height: calc(100vh - 310PX); +} +.balance-main .main-center .datagrid .list { + width: 100%; +} +.balance-main .main-center .datagrid ul { + margin: 0; + padding: 0; +} +.balance-main .main-center .datagrid ul li { + display: block; + overflow: hidden; + list-style: none; +} +.balance-main .main-center .datagrid ul li.header { + background: #f8f8f9; + font-weight: bold; +} +.balance-main .main-center .datagrid ul li.header_sec view { + width: 12.5%; +} +.balance-main .main-center .datagrid ul li:nth-child(even) { + background: #e9e9e9; +} +.balance-main .main-center .datagrid ul li .kmbm, +.balance-main .main-center .datagrid ul li .xmmc, +.balance-main .main-center .datagrid ul li .qj, +.balance-main .main-center .datagrid ul li .zy, +.balance-main .main-center .datagrid ul li .jfje, +.balance-main .main-center .datagrid ul li .dfje, +.balance-main .main-center .datagrid ul li .fx, +.balance-main .main-center .datagrid ul li .ye { + height: 29PX; + line-height: 29PX; + float: left; + font-size: 13PX; + border-bottom: 1PX solid #CACBCC; + border-right: 1PX solid #CACBCC; + text-align: center; +} +.balance-main .main-center .datagrid ul li .xmmc { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .qj { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .zy { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .dfje { + width: 26%; + text-align: left; + padding-left: 10PX; +} +.balance-main .main-center .datagrid ul li .fx { + width: 12%; + text-align: right; + padding-right: 10PX; +} +.balance-main .main-center .datagrid ul li .ye { + width: 12%; + text-align: right; + padding-right: 10PX; + border-right: 0; +} +.search_info { + padding: 20px 23px 0; + display: flex; + justify-content: space-between; + align-items: center; +} +.search_info .search_block { + height: 35px; + flex: 1; + border-radius: 59px; + background: #fff; + display: flex; + padding-right: 35px; + align-items: center; + box-shadow: 0px 6px 5px rgba(63, 68, 75, 0.2); + margin-left: 20px; +} +.search_info .search_block .icon { + width: 15px; + height: 15px; + display: block; + margin: 0 8px 0 15px; +} +.search_info .search_block .delete_icon { + width: 15PX; + height: 15PX; + display: block; + margin: 0 8px 0 26px; +} +.search_info .search_block .ipt { + flex: 1; + font-size: 14px; + background: none; + border: 0 none; + line-height: 59px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} +.total{ + font-size: 14PX; + color: #858585; +} +.home_wrapper{ + background: #e9e9e9; + /* min-height: 100vh; */ + width: 100vw; +} +.date_box { + display: flex; + align-items: center; + flex-shrink: 0; +} +.date_box image { + width: 30PX; + height: 30px; + border-radius: 100%; + box-shadow: 0px 6px 10px rgba(63, 68, 75, 0.5); +} +.date_box p { + font-size: 14PX; + margin-left: 5PX; + color: #2facfe; +} +.radio_box{ + display: flex; + justify-content: space-between; + align-items: center; + padding:20px 23px; +} \ No newline at end of file diff --git a/pages/handle/expenditureAuditNew/expenditureAuditNew.js b/pages/handle/expenditureAuditNew/expenditureAuditNew.js index 2ddf1f5..c1d310d 100644 --- a/pages/handle/expenditureAuditNew/expenditureAuditNew.js +++ b/pages/handle/expenditureAuditNew/expenditureAuditNew.js @@ -14,6 +14,7 @@ Page({ active:0, spsxOptions:[], paymentPatternOptions:[], + transferStatusOptions:[], nickName:'', comment:'', activeNames: 0, @@ -56,6 +57,19 @@ Page({ }); } }) + //所属银行 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_status', {method:'GET'}, { + success: (res) => { + this.setData({ + transferStatusOptions:res.data + }); + } + }) + //所属银行 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'audit_status', {method:'GET'}, { + success: (res) => { + } + }) // 资金支出类别字典查询 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'capital_expenditure_type', {method:'GET'}, { success: (res) => { @@ -294,6 +308,39 @@ Page({ }) } }) + //四议两公开 + UTIL.httpRequest( + API.URL_GET_FINDLIST, + { + method:'GET', + tableName:'t_yinnong_transfer', + tableId:res.data.id, + fileType:4 + }, + { + success: (res) => { + let list = []; + res.data.forEach((item2,index2)=>{ + let fileForm = res.data.fileForm?res.data.fileForm:[]; + fileForm.push({ + file: wx.getStorageSync('dressCode')+item2.fileUrl, + fileType:'4', + bizPath:'transfer', + tableName:'t_yinnong_transfer', + tableId:res.data.id + }) + list.push({ + tempFilePath:wx.getStorageSync('dressCode')+item2.fileUrl, + id:item2.id + }) + that.setData({ + ["form.fileNum"]:that.data.form.fileNum+1, + ["form.SYLGKimage"]:list, + ["form.fileForm"]:fileForm + }); + }) + } + }) let query = { method:'GET', @@ -307,6 +354,7 @@ Page({ if (res.code == API.SUCCESS_CODE) { for(let i = 0 ; i < response.rows.length ; i++){ response.rows[i].bankTypeText = UTIL.getTransform(response.rows[i].bankType,that.data.bankTypeOptions); + response.rows[i].transferStatusText = UTIL.getTransform(response.rows[i].transferStatus,that.data.transferStatusOptions); } that.setData({ ["form.payeeList"]:response.rows @@ -336,33 +384,46 @@ Page({ }) // 查询审批事项流转进度 - UTIL.httpRequest(API.URL_GET_GETPROCESS+options.id , {method:'GET'}, { + UTIL.httpRequest(API.URL_GET_GETPROCESSNEW+options.id , {method:'GET'}, { success: (res) => { console.log(res); - for (let i = 0; i < res.data.processSchedule.审批事项.length; i++) { + for (let i = 0; i < res.data.length; i++) { const element = res.data.processSchedule.审批事项[i]; if (element.electronicSignature!=null) { element.electronicSignature = wx.getStorageSync('dressCode')+element.electronicSignature; } } - if(res.data.processSchedule != null){ - that.setData({spsxOptions:res.data.processSchedule.审批事项}) - } - that.setData({instanceId:res.data.instanceId}) - if(options.business == 'xj'){ - console.log(that.data.instanceId) - // 查询现金审批事项流转进度 - UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, { - success: (res) => { - console.log(res); - if(res.data.processSchedule.审批事项){ - that.setData({spsxOptions:res.data.processSchedule.审批事项}) + const arr = []; + for (let key in res.data) { + if (res.data.hasOwnProperty(key)) { // 确保键在对象自身上,而不是从原型链继承 + for (let i = 0; i < res.data[key].length; i++) { + const element = res.data[key][i]; + console.log(`Key: ${key}, Value: ${res.data[key][i].electronicSignature}`); + if (element.electronicSignature!=null) { + element.electronicSignature = wx.getStorageSync('dressCode')+element.electronicSignature; } - that.setData({instanceId:res.data.instanceId}) } - }) + arr.push([key,res.data[key]]) + // that.setData({instanceId:res.data.instanceId}) + } } + that.setData({spsxOptions:arr}) + + + // if(options.business == 'xj'){ + // console.log(that.data.instanceId) + // // 查询现金审批事项流转进度 + // UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, { + // success: (res) => { + // console.log(res); + // if(res.data.processSchedule.审批事项){ + // that.setData({spsxOptions:res.data.processSchedule.审批事项}) + // } + // that.setData({instanceId:res.data.instanceId}) + // } + // }) + // } } }) UTIL.hideLoadingHaveMask(); @@ -462,6 +523,76 @@ Page({ } }) }, + goAgreeNew(){//2024-7-15审批功能修改 字段名称、接口地址、请求参数格式发生变动 + var that = this ; + let data = { + taskId:that.data.taskId, + auditbatchNo:that.data.form.auditbatchNo, + pass:true, + remark:that.data.comment == '' ? '同意':that.data.comment, + deptId:JSON.parse(wx.getStorageSync('user')).deptId, + method:'POST' + }; + console.log(data); + UTIL.httpRequest(API.A_audit ,data, { + success: (res) => { + console.log(res); + if (res.code == API.SUCCESS_CODE) { + wx.showToast({ + title: '审批成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + }else{ + wx.showToast({ + title: '操作失败', + icon: 'error', + duration: 2000 + }) + } + } + }) + }, + goDisNew(){//2024-7-15审批功能修改 字段名称、接口地址、请求参数格式发生变动 + var that = this ; + let data = { + taskId:that.data.taskId, + auditbatchNo:that.data.form.auditbatchNo, + pass:false, + remark:that.data.comment == '' ? '驳回':that.data.comment, + deptId:JSON.parse(wx.getStorageSync('user')).deptId, + method:'POST' + }; + console.log(data); + UTIL.httpRequest(API.A_audit ,data, { + success: (res) => { + console.log(res); + if (res.code == API.SUCCESS_CODE) { + wx.showToast({ + title: '审批成功', + icon: 'success', + duration: 2000, + complete(){ + setTimeout(function(){ + that.back(); + },2000) + } + }) + }else{ + wx.showToast({ + title: '操作失败', + icon: 'error', + duration: 2000 + }) + } + } + }) + }, commentInput(e){ console.log(e); var that = this; diff --git a/pages/handle/expenditureAuditNew/expenditureAuditNew.json b/pages/handle/expenditureAuditNew/expenditureAuditNew.json index b5ebcea..d306fa0 100644 --- a/pages/handle/expenditureAuditNew/expenditureAuditNew.json +++ b/pages/handle/expenditureAuditNew/expenditureAuditNew.json @@ -18,6 +18,7 @@ "van-dialog": "@vant/weapp/dialog/index", "van-collapse": "@vant/weapp/collapse/index", "van-collapse-item": "@vant/weapp/collapse-item/index", - "van-empty": "@vant/weapp/empty/index" + "van-empty": "@vant/weapp/empty/index", + "van-divider": "@vant/weapp/divider/index" } } \ No newline at end of file diff --git a/pages/handle/expenditureAuditNew/expenditureAuditNew.wxml b/pages/handle/expenditureAuditNew/expenditureAuditNew.wxml index 3c0b728..b37bf89 100644 --- a/pages/handle/expenditureAuditNew/expenditureAuditNew.wxml +++ b/pages/handle/expenditureAuditNew/expenditureAuditNew.wxml @@ -323,6 +323,9 @@+ + ++ ++ {{date}}
++ ++ + + ++ {{subjectName==''?'请选择科目查询':subjectName}} ++ + + +显示明细 +共{{listLength}}条 ++ + + + + + + ++ ++ ++ +科目 +期初余额 +本期发生 +期末余额 ++ +编码 +名称 +本期发生 +期末余额 +科目 +期初余额 +本期发生 +期末余额 ++ ++
+- +
+{{ item.subjectId }} +{{item.subjectName}} +{{ item.qcjfye }} +{{item.qcdfye}} +{{item.bqjffs}} +{{item.bqdffs}} +{{item.qmjffs}} +{{item.qmdffs}} ++ + ++ ++ ++ ++ + + + @@ -369,45 +372,64 @@ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 8fe4ee3..ced75e4 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -288,7 +288,7 @@ .workflow .workflow_list .process_pay .describe{ font-size: 30rpx; - width: 330rpx; + width: 320rpx; color: #3c9370; display: flex; align-items: center; diff --git a/pages/mainBody/detail/detail.js b/pages/mainBody/detail/detail.js new file mode 100644 index 0000000..1d837a0 --- /dev/null +++ b/pages/mainBody/detail/detail.js @@ -0,0 +1,170 @@ +// pages/mainBody/detail/detail.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + // 主体类别字典 + statisticsTypeIdOptions: [], + // 示范社类型字典 + modelSocietyTypeOptions: [], + // 经营状态字典 + registrationStatusOptions: [], + // 企业类型字典 + enterpriseTypeOptions: [], + //产业分类字典项 + industryClassificationTypeOptions: [], + // 审核状态字典 + reviewStatusOptions: [], + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + var that = this; + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'newBusinessEntity_statistics_project', {method:'GET'}, { + success: (res) => { + that.setData({ + statisticsTypeIdOptions:res.data, + }) + } + }) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'model_society_type', {method:'GET'}, { + success: (res) => { + that.setData({ + modelSocietyTypeOptions:res.data, + }) + } + }) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'registration_status', {method:'GET'}, { + success: (res) => { + that.setData({ + registrationStatusOptions:res.data, + }) + } + }) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'enterprise_type', {method:'GET'}, { + success: (res) => { + that.setData({ + enterpriseTypeOptions:res.data, + }) + } + }) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'Industrial_classification_type', {method:'GET'}, { + success: (res) => { + that.setData({ + industryClassificationTypeOptions:res.data, + }) + } + }) + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'sys_yes_no', {method:'GET'}, { + success: (res) => { + that.setData({ + reviewStatusOptions:res.data, + }) + } + }) + let data = { + method: 'GET' + } + UTIL.httpRequest(API.URL_GET_ENTITYDETAIL + options.id ,data,{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + res.data.statisticsTypeIdText = UTIL.getTransform(res.data.statisticsTypeId,that.data.statisticsTypeIdOptions); + res.data.industryClassificationTypeText = UTIL.getTransform(res.data.industryClassificationType,that.data.industryClassificationTypeOptions); + res.data.modelSocietyTypeText = UTIL.getTransform(res.data.modelSocietyType,that.data.modelSocietyTypeOptions); + res.data.registrationStatusText = UTIL.getTransform(res.data.registrationStatus,that.data.registrationStatusOptions); + res.data.enterpriseTypeText = UTIL.getTransform(res.data.enterpriseType,that.data.enterpriseTypeOptions); + + UTIL.httpRequest('/system/dept/treeselectByDeptId', {deptId: res.data.serviceDeptId,method:'GET'}, { + success: (res2) => { + res.data.serviceDeptIdName = res2.data[0].label; + } + }) + + let fileList = res.data.masterMap.split(','); + let fileImg = [] + fileList.map((rr,index) => { + fileImg.push({ + url: wx.getStorageSync('dressCode') + rr, + name: '图片' + index, + isImage: true, + }); + }) + res.data.fileImg = fileImg; + console.log(fileImg); + + UTIL.httpRequest('/finance/book/list', {deptId: 0,method:'GET'}, { + success: (res2) => { + console.log(res2.rows.filter(function (e) { return e.id == res.data.bookId; })[0]); + res.data.bookName = res2.rows.filter(function (e) { return e.id == res.data.bookId; })[0].bookName; + this.setData({ + detail:res.data, + }) + } + }) + + } + } + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/mainBody/detail/detail.json b/pages/mainBody/detail/detail.json new file mode 100644 index 0000000..d55cfc8 --- /dev/null +++ b/pages/mainBody/detail/detail.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-divider": "@vant/weapp/divider/index", + "van-uploader": "@vant/weapp/uploader/index" + } +} \ No newline at end of file diff --git a/pages/mainBody/detail/detail.wxml b/pages/mainBody/detail/detail.wxml new file mode 100644 index 0000000..deab07d --- /dev/null +++ b/pages/mainBody/detail/detail.wxml @@ -0,0 +1,37 @@ + +- 收据 可拍照 +收据 +- + + --> +@@ -450,57 +472,60 @@ - 发票 可拍照 +发票 +- + + - 其他 可拍照 +其他 ++ + - + + ++ + + ++ +四议两公开 ++ + +审批流程 -+ - - +- -{{index+1}} - -- -- -- - - - -- -- - - - +- - -- -{{item.assigneeName}} -- {{item.deptLabel}} -同意 -审核中 -驳回 -- +- -{{ item.comment }} -{{ sub.times(item.time) }} -+ 批次号:{{childrenItem[0]}} ++ ++ +{{index+1}} + ++ ++ ++ + + + ++ ++ + + + -+ -+ +{{item.actorName}} ++ {{item.auditBy}} +同意 +审核中 +驳回 ++ + ++ +{{ item.auditRemark==null?'无':item.auditRemark }} +{{ sub.times(item.auditTime) }} +- + --> +- - + + ++ + 主体名录 +@@ -168,41 +172,41 @@ - + - - -{{item.formData.remark}} +{{item.auditName}} {{item.formData.applyTime}} +{{item.createTime}} - - {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} +{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + ¥ {{item.formData.expenditureAmount}}¥ {{item.data.expenditureAmount}}+ @@ -224,6 +228,7 @@ - -{{item.formData.remark}} +{{item.auditName}} {{item.formData.applyTime}} +{{item.auditTime}} - - {{item.formData.transferType=='2'?'信用卡转账':item.formData.transferType=='1'?'银行转账':'其他'}} +{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}} + ¥ {{item.formData.expenditureAmount}}¥ {{item.data.expenditureAmount}}@@ -241,6 +246,7 @@ +{{item.transferType=='2'?'信用卡转账':item.transferType=='1'?'银行转账':'其他'}} {{item.paymentStateText}} ¥ {{item.expenditureAmount}}+ + ++ 主体名录 ++ + +基本信息 ++ + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/mainBody/detail/detail.wxss b/pages/mainBody/detail/detail.wxss new file mode 100644 index 0000000..39ba5d0 --- /dev/null +++ b/pages/mainBody/detail/detail.wxss @@ -0,0 +1,11 @@ +/* pages/mainBody/detail/detail.wxss */ + +.main-box{ + background: #ffffff; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); + position: relative; + overflow: hidden; +} \ No newline at end of file diff --git a/pages/mainBody/list/list.js b/pages/mainBody/list/list.js new file mode 100644 index 0000000..b8d1b77 --- /dev/null +++ b/pages/mainBody/list/list.js @@ -0,0 +1,141 @@ +// pages/index/policy/list/list.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + //自定义导航栏 + isIPX: app.globalData.isIPX, + value:'', + total:0, + list:[], + pageNums:1, + title:'', + entityName:'', + option1: [ + { text: '专业合作社', value: 1 }, + { text: '家庭农场', value: 2 }, + { text: '龙头企业', value: 3 }, + { text: '农业庄园', value: 4 }, + { text: '专业大户', value: 5 } + ], + value1: 0, + statisticsTypeId: 1 + }, + + goDetail(e) { + wx.navigateTo({ + url: '/pages/mainBody/detail/detail?id='+e.currentTarget.dataset.id, + }) + }, + changeTab(e){ + var that = this ; + console.log(e.detail); + that.setData({statisticsTypeId:e.detail}); + this.getList(); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.getList(); + }, + paging(){ + this.setData({ + pageNums:this.data.pageNums+1, + }) + this.getList(); + }, + getList(){ + let data = { + pageNum:this.data.pageNums, + pageSize:10, + translate_dict:true, + entityName:this.data.entityName, + statisticsTypeId:this.data.statisticsTypeId, + method: 'GET' + } + UTIL.httpRequest(API.URL_GET_ENTITYLIST,data,{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + let arr = this.data.list; + if (arr.length>=res.total){return;} + res.rows.map(rr=>{ + rr.releaseTime = rr.releaseTime == null?'':rr.releaseTime.substr(0,10); + arr.push(rr) + }) + this.setData({ + total:res.total, + list:arr + }) + } + } + }) + }, + goSearch(e){ + this.setData({ + pageNums:1, + entityName:e.detail, + list:[] + }) + this.getList(); + }, + + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/mainBody/list/list.json b/pages/mainBody/list/list.json new file mode 100644 index 0000000..3ab307d --- /dev/null +++ b/pages/mainBody/list/list.json @@ -0,0 +1,10 @@ +{ + "navigationStyle":"custom", + "usingComponents": { + "van-search": "@vant/weapp/search/index", + "van-icon": "@vant/weapp/icon/index", + "van-cell": "@vant/weapp/cell/index", + "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", + "van-dropdown-item": "@vant/weapp/dropdown-item/index" + } +} \ No newline at end of file diff --git a/pages/mainBody/list/list.wxml b/pages/mainBody/list/list.wxml new file mode 100644 index 0000000..e62251e --- /dev/null +++ b/pages/mainBody/list/list.wxml @@ -0,0 +1,49 @@ + +其他信息 ++ + + + + + + + + + ++ + ++ 主体名录 ++ ++ ++ + ++ + + + + \ No newline at end of file diff --git a/pages/mainBody/list/list.wxss b/pages/mainBody/list/list.wxss new file mode 100644 index 0000000..1f67948 --- /dev/null +++ b/pages/mainBody/list/list.wxss @@ -0,0 +1,42 @@ +/* pages/index/policy/list/list.wxss */ +page{ + height: 100vh; + overflow: hidden; +} +.label{ + display: flex; + justify-content: space-between; +} +.title{ + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} +.flex_main{ + width: 92%; + background-color: #ffffff; + margin: 1.5vh auto 0; + padding: 1vw 1vw; + border-radius: 15px; + box-shadow: 0 8px 20px rgba(3, 3, 67, .1); +} + +.van-search { + width: 90%; + margin: 0 auto; +} +.van-search__content { + padding-top: 5px ; + padding-bottom: 5px ; +} +.list_num{ + font-size: 24rpx; + width: 85%; + margin: 0 auto; +} +.list_num text{ + font-weight: bold; + color: #2A63EF; +} \ No newline at end of file diff --git a/pages/majorEvent/add/add.js b/pages/majorEvent/add/add.js index bde22db..870ccd1 100644 --- a/pages/majorEvent/add/add.js +++ b/pages/majorEvent/add/add.js @@ -25,6 +25,28 @@ Page({ */ onLoad(options) { let that = this + //所属银行 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'major_type', {method:'GET'}, { + success: (res) => { + this.setData({ + majorTypeOptions:res.data + }); + } + }) + let templateQueryParams = { + // 分页 + type:'5' + }; + UTIL.httpRequest(API.URL_GET_TEMPLATELIST , templateQueryParams, { + success: (res) => { + that.setData({ + approvalTemplateList:res.rows, + ["form.approvalTemplateId"]:res.rows[0].id, + ["form.approvalTemplateName"]:res.rows[0].name, + }) + } + }) + if(options.id!=null&&options.id!=""){ this.setData({id:options.id}) UTIL.httpRequest(API.URL_GET_MAJOREVENTGET + this.data.id, {method:'GET'}, { @@ -33,6 +55,9 @@ Page({ if(res.data.auditStatus!='0'&&res.data.auditStatus!='2'){ this.setData({'showBtn':false}); } + res.data.majorTypeText = UTIL.getTransform(res.data.majorType,that.data.majorTypeOptions); + let op = that.data.approvalTemplateList.filter(function (e) { return e.id == res.data.approvalTemplateId; }); + res.data.approvalTemplateName = op[0].name; this.setData({'form':res.data}) this.selectComponent('#hf_editor').setHtml(res.data.eventContent); } @@ -41,6 +66,15 @@ Page({ this.onShow() } }, + onConfirmPickApproval(event) { + console.log(event); + var that = this; + this.setData({ + ["form.showApprovalTemplateName"]: false, + ["form.approvalTemplateName"]: event.detail.value.name, + ["form.approvalTemplateId"]: event.detail.value.id, + }); + }, onConfirmEventTime(e){ let data = this.getNewDate(new Date(e.detail.value)); this.setData({'form.eventTime':data}); @@ -123,6 +157,21 @@ Page({ }else if(this.data.form.eventContent===''||this.data.form.eventContent==null){ //事项内容 UTIL.showToastNoneIcon('事项内容不能为空!'); return false; + }else if(this.data.form.dzbty===''||this.data.form.dzbty==null){ //事项内容 + UTIL.showToastNoneIcon('村党支部提议不能为空!'); + return false; + }else if(this.data.form.lwhsy===''||this.data.form.lwhsy==null){ //事项内容 + UTIL.showToastNoneIcon('两委会商议不能为空!'); + return false; + }else if(this.data.form.dqyshsyhjy===''||this.data.form.dqyshsyhjy==null){ //事项内容 + UTIL.showToastNoneIcon('党群议事会审议和决议不能为空!'); + return false; + }else if(this.data.form.jcjggk===''||this.data.form.jcjggk==null){ //事项内容 + UTIL.showToastNoneIcon('决策结果公开不能为空!'); + return false; + }else if(this.data.form.ssqkgk===''||this.data.form.ssqkgk==null){ //事项内容 + UTIL.showToastNoneIcon('实施情况公开不能为空!'); + return false; }else if(this.data.status=='0'){ this.setData({'status':'1'}) var that = this; @@ -187,6 +236,13 @@ Page({ delta: 1 }) }, + onConfirm(event) { + this.setData({ + [event.currentTarget.dataset.name]: false, + [event.currentTarget.dataset.value]: event.detail.value.dictValue, + [event.currentTarget.dataset.value+'Text']: event.detail.value.dictLabel, + }); + }, /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/majorEvent/add/add.wxml b/pages/majorEvent/add/add.wxml index 1b6104b..7e92c12 100644 --- a/pages/majorEvent/add/add.wxml +++ b/pages/majorEvent/add/add.wxml @@ -7,21 +7,61 @@+ ++ ++ + +{{item.entityName}} ++ +{{item.corporateRepresentativeName}} +{{item.entityAddress}} +- +- * 发生日期- -- {{form.eventTime?form.eventTime:'发生日期'}} - -+ * 发生日期+ ++ {{form.eventTime?form.eventTime:'发生日期'}} + ++ ++ + + + ++ + + + + + + + + + + + + + + \ No newline at end of file + 保存 -\ No newline at end of file diff --git a/pages/majorEvent/add/add.wxss b/pages/majorEvent/add/add.wxss index 61f66a2..a17849d 100644 --- a/pages/majorEvent/add/add.wxss +++ b/pages/majorEvent/add/add.wxss @@ -1,4 +1,7 @@ /* pages/payee/add/add.wxss */ +.van-cell__title, .van-cell__value { + max-width: 50%!important; +} .main-box{ background: #ffffff; padding: 20px; @@ -40,8 +43,6 @@ margin-top: 30px; margin-bottom: 30px; display: flex; - position: absolute; - bottom: 10%; } .bottom view { diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js index 237e485..19b9a77 100644 --- a/pages/payee/add/add.js +++ b/pages/payee/add/add.js @@ -95,22 +95,21 @@ Page({ bindKeyInput(e){ console.log(e.detail); var that = this; - var str = e.detail.value; - var numArr = str.match(/\d+/g) - var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("") + var str = e.detail.value.replace(/\s/g, ""); + console.log(str); + var numArr = str.match(/\d+/g); + var nameArr = str.match(/[\u4e00-\u9fa5]/g).join(""); if (numArr) { numArr.map(rr=>{ - if (rr.length>16) { console.log(rr); console.log(UTIL.isBankCard(rr)); - const carId = UTIL.isBankCard(rr); - if (carId) { + // const carId = UTIL.isBankCard(rr); + // if (carId) { that.setData({ ["form.payee"]:nameArr, ["form.payeeAccount"]:rr }) - } - } + // } }) } }, diff --git a/pages/payee/index.js b/pages/payee/index.js index b4bf0a9..7a48dd6 100644 --- a/pages/payee/index.js +++ b/pages/payee/index.js @@ -54,8 +54,10 @@ Page({ var list = []; array.map(res3=>{ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2") + console.log('111111111111'); res3.payeeAccountText = res3.payeeAccount; res3.bankTypeText = (res.data.filter(function (e) { return e.dictValue == res3.bankType; }))[0].dictLabel; + console.log((res.data.filter(function (e) { return e.dictValue == res3.bankType; }))[0].dictLabel); if(payeeType == 2 && array.length>0){ if(res3.payeeType == 4 || res3.payeeType == 3 ){ list.push(res3) diff --git a/pages/paymentManager/paymentManager.js b/pages/paymentManager/paymentManager.js index beb2223..8a2144e 100644 --- a/pages/paymentManager/paymentManager.js +++ b/pages/paymentManager/paymentManager.js @@ -104,9 +104,11 @@ Page({ remark:this.data.name, paymentState:this.data.value1, capitalExpenditureType:this.data.value2, - transferType:this.data.value3 + transferType:this.data.value3, + auditStatus:'3', + method:'POST' } - UTIL.httpRequest(API.URL_GET_TRANSFERPAYLIST,params,{ + UTIL.httpRequest(API.URL_GET_TRANSFERLIST,params,{ success: (res) => { let _this = this if(res.code == 200){ @@ -194,6 +196,33 @@ Page({ url: '/pages/handle/expenditureAuditNew/expenditureAuditNew?id='+e.currentTarget.dataset.ids+'&&ids='+e.currentTarget.dataset.ids+'&&type=see', }) }, + toPayReapply(e){ + let that = this; + wx.showModal({ + title: '提示', + content: '此操作会将单据中支付失败的记录重新申请,请先确保在【首页-收款方】中已修改准确,再执行此操作!', + success (res) { + if (res.confirm) { + UTIL.httpRequest(API.reapply + e.currentTarget.dataset.ids, {method:'GET'}, { + success: (res) => { + if(res.code == 200){ + wx.showToast({ + title: '重新申请成功', + icon: 'success', + duration: 2000 + }) + that.getList(); + }else{ + UTIL.showToastNoneIcon('申请失败'); + } + } + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }, scrap(e){ console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index); if(e.currentTarget.dataset.data.assetStatus != 1){ diff --git a/pages/paymentManager/paymentManager.wxml b/pages/paymentManager/paymentManager.wxml index 7cd0ab0..de10a6f 100644 --- a/pages/paymentManager/paymentManager.wxml +++ b/pages/paymentManager/paymentManager.wxml @@ -50,11 +50,32 @@ ¥ {{item.expenditureAmount}}+ ++ +(已申请) ++ + +可重新申请 ++ + - - + + + + + + + + + + + diff --git a/pages/paymentManager/toPay/toPay.js b/pages/paymentManager/toPay/toPay.js index 1f255a5..15f8053 100644 --- a/pages/paymentManager/toPay/toPay.js +++ b/pages/paymentManager/toPay/toPay.js @@ -111,8 +111,8 @@ Page({ confirmText: '确定', success: function (e) { //非建行 - if(_this.data.data.accountPassword==null||_this.data.data.accountPassword.length<1){ - UTIL.showToastNoneIcon("请输入支付口令!"); + if(_this.data.data.alternateField1==null||_this.data.data.alternateField1.length<1){ + UTIL.showToastNoneIcon("请输入验证码!"); }else{ _this.setData({'showPopup':true}) } @@ -145,10 +145,34 @@ Page({ confirmPay(){ let _this = this this.setData({'showPopup':false}) - if(this.data.data.bankType!=4){ + console.log(this.data.data.bankType); + if(this.data.data.bankType==4){ let params = { id : this.data.data.id, - accountPassword:this.data.data.accountPassword + alternateField1:this.data.data.alternateField1, + bankType: this.data.data.bankType + } + UTIL.httpRequest(API.URL_GET_PAY,params,{ + success: (res) => { + wx.showModal({ + title: "", + showCancel: false, + content: "支付成功,请等待银行进行处理,稍后可通过查询结果按钮查询银行处理结果。", + confirmText: '确定', + success: function (e) { + _this.back() + } + }) + }, + fail:(res) => { + UTIL.showToastNoneIcon(res) + } + }) + }else{ + let params = { + id : this.data.data.id, + accountPassword:this.data.data.accountPassword, + bankType: this.data.data.bankType } UTIL.httpRequest(API.URL_GET_PAY,params,{ success: (res) => { @@ -169,7 +193,7 @@ Page({ content: res.msg, confirmText: '确定', success: function (e) { - _this.back() + } }) } @@ -178,27 +202,6 @@ Page({ UTIL.showToastNoneIcon(res) } }) - }else{ - let params = { - id : this.data.data.id, - accountPassword:this.data.data.accountPassword - } - UTIL.httpRequest(API.URL_GET_PAY,params,{ - success: (res) => { - wx.showModal({ - title: "", - showCancel: false, - content: "支付成功,请等待银行进行处理,稍后可通过查询结果按钮查询银行处理结果。", - confirmText: '确定', - success: function (e) { - _this.back() - } - }) - }, - fail:(res) => { - UTIL.showToastNoneIcon(res) - } - }) } }, @@ -208,28 +211,36 @@ Page({ sendMsg(){ let _this = this let params = { - id : this.data.data.id + id : this.data.data.id, + bankType: this.data.data.bankType } if(this.data.msgTime>0){ return false } UTIL.httpRequest(API.URL_GET_SENDMSG,params,{ success: (res) => { - if (res.toString().indexOf('短信发送失败') == -1){ - _this.setData({'msgText':180+'s后可重新发送','msgTime':180}) - _this.msgTimer = setInterval(()=>{ - let tt = _this.data.msgTime - _this.setData({'msgText':tt--+'s后可重新发送','msgTime':tt}) - if (_this.data.msgTime == 0){ - clearInterval(_this.msgTimer); - _this.msgTime = 0 ; - _this.smsText = ''; - } - },1000) + if (res.code == API.SUCCESS_CODE) { + if (res.toString().indexOf('短信发送失败') == -1){ + _this.setData({'msgText':180+'s后可重新发送','msgTime':180}) + _this.msgTimer = setInterval(()=>{ + let tt = _this.data.msgTime + _this.setData({'msgText':tt--+'s后可重新发送','msgTime':tt}) + if (_this.data.msgTime == 0){ + clearInterval(_this.msgTimer); + _this.msgTime = 0 ; + _this.smsText = ''; + } + },1000) + }else{ + UTIL.showToastNoneIcon("短信发送失败,请联系管理员!"); + } }else{ - UTIL.showToastNoneIcon("短信发送失败,请联系管理员!"); + UTIL.showToastNoneIcon(res.msg); } - } + }, + fail:(res) => { + UTIL.showToastNoneIcon(res) + } }) }, bindPickerChange:function(e){ diff --git a/pages/paymentManager/toPay/toPay.wxml b/pages/paymentManager/toPay/toPay.wxml index fb5daa2..f71fb1b 100644 --- a/pages/paymentManager/toPay/toPay.wxml +++ b/pages/paymentManager/toPay/toPay.wxml @@ -45,25 +45,33 @@ -- - -- - - - -- \ No newline at end of file diff --git a/pages/transaction/transaction.js b/pages/transaction/transaction.js index a666e0b..e88f2ba 100644 --- a/pages/transaction/transaction.js +++ b/pages/transaction/transaction.js @@ -14,6 +14,7 @@ Page({ option1: [], option2: [], option3: [], + list: [], value1: '', value2: '', value3: '', @@ -39,7 +40,21 @@ Page({ }); }, projectId:'', - projectValue:'' + projectValue:'', + pageNums:1, + params:{ + actacn:'' , //付款账户 + payeeActacn: '' , //收款账号 + payeeToname:'' , //收款人 + transtype:'' ,// 业务类型 数据字典:trans_type + direction:'' ,// 来往账标识 数据字典:direction + pageSize:'10', + pageNum:1, + method:'POST', + }, + recordform: {}, + formSms: {}, + recordopen4: false }, /** @@ -47,6 +62,17 @@ Page({ */ onLoad(options) { var that = this; + let qu = wx.createSelectorQuery() + qu.select("#top_view").boundingClientRect() + qu.select("#top_ban").boundingClientRect() + qu.select("#top_view1").boundingClientRect() + qu.select("#top_view2").boundingClientRect() + qu.exec(res => { + console.log(res); + that.setData({ + scrollHeight:wx.getWindowInfo().windowHeight-res[3].top + }) + }) // 对账状态字典查询 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'check_status', {method:'GET'}, { success: (res) => { @@ -99,11 +125,9 @@ Page({ method:'GET', accountType:102 } - UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{ success: (res) => { console.log(res.rows) - let option1 = []; res.rows.map(rr=>{ console.log(rr); @@ -111,28 +135,51 @@ Page({ text: rr.accountName, value: rr.bankAccountNumber }) }) - that.setData({ option1:option1, value1:res.rows[0].bankAccountNumber, result1:res.rows[0].bankAccountNumber, accountList:res.rows }) - let perames = {method:'POST',actacn:res.rows[0].bankAccountNumber,pageSize:'10'} - //交易明细列表 - UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , perames, { - success: (res) => { - res.rows.map(rrr=>{ - rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); - }) - that.setData({ - list:res.rows - }) - } + console.log(res.rows[0].bankAccountNumber); + let actacnName = (that.data.option1).filter(function (e) { return e.value == that.data.result1; }); + that.setData({ + actacnName:actacnName[0].text, + ["params.actacn"]:res.rows[0].bankAccountNumber }) + that.getData(); } }) }, + getData(){ + var that = this; + let data = that.data.list; + //交易明细列表 + UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , this.data.params, { + success: (res) => { + console.log(res); + console.log(res.total +'---------------------'+ data.length); + if(res.total <= data.length){ + return; + }else{ + res.rows.map(rrr=>{ + rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); + data.push(rrr); + }) + that.setData({ + list:data + }) + } + + } + }) + }, + paging(){ + this.setData({ + pageNums:this.data.pageNums+1, + }) + this.getData(); + }, goSubmit(){ var that = this ; let form = { @@ -171,13 +218,13 @@ Page({ bindDateBeginChange: function(e) { console.log('picker发送选择改变,携带值为', e.detail.value) this.setData({ - beginApplyDate: e.detail.value + ['params.params.beginApplyDate']:e.detail.value, }) }, bindDateEndChange: function(e) { console.log('picker发送选择改变,携带值为', e.detail.value) this.setData({ - endApplyDate: e.detail.value + ['params.params.endApplyDate']:e.detail.value, }) }, reset(){ @@ -202,7 +249,10 @@ Page({ }) }, onClose() { - this.setData({ showPopup: false }); + this.setData({ + showPopup: false, + recordopen4: false + }); }, onChangeZH(event) { console.log(event.detail); @@ -225,106 +275,46 @@ Page({ changeTab1(event){ var that = this ; let actacnName = (that.data.option1).filter(function (e) { return e.value == event.detail; }); - console.log(actacnName); this.setData({ result1: event.detail, value1: event.detail, - actacnName:actacnName[0].text + actacnName:actacnName[0].text, + ['params.actacn']:event.detail, + ['params.pageNum']:1, + list:[] }); - let form = { - actacn:that.data.result1 , //付款账户 - transtype:that.data.result2 ,// 业务类型 数据字典:trans_type - direction:that.data.result3 ,// 来往账标识 数据字典:direction - pageNum:'1', - pageSize:'10', - method:'POST', - } - console.log(form); - UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , form, { - success: (res) => { - res.rows.map(rrr=>{ - rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); - }) - that.setData({ - list:res.rows, - showPopup:false - }) - } - }) - // UTIL.httpRequest(API.URL_GET_GETRECONCILIATIONMOBILE , form, { - // success: (res) => { - // res.rows.map(rrr=>{ - // rrr.checkStatusText = UTIL.getTransform(rrr.checkStatus,that.data.checkStatusOptions); - // }) - // that.setData({ - // list:res.rows, - // showPopup:false - // }) - // } - // }) + this.getData(); }, changeTab2(event){ this.setData({ result2: event.detail, - value2: event.detail + value2: event.detail, + ['params.transtype']:event.detail, + ['params.pageNum']:1, + list:[] }); - var that = this ; - let form = { - actacn:that.data.result1 , //付款账户 - transtype:that.data.result2 ,// 业务类型 数据字典:trans_type - direction:that.data.result3 ,// 来往账标识 数据字典:direction - pageSize:'10', - method:'POST', - } - console.log(form); - UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , form, { - success: (res) => { - res.rows.map(rrr=>{ - rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); - }) - that.setData({ - list:res.rows, - showPopup:false - }) - } - }) + this.getData(); }, changeTab3(event){ this.setData({ result3: event.detail, - value3: event.detail + value3: event.detail, + ['params.direction']:event.detail, + ['params.pageNum']:1, + list:[] }); - var that = this ; - let form = { - actacn:that.data.result1 , //付款账户 - transtype:that.data.result2 ,// 业务类型 数据字典:trans_type - direction:that.data.result3 ,// 来往账标识 数据字典:direction - pageSize:'10', - method:'POST', - } - console.log(form); - UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , form, { - success: (res) => { - res.rows.map(rrr=>{ - rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); - }) - that.setData({ - list:res.rows, - showPopup:false - }) - } - }) + this.getData(); }, minInput(e){ var that = this ; that.setData({ - txnamtMin: e.detail.value, //金额范围 最小 + ['params.params.txnamtMin']:e.detail.value, }) }, maxInput(e){ var that = this ; that.setData({ - xnamtMax: e.detail.value, //金额范围最大 + ['params.params.xnamtMax']:e.detail.value, }) }, openDZ(e){ @@ -440,8 +430,6 @@ Page({ }) } } - - }, showTransactionDialog(){ wx.navigateTo({ @@ -452,31 +440,30 @@ Page({ console.log(e); var that = this; let form = { - actacn:that.data.result1 , //付款账户 - payeeActacn: '' , //收款账号 payeeToname:e.detail , //收款人 - transtype:that.data.result2 ,// 业务类型 数据字典:trans_type - direction:that.data.result3 ,// 来往账标识 数据字典:direction params:{ beginTxnDate:that.data.beginApplyDate, endTxnDate:that.data.endApplyDate, txnamtMin:that.data.txnamtMin, txnamtMax:that.data.xnamtMax, }, - pageSize:'10', - method:'POST', } - UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , form, { - success: (res) => { - res.rows.map(rrr=>{ - rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); - }) - that.setData({ - list:res.rows, - showPopup:false - }) - } - }) + this.setData({ + list:[], + ['params.payeeToname']:e.detail + }); + this.getData(); + // UTIL.httpRequest(API.URL_GET_GETRECORDETAILLIST , form, { + // success: (res) => { + // res.rows.map(rrr=>{ + // rrr.directionText = UTIL.getTransform(rrr.direction,that.data.directionOptions); + // }) + // that.setData({ + // list:res.rows, + // showPopup:false + // }) + // } + // }) }, /** * 生命周期函数--监听页面初次渲染完成 @@ -525,5 +512,239 @@ Page({ */ onShareAppMessage() { + }, + + handleHuidan(rows) { + console.log(rows); + this.data.recordform.id = rows.currentTarget.dataset.row.id; + this.data.recordform.method = 'GET'; + this.data.recordListOpen = false; + UTIL.httpRequest(API.transactionDetailsQuery2OnlyQuery , this.data.recordform, { + success: (response) => { + this.setData({ + tYinnongTradingRecordDetailList: response.data, + recordListOpen: true, + title: "查看回单列表数据" + }) + } + }) + }, + handleView1(rows){ + let dataRow = rows.currentTarget.dataset.row; + if(dataRow.alternateField2 != null && dataRow.alternateField2 != "" && dataRow.alternateField2.indexOf('失败') == -1){ + this.showfileFunction(dataRow.alternateField2); + } else{ + UTIL.showToastNoneIcon("暂无回单,请到村账户模块查询电子回单!"); + } + }, + handleView2(rows){ + this.checkId = rows.currentTarget.dataset.row.id; + this.yinnongTransfersIndexOpen = false; + this.tYinnongTransferDetaiList = []; + const baseURL = wx.getStorageSync('dressCode'); + //console.info(baseURL); + const id = rows.currentTarget.dataset.row.id || this.ids + if(rows.currentTarget.dataset.row.alternateField2 != null && rows.currentTarget.dataset.row.alternateField2 != "" && rows.currentTarget.dataset.row.alternateField2.indexOf('失败') == -1){ + this.receiptUrl = baseURL+rows.currentTarget.dataset.row.alternateField2; + this.recordopen = true; + if(rows.currentTarget.dataset.row.transferId != null){ + this.yinnongTransfersListOpen = true; + this.yinnongTransfersIndexApplyOpen = false; + this.tYinnongTransferDetaiList=[]; + queryTransferDetail(rows.currentTarget.dataset.row.transferId).then((res) => { + this.yinnongTransfersIndexOpen = true; + for (let i = 0 ; i < res.rows.length; i++){ + res.rows[i].transferStatus = this.transferStatusFormat(res.rows[i]) + this.tYinnongTransferDetaiList.push(res.rows[i]) + } + }); + }else{ + this.yinnongTransfersListOpen = false; + } + } else { + bankReceiptPhoto(rows.currentTarget.dataset.row.id).then((response) => { + //console.info(response); + if (response.code === 200) { + this.receiptUrl =baseURL+ response.msg; + this.recordopen = true; + this.getList(); + } + }); + } + }, + handleView3(rows){ + const id = rows.currentTarget.dataset.row.id; + let dataRow = rows.currentTarget.dataset.row; + if(dataRow.alternateField2 != null && dataRow.alternateField2 != "" && dataRow.alternateField2.indexOf('失败') == -1){ + this.showfileFunction(dataRow.alternateField2); + } else{ + UTIL.httpRequest(API.getDianzihuidan + id , {method: 'GET'}, { + success: (response) => { + if(response.data.alternateField2 != null && response.data.alternateField2 != "" && response.data.alternateField2.indexOf('失败') ==-1){ + this.showfileFunction(response.data.alternateField2); + } else{ + UTIL.showToastNoneIcon(response.data.alternateField2); + } + } + }) + } + }, + handleView4(rows){ + let row = rows.currentTarget.dataset.row; + if(row.alternateField2 != null && row.alternateField2 != "" && row.alternateField2.indexOf('失败') == -1){ + this.showfileFunction(row.alternateField2); + } else { + UTIL.httpRequest(API.queryReceiptPhoto4 + row.id , {method: 'GET'}, { + success: (response) => { + this.setData({ + recordopen4: true + }) + } + }) + } + }, + handleView5(rows){ + let dataRow = rows.currentTarget.dataset.row; + if(dataRow.alternateField2 != null && dataRow.alternateField2 != "" && dataRow.alternateField2.indexOf('失败') == -1){ + this.showfileFunction(dataRow.alternateField2); + } else { + UTIL.httpRequest(API.queryReceiptPhoto5 + dataRow.id , {method: 'GET'}, { + success: (response) => { + if (response.code === 200) { + this.showfileFunction(response.msg); + }else{ + UTIL.showToastNoneIcon(response.msg); + } + } + }) + } + }, + handleView6(rows){ + let dataRow = rows.currentTarget.dataset.row; + if(dataRow.alternateField2 != null && dataRow.alternateField2 != "" && dataRow.alternateField2.indexOf('失败') == -1){ + const filenames = dataRow.alternateField2.split("|"); + if(filenames.length == 1){ + this.showfileFunction(filenames[0]); + }else{ + for (var i=0;i*{{msgText}} + ++ -+ +等待领导复核中。。。 ++ {{ data.doubleConfirmationUser +'已于'+data.doubleConfirmationTime +'进行复核。'}} +- -- 取消 -支付 ++ + -- - \ No newline at end of file ++ + + ++ + +*{{msgText}} ++ ++ +取消 +支付 ++ { + if (response.code === 200) { + const filenames = response.msg.split("|"); + if(filenames.length == 1){ + this.showfileFunction(filenames[0]); + }else{ + for (var i=0;i { + if (response.code === 200) { + const filenames = response.msg.split("|"); + if(filenames.length == 1){ + this.showfileFunction(filenames[0]); + }else{ + for (var i=0;i { + if (response.code === 200) { + if(response.data.alternateField2 != null && response.data.alternateField2 != "" && response.data.alternateField2.indexOf('失败') ==-1){ + this.showfileFunction(response.data.alternateField2); + } else{ + UTIL.showToastNoneIcon(response.msg); + } + }else{ + UTIL.showToastNoneIcon(response.msg); + } + } + }) + } + }, + /** 绑定手机号操作 */ + smsSubmitForm() { + this.formSms.method = 'GET'; + UTIL.httpRequest(API.bankReceiptPhoto4sms , this.formSms, { + success: (response) => { + if (response.code === 200) { + this.setData({ + recordopen4: false + }) + this.showfileFunction(response.msg); + }else{ + UTIL.showToastNoneIcon(response.msg); + } + } + }) + }, + + showfileFunction(url){ + const baseURL = wx.getStorageSync('dressCode'); + if(url.indexOf('pdf') < 0){ + wx.previewImage({ + current: baseURL+ url, // 当前显示图片的http链接 + urls: [baseURL+ url] // 需要预览的图片http链接列表 + }) + }else{ + wx.downloadFile({ + // 示例 url,并非真实存在 + url: baseURL+url, + success: function (res) { + const filePath = res.tempFilePath; + wx.openDocument({ + filePath: filePath, + fileType: 'pdf', // 注意这里需要指定文件类型为'pdf' + success: function (res) { + console.log('打开文档成功'); + }, + fail: function (err) { + UTIL.showToastNoneIcon('打开文档失败'); + } + }); + }, + fail: function (err) { + UTIL.showToastNoneIcon('下载文件失败'); + } + }); + } } + }) \ No newline at end of file diff --git a/pages/transaction/transaction.wxml b/pages/transaction/transaction.wxml index 0ac4547..fbf0945 100644 --- a/pages/transaction/transaction.wxml +++ b/pages/transaction/transaction.wxml @@ -4,7 +4,7 @@ 交易明细 -+ - + -@@ -25,54 +25,118 @@ + - - - - + + ++ ++ ++ ++ +凭证编号{{item.vchnum}} +{{item.payerAccount}} +{{item.vchnum}} ++ +我 ++ +{{actacnName}} +{{item.directionText}} ++ +对 +{{item.payeeToname}} +{{item.payeeActacn}} ++ ++ {{item.txndate}} +¥ +{{item.direction == '1' ? '+' : item.furinfo!='冲正' ? '-':''}}{{item.txnamt}} + + + + + + ++ ++ 重查回单列表 +- - -凭证编号{{item.vchnum}} -{{item.payerAccount}} ++ 电子回单 {{item.vchnum}} - 我 + +- - -{{actacnName}} ++ 电子回单 {{item.directionText}} - -对 -{{item.payeeToname}} -{{item.payeeActacn}} + ++ -+ + 电子回单 +- -- {{item.txndate}} -¥ + +{{item.direction == '1' ? '+' : item.furinfo!='冲正' ? '-':''}}{{item.txnamt}} + -+ + 电子回单 +- - - -- -- 回单 + ++ + ++ + 电子回单 ++ + ++ ++ 电子回单 ++ + ++ ++ 电子回单 ++ ++ ++ 电子回单 ++ + + + +var indexOf = function(name,value){ return name.indexOf(value); diff --git a/pages/user/login/login.js b/pages/user/login/login.js index fe57d3c..4229aa3 100644 --- a/pages/user/login/login.js +++ b/pages/user/login/login.js @@ -64,8 +64,8 @@ Page({ wx.setStorageSync('sessionKey', res.data.sessionKey); getApp().globalData.userInfo.token = res.token; }else{ - wx.setstorageSync('openId', res.data.openId); - wx.setStorageSync('sessionKey', res.data.sessionkey); + wx.setStorageSync('openId', res.data.openId); + wx.setStorageSync('sessionKey', res.data.sessionKey); this.setData({showPhoneBtn:true}) } } else { @@ -155,7 +155,7 @@ Page({ } //console.log(detail) let sendData = { - sessionKey:STORAGE.getSessionKey(), + sessionKey:wx.getStorageSync('sessionKey'), iv:detail.iv, encryptedData:detail.encryptedData } diff --git a/pages/user/region/region.js b/pages/user/region/region.js index 40dda0a..1e3a5ca 100644 --- a/pages/user/region/region.js +++ b/pages/user/region/region.js @@ -35,10 +35,10 @@ Page({ }, goChangeUrl(e){ // https://192.168.0.112:8080/api e.currentTarget.dataset.url - const url = e.currentTarget.dataset.url; + const url = e.currentTarget.dataset.url; //e.currentTarget.dataset.url; const name = e.currentTarget.dataset.name; const parentname = e.currentTarget.dataset.parentname; - wx.setStorageSync('dressCode', url); + wx.setStorageSync('dressCode', url);//'http://116.255.223.226:8082/nsgk_test' wx.setStorageSync('dressName', parentname+'-'+name); getApp().globalData.APIURL = url wx.reLaunch({ diff --git a/project.config.json b/project.config.json index 9b91e68..37f7035 100644 --- a/project.config.json +++ b/project.config.json @@ -1,14 +1,5 @@ { "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "packOptions": { - "ignore": [ - { - "value": ".eslintrc.js", - "type": "file" - } - ], - "include": [] - }, "setting": { "urlCheck": false, "es6": true, @@ -29,8 +20,6 @@ "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], @@ -54,7 +43,15 @@ "tabSize": 2 }, "condition": {}, - "appid": "wx42bfbc1eab7aacce", "compileType": "miniprogram", - "libVersion": "2.23.2" + "packOptions": { + "ignore": [ + { + "value": ".eslintrc.js", + "type": "file" + } + ], + "include": [] + }, + "appid": "wx42bfbc1eab7aacce" } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index b77f4f0..f7428af 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,10 +1,24 @@ { "setting": { - "compileHotReLoad": false + "compileHotReLoad": true }, "condition": { "miniprogram": { "list": [ + { + "name": "pages/finance/list_balance_ranking/list_balance_ranking", + "pathName": "pages/finance/list_balance_ranking/list_balance_ranking", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "pages/finance/list_balance_ranking/list_balance_ranking", + "pathName": "pages/finance/list_balance_ranking/list_balance_ranking", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "pages/user/login/login", "pathName": "pages/user/login/login", @@ -226,5 +240,5 @@ }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "projectname": "nsgk_yebz", - "libVersion": "2.25.0" + "libVersion": "3.7.11" } \ No newline at end of file diff --git a/utils/API.js b/utils/API.js index a94e24c..cda2487 100644 --- a/utils/API.js +++ b/utils/API.js @@ -28,6 +28,10 @@ const URL_POST_USERBAND = `/wechat/phoneLogin`; const URL_GET_GETINFO = `/getInfo`; //获取待办 const URL_GET_TASKLIST = `/activiti/process/taskList`; +//获取待办 +const A_myTodoList = `/approval/audit/todoList`; +//获取已办 +const A_myDoneList = `/approval/audit/doneList`; //获取已办 const URL_GET_TASKDONELIST = `/activiti/process/taskDoneList`; //获取已发起、已制单 @@ -137,6 +141,8 @@ const URL_GET_UPDATETYINNONGTRANSFERFOSTATUS = `/yinnong/transfer/updateTYinnong //查询审批事项流转进度 const URL_GET_GETPROCESS = `/yinnong/transfer/getProcessSchedule/`; +//查询审批事项流转进度(新-2024-7-16) +const URL_GET_GETPROCESSNEW = `/yinnong/transfer/getProcessScheduleInfoNew/`; //查询审批事项流转进度 const URL_GET_GETPROCESSHISTORY = `/activiti/process/listHistory/`; @@ -147,6 +153,9 @@ const URL_GET_GETYRANSFERPROCESS = `/yinnong/transfer/getProcessSchedule/`; //审批流办理 const URL_GET_PROCESSCOMPLETE = `/activiti/process/mobileComplete`; +//审批流办理(新) +const A_audit = `/approval/audit/audit`; + //复核 const URL_GET_TOREVIEWSUBMIT = `/yinnong/approvalItems/toReviewSubmit/`; @@ -380,7 +389,7 @@ const URL_GET_TRANSFERINFOS= `/yinnong/transferDetail/getDetails/`; const URL_GET_SENDMSG= `/yinnong/transfer/sendSms/`; //支付 -const URL_GET_PAY= `/yinnong/transfer/pay/`; +const URL_GET_PAY= `/yinnong/transfer/pay`; //重大事项列表 const URL_GET_MAJOREVENTLIST= `/yinnong/majorevent/list/`; @@ -394,6 +403,9 @@ const URL_POST_MAJOREVENTADD= `/yinnong/majorevent/add/`; //重大事项修改 const URL_POST_MAJOREVENTUPDATE= `/yinnong/majorevent/edit/`; +//重大事项查询审批模板列表 +// const URL_POST_MAJOREVENTUPDATE= `/yinnong/majorevent/edit/`; + //重大事项删除 const URL_GET_MAJOREVENTDELETE= `/yinnong/majorevent/remove/`; @@ -475,6 +487,33 @@ const URL_GET_GETDIANZIHUIDAN2= `/yinnong/receipt/queryReceiptPhoto5/`; //交易明细回单3 const URL_GET_GETDIANZIHUIDAN3= `/yinnong/receipt/queryReceiptPhoto/`; +//回单1 +const transactionDetailsQuery2OnlyQuery= `/yinnong/receipt/transactionDetailsQuery2OnlyQuery`; + +//回单2 +const queryReceiptPhoto= `/yinnong/receipt/queryReceiptPhoto/`; + +//回单3 +const getDianzihuidan= `/yinnong/recordDetail/getDianzihuidan/`; + +//回单4 +const queryReceiptPhoto4= `/yinnong/receipt/queryReceiptPhoto4/`; + +//回单5 +const queryReceiptPhoto5= `/yinnong/receipt/queryReceiptPhoto5/`; + +//回单6 +const queryReceiptPhoto6= `/yinnong/receipt/queryReceiptPhoto6/`; + +//回单8 +const queryReceiptPhoto8= `/yinnong/receipt/queryReceiptPhoto8/`; + +//回单18 +const queryReceiptPhoto18= `/yinnong/receipt/queryReceiptPhoto18/`; + +//验证验证码 +const bankReceiptPhoto4sms= `/yinnong/receipt/bankReceiptPhoto4sms`; + //代管账户列表查询 const URL_GET_GETTACCOUNTLIST= `/yinnong/taccount/list`; @@ -573,6 +612,7 @@ const URL_GET_TRANSFERADD = `/yinnong/transfer/add`; //提交审批 const URL_GET_TRANSFERCUSTOMSUBMIT = `/yinnong/transfer/customSubmit/`; +const URL_GET_TRANSFERCUSTOMSUBMIT2 = `/yinnong/transfer/offlineCustomSubmit/`; //修改银行转账 const URL_GET_TRANSFEREDIT = `/yinnong/transfer/edit`; @@ -583,6 +623,31 @@ const URL_GET_GETCODE = `/gkyzm`; //账号密码登录 const URL_GET_LOGIN = `/login`; +// +const getLoginBook = `/finance/book/getLoginBook`; + +// 查询科目余额表 可分页 需授权 +const trailBalanceList = `/finance/balance/list`; + +//查询资产负债表(公式报表模板) +const assetLiabilityReportByExpTpl = `/finance/report/assetLiabilityReportByExpTpl`; + +//查询收支公开榜 +const financialIncomeExpenditurePublic = `/finance/open/financialIncomeExpenditurePublic`; + +//公式科目模板分类列表 +const expressionReportByCategory = `/finance/expressionReport/category/`; + +//公式科目模板分类列表 +const reapply = `/yinnong/transfer/reapply/`; + + +//查询主体基本信息列表 +const URL_GET_ENTITYLIST = `/entity/entity/list`; + +//查询主体基本信息列表 +const URL_GET_ENTITYDETAIL = `/entity/entity/get/`; + @@ -606,6 +671,8 @@ export { URL_POST_USERBAND, URL_GET_GETINFO, URL_GET_TASKLIST, + A_myTodoList, + A_myDoneList, URL_GET_TASKDONELIST, URL_GET_TRANSFERLIST, URL_POST_UPDATEPWD, @@ -642,8 +709,10 @@ export { URL_GET_USERAPPRO, URL_GET_FINDLIST, URL_GET_APPROVALITEMS, + A_audit, URL_GET_REMOVEAPPROVAL, URL_GET_GETPROCESS, + URL_GET_GETPROCESSNEW, URL_GET_PROCESSCOMPLETE, URL_GET_TOREVIEWSUBMIT, URL_GET_REVIEWPROCESS, @@ -790,11 +859,29 @@ export { URL_GET_TRANSFERREMOVE, URL_GET_TRANSFERADD, URL_GET_TRANSFERCUSTOMSUBMIT, + URL_GET_TRANSFERCUSTOMSUBMIT2, URL_GET_PAYEESELECTLISTNEW, URL_GET_TRANSFEREDIT, URL_GET_REMOVETRANFERL, URL_GET_selectApprovalByTemplateId, URL_GET_UPDATETYINNONGTRANSFERFOSTATUS, URL_GET_GETCODE, - URL_GET_LOGIN + URL_GET_LOGIN, + getLoginBook, + trailBalanceList, + assetLiabilityReportByExpTpl, + financialIncomeExpenditurePublic, + expressionReportByCategory, + transactionDetailsQuery2OnlyQuery, + queryReceiptPhoto, + getDianzihuidan, + queryReceiptPhoto4, + queryReceiptPhoto5, + queryReceiptPhoto6, + queryReceiptPhoto8, + queryReceiptPhoto18, + bankReceiptPhoto4sms, + reapply, + URL_GET_ENTITYLIST, + URL_GET_ENTITYDETAIL } \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index 5e4b4d7..28a63f4 100644 --- a/utils/util.js +++ b/utils/util.js @@ -473,7 +473,7 @@ const hideLoadings = () => { } const hideLoadingWithErrorTips = (err = '加载失败...') => { - hideLoading() + wx.hideLoading() wx.showToast({ title: err, icon: 'error',