From ff3442e3e09d23a76090443b1d2ca77ca3fbed04 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Thu, 2 Jun 2022 15:33:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bankDraft/bankDraft.js | 2 -- pages/bankDraft/bankDraft.wxss | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pages/bankDraft/bankDraft.js b/pages/bankDraft/bankDraft.js index 641039b..cf555ee 100644 --- a/pages/bankDraft/bankDraft.js +++ b/pages/bankDraft/bankDraft.js @@ -118,8 +118,6 @@ Page({ if (response.code == API.SUCCESS_CODE) { for (let i = 0; i < response.rows.length; i++) { response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); - response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); - response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); response.rows[i].orderAmount = Number(response.rows[i].orderAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "") } diff --git a/pages/bankDraft/bankDraft.wxss b/pages/bankDraft/bankDraft.wxss index 8c48f92..42be150 100644 --- a/pages/bankDraft/bankDraft.wxss +++ b/pages/bankDraft/bankDraft.wxss @@ -142,7 +142,7 @@ text{display: block;} margin-top: 10px; } .detail_time text{ - font-size: 14px; + font-size: 12px; margin-left: 5px; color: #878787; } @@ -154,7 +154,7 @@ text{display: block;} } .li .detail_box_left .fkdw{ color: #B5B5B5; - font-size: 14px; + font-size: 12px; margin-top: 5px; } .li .detail_box_center{ @@ -171,7 +171,7 @@ text{display: block;} } .li .detail_box_right .skdw{ color: #B5B5B5; - font-size: 14px; + font-size: 12px; margin-top: 5px; } From 1fdea4bd8319907d79c155f3101f90a7363a3e9b Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Thu, 2 Jun 2022 15:54:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/finance/finance.wxml | 8 ++++---- pages/finance/finance.wxss | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pages/finance/finance.wxml b/pages/finance/finance.wxml index 15d0106..96d73d2 100644 --- a/pages/finance/finance.wxml +++ b/pages/finance/finance.wxml @@ -24,19 +24,19 @@ diff --git a/pages/finance/finance.wxss b/pages/finance/finance.wxss index b52c70e..8c8ac9e 100644 --- a/pages/finance/finance.wxss +++ b/pages/finance/finance.wxss @@ -45,24 +45,21 @@ padding: 10rpx 32.5rpx; } .workflow .workflow_list{ - height: 150rpx; background-color: #fff; border-radius: 24rpx; box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1); - margin-bottom: 20rpx; - padding:15rpx 25rpx 10rpx 35rpx; + padding:25rpx 25rpx 10rpx 35rpx; } .workflow .workflow_list .process_intro{ display: flex; - height: 62rpx; align-items: center; } .workflow .process_intro .name{ - width: 390rpx; - font-size: 34rpx; + max-width: 390rpx; + font-size: 16px; margin-right: 30rpx; - display: flex; + flex:1; justify-content: space-between; align-items: center; } @@ -112,7 +109,7 @@ .workflow .time{ flex: 1; text-align: right; - font-size: 32rpx; + font-size: 12px; color: #9ea1aa; } @@ -135,16 +132,18 @@ width: 32rpx; height: 32rpx; margin-right: 12rpx; + text-align: right; + font-size: 14px; } .workflow .workflow_list .amount{ - font-size: 38rpx; + font-size: 14px; flex: 1; text-align: right; color: #f31e1f; } .workflow .workflow_list .amounts{ - font-size: 38rpx; + font-size: 14px; flex: 1; text-align: right; color:#4caf50; @@ -192,6 +191,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-size: 12px; } .banner { display: flex;background:#4caf50;color:#fff;text-align: center;margin:3%;border-radius: 20rpx;line-height: 50rpx; From 65660a64cfe409ee567c5ac96c5b5ef30084b37f Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 6 Jun 2022 16:15:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- image/icon/cancel_icon.png | Bin 0 -> 1702 bytes image/icon/scrap_icon.png | Bin 0 -> 1841 bytes image/icon/sell_icon.png | Bin 0 -> 2949 bytes image/icon/terminate_icon.png | Bin 0 -> 1182 bytes pages/contract/add/add.js | 2 - pages/contract/contract.js | 28 ++ pages/contract/contract.wxml | 22 +- pages/contract/contract.wxss | 8 + pages/contractAssets/fixedAssets.js | 153 ++++--- pages/contractAssets/fixedAssets.wxml | 54 ++- pages/fixedAssets/change/change.js | 629 ++++++++++++++++++++++++++ pages/fixedAssets/change/change.json | 10 + pages/fixedAssets/change/change.wxml | 280 ++++++++++++ pages/fixedAssets/change/change.wxss | 69 +++ pages/fixedAssets/fixedAssets.js | 51 +++ pages/fixedAssets/fixedAssets.wxml | 28 +- pages/fixedAssets/fixedAssets.wxss | 8 + utils/API.js | 56 ++- 19 files changed, 1336 insertions(+), 65 deletions(-) create mode 100644 image/icon/cancel_icon.png create mode 100644 image/icon/scrap_icon.png create mode 100644 image/icon/sell_icon.png create mode 100644 image/icon/terminate_icon.png create mode 100644 pages/fixedAssets/change/change.js create mode 100644 pages/fixedAssets/change/change.json create mode 100644 pages/fixedAssets/change/change.wxml create mode 100644 pages/fixedAssets/change/change.wxss diff --git a/app.json b/app.json index ba6ba70..d9901ac 100644 --- a/app.json +++ b/app.json @@ -36,7 +36,8 @@ "pages/finance/finance", "pages/Bookkeeping/seeBook/seeBook", "pages/Bookkeeping/seeBookZC/seeBookZC", - "pages/contractAssets/fixedAssets" + "pages/contractAssets/fixedAssets", + "pages/fixedAssets/change/change" ], "window": { "backgroundTextStyle": "light", diff --git a/image/icon/cancel_icon.png b/image/icon/cancel_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2020549cd8a9b175c7dc46f68083208af8a11381 GIT binary patch literal 1702 zcmV;X23h%uP)CsDJ{pbuB2Mf+q4I1OpRv{Q&XvA6+|1 zFrbMcftVOW!ao8AH6fS~)@}L+L_}T7h$zH>4*URNghgyO28@pZLUeqLkMkm7Koj*-zHyD((3~ze7}MOS4VF(=k=#Tu4-pDw(3oTcJK_h6@~yL|;x`$Ln2t1| zKx6q_AX>>lb~6qn&^@eTWTCsbx=seyFd;Fmkd)5=ahi-l13G@ig71_TRU9{<1G)+Q z*jzT?azyzU2o@SKU|JSog|pcAfnFS4gldj@M`IXjc#VwK3!Gj#+N0#q{L;dz)>ODD z3Hd{1laO!+PqDmIV43`$6URAF$lOrXH zh&LY= zbEiakqY{}h=ZL|v=(v{bH&7k_9GCy=-1YrsX-9FtDl;WfuLsvSJLmxfK4B{ z9189jA*0$ur=_h9>d%>;s5S|;?oj8`H$Q-&|=BqgR%J+B|}JJl%YKN3b1OzrkS zM6~vvTAfNY`S(Q2kT=t#vds;F98aq4`U%*>DLbsT>vBx2!*Tb$);V>}Wk{;TK*-yz zxYOlDoKQTe)++~K-)}SxF`r6V}w}mIURmUV{~0dBB_YAWMptsXcqg>?ksdc zb@^p_%5nK4BD9{ZEzo5#!$Mt?!gog(>)y*clLFCt+#2${MS$xv>}yJRaX5T(*kVmi zHf^)&V%!$;JQ4wHNNF*H0wPt5y0D*er+h+SP3}~UkDZ53^VwBgOl5tDDq-^QrJZDC zqr;o(S?&N0)d=}Ro;BQ5d^cNcL_`YukAR_h6SV?0Hbfs{&&idB*N)I)h`BRpVR?9uOl${(Y3!&9+vSgx!BI8`PYH<@79efP`iKpGuG9C@i9SxJ2kjxNO z`Qh^$K^)zsN5^SZ=y&b_pssxS1od-|)(UO6ddyIbe<|JDi?BvecIF?Z4D+*6E>p3VA@SDefi^~KXRZj&}} zgRxtc(}R$>9KICBeVoR}8aI$V4RM&G2uyU3@m=a_HQ|L@n)-l+gL!+Zz}VW;tGY|Unq50eF`=Vjz5n^bwO_VOz2j$ywCE}Tb=GZSx(8nFy<%i*2`bLjGH6+sYE5E3B?T620c%y z3cLU+IvMR@qYlL6d87P7!N{k2)`{t)px4Q0@=)iob5`V6Gzsy3PWun=6Cc7D(et$! wMB=rUdQxz|0<=HRLVr9{SanUWo!;dB1656CCWGnV^#A|>07*qoM6N<$f^tzO>;M1& literal 0 HcmV?d00001 diff --git a/image/icon/scrap_icon.png b/image/icon/scrap_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2e57ff3d07de288f84d64d628e1767e5f4c62b GIT binary patch literal 1841 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 literal 0 HcmV?d00001 diff --git a/image/icon/terminate_icon.png b/image/icon/terminate_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d8802408387418e16a5eefd9ed712bf798c7264f GIT binary patch literal 1182 zcmV;P1Y!G$P)Cd zxP}P@mepB=<(Uy^U`*pwk^M7SrUu4{ZbHml0?X?p;1xy$*wD8cYaP*xql?gck<8yB z*8$Dc3v6@0J1AO~{5P1yEt-TtSPeo89j9x7jb%G4WRRdyM9_E;PflDyIDP>@jdV&F zOJxmWm$3w|#2OQmkP62vvu2NxQSY)JlUOw@zsJ!?MI{88T*!3Nm}qeJoa)|>Zn@EX zDuNIJAnBJ#4-E^P($1uuRtOcKCr0~MA_x%#F7j}fNg<97L(fByIvSHuU>noss8$w) zVVa-#Q#PcY2Vuf2L{#ghVVMOPjt_-Y8=Kqw2trtACykdJ*T@EeSSf!l#1z!1g|JQ! zzjJKBcLSoCchja(LIi^KFl%u`6PskJNS6kw0l$UDQ)G)X0aXyH@j)#S|M_Zlrjkd( zUI&KZ27Q{_N-fL|2<7?koelK7rPW)j-2;S%3ExRRtW(Y09@bJ=tK9>Hl!}Eu{HFkxfAcQLI6OB;sgd)UJ`!=Bn`L{m! z&=6PBU)G8jd)P%jXIM~5O*$4$8v>!`6FAylUb z?LnW~i9iU~+3O?uzLYZ^b(~?Tc)>yhg&hB$9V@BBCv`w&x_E%l0G|)3K|(b!IbfQN zHwM;1sM1g9gUDi%i_g5FmpLs+@^mgD>^{%UC zPJu!Q-3%iX2o5R(xyT%*JEJhdJra%T49j1_G85x16&&EO9P6l@VkDt}mCkUjbZ5Se zNyR$nuuj-6Cn9&G4u^R!J)|Ma7`)@Xdr1MWAO-w6RC3g07-vKo9C)d-%o&cWsY9Up zkb}&cXs38FvwK*n5bPUN#(JlyBNUY0ir+*{UB^vV@~u=(2eljbOksA5SY}PJ6w=JU z1~RJ+ZZAJ9^93D>2?DM0W>=Gt8jPh>-mad`D_t_x8!S_TWxBNF>mn2c!CEJ{uhIgw zxxHbE$nIGppY-4wBBTHV5m3FW3iJrD&`0fB_Tl`^MlcK$3bEEk?vGRLK9jwRQm0s6 zm$~v0V62!X6cmGhtpa2_PP>ik5@X`SdSAd#PV4a#%Rxb}k}7yWs+9i0zi1{ybRNG` wcs?xzNBym(n`d3LckzOJ#Qk@@a^m&-1GDfB#hoR(G5`Po07*qoM6N<$g63Ke>;M1& literal 0 HcmV?d00001 diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js index 1756254..63a793c 100644 --- a/pages/contract/add/add.js +++ b/pages/contract/add/add.js @@ -272,8 +272,6 @@ Page({ UTIL.httpRequest(API.URL_GET_CONTRACTDETAIL + this.data.id, {method:'GET'}, { success: (res) => { this.setData({'form':res.data}); - res.data.biddingDate = res.data.biddingDate.slice(0,9) - res.data.reviewTime = res.data.reviewTime.slice(0,9) let that = this; //获取收入合同状态 UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'type_of_contract', {method:'GET'}, { diff --git a/pages/contract/contract.js b/pages/contract/contract.js index c8c697f..2cc2b96 100644 --- a/pages/contract/contract.js +++ b/pages/contract/contract.js @@ -174,6 +174,34 @@ Page({ }, }) }, + terminate(e){ + UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let list = this.data.list + list[e.currentTarget.dataset.index].contractionStatus = '3' + this.setData({'list':list}) + UTIL.showToastNoneIcon('终止成功！'); + }else{ + UTIL.showToastNoneIcon('终止失败！: '+res.msg); + } + } + }) +}, + cancel(e){ + UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let list = this.data.list + list[e.currentTarget.dataset.index].contractionStatus = '2' + this.setData({'list':list}) + UTIL.showToastNoneIcon('撤销成功！'); + }else{ + UTIL.showToastNoneIcon('撤销失败！: '+res.msg); + } + } + }) +}, relevanceDelete(e){ UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, { success: (res) => { diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml index ce1d460..87ba6bb 100644 --- a/pages/contract/contract.wxml +++ b/pages/contract/contract.wxml @@ -16,7 +16,7 @@ 新增 - + @@ -79,6 +79,24 @@ + + + + + + + 终止 + + + + + + + + 撤销 + + + @@ -109,7 +127,7 @@ - 固定资产 + {{item.assetTable=='t_asset_permanent'?"固定资产":"资源资产"}} {{item.name}} {{item.num}}{{item.unit}} diff --git a/pages/contract/contract.wxss b/pages/contract/contract.wxss index 880ca12..38e5bc5 100644 --- a/pages/contract/contract.wxss +++ b/pages/contract/contract.wxss @@ -71,6 +71,14 @@ text{display: block;} align-items: center; display: flex; } +.moreBox{ + width: 100px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} .deleteBoxAsset{ width: 50px; text-align: center; diff --git a/pages/contractAssets/fixedAssets.js b/pages/contractAssets/fixedAssets.js index 64b77f3..fea752f 100644 --- a/pages/contractAssets/fixedAssets.js +++ b/pages/contractAssets/fixedAssets.js @@ -15,6 +15,7 @@ Page({ data: { isIPX: app.globalData.isIPX, list:[], + list1:[], isLoading:false, pageNums:1, scrollHeight:"", @@ -27,6 +28,11 @@ Page({ itemId:"", assetTypeOptions:[], status:0, + index:0, + array:[ + {assetTable:'t_asset_permanent',assetTableName:'固定资产'}, + {assetTable:'t_asset_resource',assetTableName:'资源性资产'} + ], }, goAdd(){ wx.navigateTo({ @@ -45,6 +51,10 @@ Page({ } }) }, + bindPickerChange:function(e){ + this.setData({index:e.detail.value}); + this.getList() + }, /** * 生命周期函数--监听页面加载 */ @@ -80,64 +90,77 @@ Page({ this.getList(); }, getList:function(){ - let params = { - pageNum:this.data.pageNums, - pageSize:10, + + if(this.data.index == 0){ + let params = { name:this.data.name, - isMin:"Y", useType:'2', - operationType:'1', - assetStatus:'1' + OperationType:'1', + assetStatus:'1', + isMin:'Y' } - UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{ - success: (res) => { - let _this = this - if(res.code == 200){ - if(this.data.pageNums!=1&&this.data.list.length { - if(r.data.length>0){ - let li = lists.map( res => { - r.data.map(rr => { - if(res.assetType == rr.dictValue){ - res.assetType = rr.dictLabel - } - }) - return res + UTIL.httpRequest(API.URL_GET_PERMANENTLIST,params,{ + success: (res) => { + let _this = this + if(res.code == 200){ + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + let li = res.rows.map( ress => { + r.data.map(rr => { + if(ress.assetType == rr.dictValue){ + ress.assetType = rr.dictLabel + } }) - _this.setData({list:li}) - }else{ - _this.setData({list:lists}) - } + return ress + }) + _this.setData({list:li}) + }else{ + _this.setData({list:res.rows}) } - }) - }else if(this.data.pageNums==1){ - //获取资产类别 - UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { - success: (r) => { - if(r.data.length>0){ - let li = res.rows.map( ress => { - r.data.map(rr => { - if(ress.assetType == rr.dictValue){ - ress.assetType = rr.dictLabel - } - }) - return ress + } + }) + }else{ + UTIL.showToastNoneIcon(res.msg); + } + } + }) + }else{ + let params = { + name:this.data.name, + useType : '2', + status : '0' + } + UTIL.httpRequest(API.URL_GET_RESOURCELIST,params,{ + success: (res) => { + let _this = this + if(res.code == 200){ + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'resource_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + let li = res.rows.map( ress => { + r.data.map(rr => { + if(ress.resourceType == rr.dictValue){ + ress.resourceType = rr.dictLabel + } }) - _this.setData({list:li}) - }else{ - _this.setData({list:res.rows}) - } + return ress + }) + _this.setData({list1:li}) + }else{ + _this.setData({list1:res.rows}) } - }) + } + }) + }else{ + UTIL.showToastNoneIcon(res.msg); } - }else{ - UTIL.showToastNoneIcon(res.msg); } - } - }) + }) + } + }, paging(){ this.setData({ @@ -155,12 +178,12 @@ Page({ this.setData({'status':1}) let data = e.currentTarget.dataset.item; data.method = "POST"; - data.assetTable = "t_asset_permanent" + data.assetTable = 't_asset_permanent' data.assetId = e.currentTarget.dataset.item.id data.contractionId = this.data.itemId data.num = e.currentTarget.dataset.item.quantity if(data.unit==""||data.unit==null){ - data.unit = '1' + data.unit = '台' } UTIL.httpRequest(API.URL_GET_ASSETADD,data,{ success: (res) => { @@ -178,6 +201,34 @@ Page({ }) } }, + goUpdate1(e){ + if(this.data.status=='0'){ + this.setData({'status':1}) + let data = e.currentTarget.dataset.item; + data.method = "POST"; + data.assetTable = 't_asset_resource' + data.assetId = e.currentTarget.dataset.item.id + data.contractionId = this.data.itemId + data.num = e.currentTarget.dataset.item.totalArea + if(data.unit==""||data.unit==null){ + data.unit = '亩' + } + UTIL.httpRequest(API.URL_GET_ASSETADD,data,{ + success: (res) => { + if(res.code == 200){ + UTIL.showToastNoneIcon(res.msg); + this.setData({'status':0}) + wx.navigateBack({ + delta: 1 + }) + }else{ + UTIL.showToastNoneIcon(res.msg); + this.setData({'status':0}) + } + } + }) + } +}, delete(e){ UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, { success: (res) => { diff --git a/pages/contractAssets/fixedAssets.wxml b/pages/contractAssets/fixedAssets.wxml index 99ff37e..c0acd32 100644 --- a/pages/contractAssets/fixedAssets.wxml +++ b/pages/contractAssets/fixedAssets.wxml @@ -1,11 +1,12 @@ - 可关联固定资产 + 可关联资产 - + + + + + + {{array[index].assetTableName}} + + + + - - + + @@ -47,6 +57,36 @@ - \ No newline at end of file + + + + + + {{item.name}} + + 自用 + 闲置 + 出租或出借 + 其他 + + + + {{item.code}} + + {{item.resourceType}} + + + + + + + {{item.createTime}} + + + 数量/面积: + {{item.totalArea}} + + + + + \ No newline at end of file diff --git a/pages/fixedAssets/change/change.js b/pages/fixedAssets/change/change.js new file mode 100644 index 0000000..1444ad2 --- /dev/null +++ b/pages/fixedAssets/change/change.js @@ -0,0 +1,629 @@ +// pages/contract/add/add.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + id:null, + form:{}, + assetTypeindex:'0', + changeTypeindex:'0', + depreciationTypeindex:'0', + changeValueindex:'0', + // 折旧方式字典 + depreciationTypeOptions:[], + // 资产类别字典 + assetTypeOptions: [], + // 变更类型字典 + changeTypeOptions: [ + { 'dictLabel':'数量/面积变更','dictValue':'1'}, + { 'dictLabel':'原值变更','dictValue':'2'}, + { 'dictLabel':'预计使用年数变更','dictValue':'3'}, + { 'dictLabel':'累计折旧变更','dictValue':'4'}, + { 'dictLabel':'已折旧年数变更','dictValue':'5'}, + { 'dictLabel':'残值率变更','dictValue':'6'}, + { 'dictLabel':'折旧方式变更','dictValue':'7'}, + ], + status:0, + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + openBox(even){ + this.setData({ + [even.currentTarget.dataset.name]:true + }) + }, + onChange(event){ + this.setData({ + [event.currentTarget.dataset.formname]: event.detail, + }) + }, + closeBox(even){ + this.setData({ + [even.currentTarget.dataset.name]:false + }) + }, + onConfirmChangeType (e) { + let obj = e.detail.value; + this.setData({ + 'form.changeType':this.data.changeTypeOptions[obj].dictValue, + 'changeTypeindex':obj + }) + }, + onConfirmChangeValue(e){ + let obj = e.detail.value; + this.setData({ + 'form.changeValue':this.data.depreciationTypeOptions[obj].dictValue, + 'changeValueindex':obj + }) + }, + onConfirmDepreciationType(e){ + let obj = e.detail.value; + this.setData({ + 'form.depreciationType':this.data.depreciationTypeOptions[obj].dictValue, + 'depreciationTypeindex':obj + }) + }, + onConfirmAssetType (e) { + let obj = e.detail.value; + this.setData({ + 'form.assetType':this.data.assetTypeOptions[obj].dictValue, + 'assetTypeindex':obj + }) + }, + getNewDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time + if(date){ + time = new Date(date); + }else{ + time = new Date(); + } + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + }, + goSubmit:function(){ + if(this.data.changeTypeindex != 6&&(this.data.form.changeValue===''||this.data.form.changeValue==null)){ //变更后值 + UTIL.showToastNoneIcon('变更后值不能给你为空！'); + return false; + }else if(this.data.status == '0'){ + let that = this + this.setData({'status':'1'}) + let data = this.data.form; + data.method = "POST"; + if(this.data.changeTypeindex == 0){ + data.quantity = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATEQUANTITY,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 1){ + data.originalValue = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATEORIGINALVALUE,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 2){ + data.expectedYears = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATEEXPECTEDYEARS,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 3){ + data.depreciationValue = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONVALUE,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 4){ + data.depreciationYears = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONYEARS,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 5){ + data.residualsRate = data.changeValue + UTIL.httpRequest(API.URL_POST_UPDATERESIDUALSRATE,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + }else if(this.data.changeTypeindex == 6){ + data.depreciationType = this.data.depreciationTypeOptions[this.data.changeValueindex].dictValue + UTIL.httpRequest(API.URL_POST_UPDATEDEPRECIATIONMETHOD,data,{ + success: (res) => { + that.setData({'status':'0'}) + if(res.code == 200){ + UTIL.showToastNoneIcon("变更成功"); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon("变更失败："+res.msg); + } + }, + fail: function (response) { + if (typeof fail === FUNCTION_TEXT) { + fail(handleFail(response)); + } else { + showToastNoneIcon(API.MSG_FAIL_HTTP); + } + that.setData({'status':0}) + }, + complete: function (response) { + wx.hideNavigationBarLoading(); + } + }) + } + + + } + }, + bindNewInput: function (e) { + this.setData({ + [e.currentTarget.dataset.name]: e.detail.value + }) + if(e.currentTarget.dataset.name == 'form.originalValue' ){ + this.setData({ + 'form.netSalvage' : (this.data.form.residualsRate*e.detail.value/100).toFixed(2), + 'form.perYearDepreciationValue' : ((e.detail.value-(this.data.form.residualsRate*e.detail.value/100))/this.data.form.expectedYears).toFixed(2), + 'form.netValue':this.data.form.originalValue-this.data.form.depreciationValue + }) + } + if(e.currentTarget.dataset.name == 'form.residualsRate' &&e.detail.value<=100){ + this.setData({ + 'form.netSalvage' : (this.data.form.originalValue*e.detail.value/100)100){ + this.setData({ + 'form.residualsRate' : 5, + }) + } + if(e.currentTarget.dataset.name == 'form.netSalvage' ){ + this.setData({ + 'form.perYearDepreciationValue' : ((this.data.form.originalValue-e.detail.value)/this.data.form.expectedYears).toFixed(2) + }) + } + if(e.currentTarget.dataset.name == 'form.expectedYears' ){ + this.setData({ + 'form.perYearDepreciationValue' : ((this.data.form.originalValue-this.data.form.netSalvage)/e.detail.value).toFixed(2) + }) + } + if(e.currentTarget.dataset.name == 'form.depreciationYears' ){ + this.setData({ + 'form.depreciationValue' : (this.data.form.perYearDepreciationValue*e.detail.value)>this.data.form.originalValue?this.data.form.originalValue:(this.data.form.perYearDepreciationValue*e.detail.value).toFixed(2), + 'form.netValue' : (this.data.form.originalValue-(this.data.form.perYearDepreciationValue*e.detail.value))>=0?(this.data.form.originalValue-(this.data.form.perYearDepreciationValue*e.detail.value).toFixed(2)):0 + }) + } + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + if(options.id!=null&&options.id!=""){ + this.setData({id:options.id}) + //获取收入合同状态 + UTIL.httpRequest(API.URL_GET_PERMANENTDETAIL + this.data.id, {method:'GET'}, { + success: (res) => { + this.setData({'form':res.data}); + let that = this; + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + assetTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.assetType){ + that.setData({'assetTypeindex':ind}) + } + }) + } + } + }) + //获取经营属性 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'operation_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + operationTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.operationType){ + that.setData({'operationTypeindex':ind}) + } + }) + } + } + }) + //获取增加方式 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'add_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + addTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.addType){ + that.setData({'addTypeindex':ind}) + } + }) + } + } + }) + //获取使用情况 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'use_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + useTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.useType){ + that.setData({'useTypeindex':ind}) + } + }) + } + } + }) + //获取折旧方式 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'depreciation_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + depreciationTypeOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.depreciationType){ + that.setData({'depreciationTypeindex':ind}) + } + }) + } + } + }) + //获取资产状态 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_status', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + assetStatusOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.assetStatus){ + that.setData({'assetStatusindex':ind}) + } + }) + } + } + }) + //获取单位 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'fixed_assets_unit', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + unitOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.unit){ + that.setData({'unitindex':ind}) + } + }) + } + } + }) + //获取系统是否 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'sys_yes_no', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + that.setData({ + sysYesNoOptions:r.data, + }) + r.data.map((rr,ind) => { + if(rr.dictValue == res.data.isMin){ + that.setData({'isMinindex':ind}) + } + if(rr.dictValue == res.data.isFormAsset){ + that.setData({'isFormAssetindex':ind}) + } + }) + } + } + }) + } + }) + }else{ + let that = this; + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + assetTypeOptions:res.data, + 'form.assetType':res.data[0].dictValue + }) + } + } + }) + //获取经营属性 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'operation_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + operationTypeOptions:res.data, + 'form.operationType':res.data[0].dictValue + }) + } + } + }) + //获取增加方式 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'add_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + addTypeOptions:res.data, + 'form.addType':res.data[0].dictValue + }) + } + } + }) + //获取使用情况 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'use_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + useTypeOptions:res.data, + 'form.useType':res.data[0].dictValue + }) + } + } + }) + //获取折旧方式 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'depreciation_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + depreciationTypeOptions:res.data, + 'form.depreciationType':res.data[1].dictValue + }) + } + } + }) + //获取资产状态 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_status', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + assetStatusOptions:res.data, + 'form.assetStatus':res.data[0].dictValue + }) + } + } + }) + //获取单位 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'fixed_assets_unit', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + unitOptions:res.data, + 'form.unit':res.data[0].dictValue + }) + } + } + }) + //获取是否 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'sys_yes_no', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + that.setData({ + sysYesNoOptions:res.data, + 'form.isMin':res.data[0].dictValue, + 'form.isFormAsset':res.data[0].dictValue + }) + } + } + }) + } + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/fixedAssets/change/change.json b/pages/fixedAssets/change/change.json new file mode 100644 index 0000000..b8811c7 --- /dev/null +++ b/pages/fixedAssets/change/change.json @@ -0,0 +1,10 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-popup": "@vant/weapp/popup/index", + "van-picker": "@vant/weapp/picker/index", + "van-calendar": "@vant/weapp/calendar/index", + "van-icon":"@vant/weapp/icon/index" + } +} \ No newline at end of file diff --git a/pages/fixedAssets/change/change.wxml b/pages/fixedAssets/change/change.wxml new file mode 100644 index 0000000..8406c22 --- /dev/null +++ b/pages/fixedAssets/change/change.wxml @@ -0,0 +1,280 @@ + + + + {{form.id?"":"新增"}}资产信息 + + + + + 基本信息 + + + + + *资产编码 + + + + + + + + *资产名称 + + + + + + + *资产类别 + + + {{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择资产类别"}} + + + + + + *变更类型 + + + {{changeTypeOptions[changeTypeindex].dictLabel?changeTypeOptions[changeTypeindex].dictLabel:"选择变更类型"}} + + + + + + + + + + 变更信息 + + + + + 数量/面积 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 资产原值 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 预计使用年数 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 累计折旧 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 已折旧年数 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 残值率 + + + + + + + + 变更后 + + + + + + + + 备注 + + + + + + + + + + + 变更信息 + + + + + 折旧方式 + + + + {{depreciationTypeOptions[depreciationTypeindex].dictLabel?depreciationTypeOptions[depreciationTypeindex].dictLabel:"选择折旧方式"}} + + + + + + + 变更后 + + + + {{depreciationTypeOptions[changeValueindex].dictLabel?depreciationTypeOptions[changeValueindex].dictLabel:"选择折旧方式"}} + + + + + + + 备注 + + + + + + + + + 保存 + \ No newline at end of file diff --git a/pages/fixedAssets/change/change.wxss b/pages/fixedAssets/change/change.wxss new file mode 100644 index 0000000..19cc453 --- /dev/null +++ b/pages/fixedAssets/change/change.wxss @@ -0,0 +1,69 @@ +/* pages/payee/add/add.wxss */ +.main-box{ + background: #ffffff; + padding: 20px; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} +.table-box van-field van-cell .van-cell{ + margin-bottom: 15px; +} +.table-box van-field:last-child van-cell .van-cell{ + margin-bottom: 0px; +} +.van-cell{ + padding: 0!important; + margin-bottom: 15px; +} +.van-cell__value { + display: flex; + justify-content: flex-end; +} +.van-radio--horizontal { + margin-right: 0!important; + margin-left: var(--padding-sm,12px) +} +.van-cell--required:before { + left: 0!important; +} + +.van-field__label { + padding-left: 10px; +} +.tit{ + line-height: 20px; + font-size: 16px; + font-weight: bold; +} +.bottom{ + width: 100%; + margin: 0 auto; + text-align: center; + margin-top: 30px; + margin-bottom: 30px; + display: flex; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 8px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + color: #fff; +} +.table-boxs>view{ + display: flex; + justify-content: space-between; + line-height: 80rpx; +} +.table-box text{ + line-height: 80rpx; +} \ No newline at end of file diff --git a/pages/fixedAssets/fixedAssets.js b/pages/fixedAssets/fixedAssets.js index 1f70e48..44eea76 100644 --- a/pages/fixedAssets/fixedAssets.js +++ b/pages/fixedAssets/fixedAssets.js @@ -159,6 +159,57 @@ Page({ url: '/pages/fixedAssets/add/add?id='+e.currentTarget.dataset.id, }) }, + scrap(e){ + console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index); + if(e.currentTarget.dataset.data.assetStatus != 1){ + UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!'); + return false; + }else if(e.currentTarget.dataset.data.useType == 3){ + UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!'); + return false; + }else{ + UTIL.httpRequest(API.URL_GET_UPDATERSCRAP + e.currentTarget.dataset.data.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(e.currentTarget.dataset.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('报废成功！'); + }else{ + UTIL.showToastNoneIcon('报废失败！：'+res.msg); + } + } + }) + } + }, + sell(e){ + console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index); + if(e.currentTarget.dataset.data.assetStatus != 1){ + UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!'); + return false; + }else if(e.currentTarget.dataset.data.useType == 3){ + UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!'); + return false; + }else{ + UTIL.httpRequest(API.URL_GET_UPDATERSALE + e.currentTarget.dataset.data.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(e.currentTarget.dataset.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('出售成功！'); + }else{ + UTIL.showToastNoneIcon('出售失败！：'+res.msg); + } + } + }) + } + }, + change(e){ + wx.navigateTo({ + url: '/pages/fixedAssets/change/change?id='+e.currentTarget.dataset.id, + }) + }, delete(e){ this.setData({ 'itemId':e.currentTarget.dataset.id, diff --git a/pages/fixedAssets/fixedAssets.wxml b/pages/fixedAssets/fixedAssets.wxml index e5ad757..8dae8c5 100644 --- a/pages/fixedAssets/fixedAssets.wxml +++ b/pages/fixedAssets/fixedAssets.wxml @@ -16,7 +16,7 @@ 新增 - + @@ -46,6 +46,24 @@ + + + + + + + 报废 + + + + + + + + 出售 + + + @@ -63,6 +81,14 @@ 附件 + + + + + + 变更 + + diff --git a/pages/fixedAssets/fixedAssets.wxss b/pages/fixedAssets/fixedAssets.wxss index 9e63322..75d3fef 100644 --- a/pages/fixedAssets/fixedAssets.wxss +++ b/pages/fixedAssets/fixedAssets.wxss @@ -71,6 +71,14 @@ text{display: block;} align-items: center; display: flex; } +.moreBox{ + width: 90px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} .workflow .workflow_list{ height: 150rpx; background-color: #fff; diff --git a/utils/API.js b/utils/API.js index 791d191..0e85225 100644 --- a/utils/API.js +++ b/utils/API.js @@ -266,6 +266,12 @@ const URL_GET_SUBJECTLIST = `${URL_PREFIX}/finance/subject/list?is_last=Y`; //固定资产列表 const URL_GET_PERMANENTLIST = `${URL_PREFIX}/asset/permanent/list/`; +//可关联固定资产列表 +const URL_GET_PERMANENTLISTS = `${URL_PREFIX}/asset/permanent/listContractPermanentList/`; + +//可关联资源性资产列表 +const URL_GET_RESOURCELIST = `${URL_PREFIX}/asset/resource/listContractResourceList/`; + //固定资产删除 const URL_GET_PERMANENTDELETE = `${URL_PREFIX}/asset/permanent/remove/`; @@ -312,7 +318,41 @@ const URL_GET_UPLOADFILE = `${URL_PREFIX}/yinnong/transfer/importData`; //下载收款人模板 const URL_GET_DOWNFILE = `${URL_PREFIX}/yinnong/transfer/importTemplate`; +//合同终止 +const URL_GET_TERMINATEINFO = `${URL_PREFIX}/contraction/info/terminateInfo/`; + +//合同撤销 +const URL_GET_CANCELINFO = `${URL_PREFIX}/contraction/info/cancelnfo/`; + +//可关联合同列表 +const URL_GET_ASSETLISTALL = `${URL_PREFIX}/contraction/asset/list/`; + +//固定资产变更（数量） +const URL_POST_UPDATEQUANTITY = `${URL_PREFIX}/asset/permanent/updateQuantity`; + +//固定资产变更（原值） +const URL_POST_UPDATEORIGINALVALUE = `${URL_PREFIX}/asset/permanent/updateOriginalValuePermanent`; + +//固定资产变更（折旧方式） +const URL_POST_UPDATEDEPRECIATIONMETHOD = `${URL_PREFIX}/asset/permanent/updateDepreciationMethod`; + +//固定资产变更（预计使用年数） +const URL_POST_UPDATEEXPECTEDYEARS = `${URL_PREFIX}/asset/permanent/updateExpectedYears`; + +//固定资产变更（已折旧年数） +const URL_POST_UPDATEDEPRECIATIONYEARS = `${URL_PREFIX}/asset/permanent/updateDepreciationYears`; + +//固定资产变更（累计折旧） +const URL_POST_UPDATEDEPRECIATIONVALUE = `${URL_PREFIX}/asset/permanent/updateDepreciationValue`; + +//固定资产变更（残值率） +const URL_POST_UPDATERESIDUALSRATE = `${URL_PREFIX}/asset/permanent/updateResidualsRate`; + +//出售固定资产 +const URL_GET_UPDATERSALE = `${URL_PREFIX}/asset/permanent/updateSale/`; +//作废固定资产 +const URL_GET_UPDATESCRAP = `${URL_PREFIX}/asset/permanent/updateScrap/`; /****************接口地址end****************/ @@ -431,5 +471,19 @@ export { URL_GET_PAYEEGET, URL_GET_PAYEEREMOVE, URL_GET_UPLOADFILE, - URL_GET_DOWNFILE + URL_GET_DOWNFILE, + URL_GET_TERMINATEINFO, + URL_GET_CANCELINFO, + URL_GET_ASSETLISTALL, + URL_GET_RESOURCELIST, + URL_GET_PERMANENTLISTS, + URL_POST_UPDATEQUANTITY, + URL_POST_UPDATEORIGINALVALUE, + URL_POST_UPDATEDEPRECIATIONMETHOD, + URL_POST_UPDATEEXPECTEDYEARS, + URL_POST_UPDATEDEPRECIATIONYEARS, + URL_POST_UPDATEDEPRECIATIONVALUE, + URL_POST_UPDATERESIDUALSRATE, + URL_GET_UPDATERSALE, + URL_GET_UPDATESCRAP } \ No newline at end of file From 17e55126a0ca4d61eafe9149d721ad5efc623ac0 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 6 Jun 2022 19:33:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 +- image/icon/clock_red_icon.png | Bin 0 -> 644 bytes image/icon/paymentManager_icon.png | Bin 0 -> 535 bytes image/index/paymentManager_icon.png | Bin 0 -> 1956 bytes pages/fixedAssets/fixedAssets.js | 2 +- pages/index/index.wxml | 4 + pages/paymentManager/paymentManager.js | 504 +++++++++++++++++++++++ pages/paymentManager/paymentManager.json | 16 + pages/paymentManager/paymentManager.wxml | 116 ++++++ pages/paymentManager/paymentManager.wxss | 285 +++++++++++++ utils/API.js | 7 +- 11 files changed, 935 insertions(+), 3 deletions(-) create mode 100644 image/icon/clock_red_icon.png create mode 100644 image/icon/paymentManager_icon.png create mode 100644 image/index/paymentManager_icon.png create mode 100644 pages/paymentManager/paymentManager.js create mode 100644 pages/paymentManager/paymentManager.json create mode 100644 pages/paymentManager/paymentManager.wxml create mode 100644 pages/paymentManager/paymentManager.wxss diff --git a/app.json b/app.json index d9901ac..839086c 100644 --- a/app.json +++ b/app.json @@ -37,7 +37,9 @@ "pages/Bookkeeping/seeBook/seeBook", "pages/Bookkeeping/seeBookZC/seeBookZC", "pages/contractAssets/fixedAssets", - "pages/fixedAssets/change/change" + "pages/fixedAssets/change/change", + "pages/paymentManager/paymentManager", + "pages/paymentManager/toPay/toPay" ], "window": { "backgroundTextStyle": "light", diff --git a/image/icon/clock_red_icon.png b/image/icon/clock_red_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b162b7100ea69c8d6946bc8eac479db73f9e27a7 GIT binary patch literal 644 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 固定资产 + + + 支付管理 + diff --git a/pages/paymentManager/paymentManager.js b/pages/paymentManager/paymentManager.js new file mode 100644 index 0000000..39911b1 --- /dev/null +++ b/pages/paymentManager/paymentManager.js @@ -0,0 +1,504 @@ +// pages/paymentManager/paymentManager.js +import * as UTIL from '../../utils/util.js'; +import * as API from '../../utils/API.js'; +let EVN_CONFIG = require('../../env/env'); +const DISTRIBUTE_ENVIROMENT = 'IMGURL'; +let { + URL_PREFIX, +} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT]; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + list:[], + isLoading:false, + pageNums:1, + scrollHeight:"", + name:"", + showUpload:false, + uploadOptions:[], + fileList:[], + showPopup:false, + fileEvent:{}, + itemId:"", + assetTypeOptions:[], + option1: [ + { text: '支付状态', value: '' }, + { text: '待支付', value: '1' }, + { text: '银行受理', value: '3' }, + { text: '支付失败', value: '4' }, + { text: '部分失败', value: '5' }, + ], + option2: [ + { text: '支出类别', value: '' }, + { text: '结算类', value: '1' }, + { text: '工程项目类', value: '2' }, + { text: '合同类', value: '4' }, + { text: '其他', value: '5' }, + ], + option3: [ + { text: '申请类别', value: '' }, + { text: '银行卡转账', value: '1' }, + { text: '信用卡还款', value: '2' }, + ], + value1: '', + value2: '', + value3: '', + }, + goAdd(){ + wx.navigateTo({ + url: 'add/add', + }) + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + assetTypeDict(val){ + this.data.assetTypeOptions.map(res => { + if(res.dictValue == val){ + return res.dictLabel + } + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + var that = this; + let qu = wx.createSelectorQuery() + qu.select("#top_view1").boundingClientRect() + qu.select("#top_ban").boundingClientRect() + qu.exec(res => { + that.setData({ + scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].height-res[0].top + }) + }) + + this.getList(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + + }, + getList:function(){ + let params = { + pageNum:this.data.pageNums, + pageSize:10, + name:this.data.name, + paymentState:this.data.value1, + capitalExpenditureType:this.data.value2, + transferType:this.data.value3 + } + UTIL.httpRequest(API.URL_GET_TRANSFERPAYLIST,params,{ + success: (res) => { + console.log(res); + let _this = this + if(res.code == 200){ + if(this.data.pageNums!=1&&this.data.list.length { + rr.expenditureAmount = Number(rr.expenditureAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, "") + if(index==(res.rows.length-1)){ + lists = _this.data.list.concat(res.rows) + } + }) + + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + let li = lists.map( res => { + r.data.map(rr => { + if(res.assetType == rr.dictValue){ + res.assetType = rr.dictLabel + } + }) + return res + }) + _this.setData({list:li}) + }else{ + _this.setData({list:lists}) + } + } + }) + }else if(this.data.pageNums==1){ + //获取资产类别 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, { + success: (r) => { + if(r.data.length>0){ + let li = res.rows.map( ress => { + ress.originalValue = Number(ress.originalValue ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { + return $1 + ","; }).replace(/\.$/, "") + r.data.map(rr => { + if(ress.assetType == rr.dictValue){ + ress.assetType = rr.dictLabel + } + }) + return ress + }) + _this.setData({list:li}) + }else{ + _this.setData({list:res.rows}) + } + } + }) + } + }else{ + UTIL.showToastNoneIcon(res.msg); + } + } + }) + }, + paging(){ + this.setData({ + pageNums:this.data.pageNums+1, + }) + this.getList(); + }, + goSearch(e){ + this.setData({name:e.detail}); + this.setData({pageNums:1}); + this.getList(); + }, + toPay(e){ + wx.navigateTo({ + url: '/pages/paymentManager/toPay/toPay?id='+e.currentTarget.dataset.id, + }) + }, + scrap(e){ + console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index); + if(e.currentTarget.dataset.data.assetStatus != 1){ + UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!'); + return false; + }else if(e.currentTarget.dataset.data.useType == 3){ + UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!'); + return false; + }else{ + UTIL.httpRequest(API.URL_GET_UPDATERSCRAP + e.currentTarget.dataset.data.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(e.currentTarget.dataset.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('报废成功！'); + }else{ + UTIL.showToastNoneIcon('报废失败！：'+res.msg); + } + } + }) + } + }, + sell(e){ + console.log(e.currentTarget.dataset.data.id,e.currentTarget.dataset.data.index); + if(e.currentTarget.dataset.data.assetStatus != 1){ + UTIL.showToastNoneIcon('只允许修改资产状态为正常的资产!'); + return false; + }else if(e.currentTarget.dataset.data.useType == 3){ + UTIL.showToastNoneIcon('使用状态为出租或出借不允许操作!'); + return false; + }else{ + UTIL.httpRequest(API.URL_GET_UPDATERSALE + e.currentTarget.dataset.data.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(e.currentTarget.dataset.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('出售成功！'); + }else{ + UTIL.showToastNoneIcon('出售失败！：'+res.msg); + } + } + }) + } + }, + change(e){ + wx.navigateTo({ + url: '/pages/fixedAssets/change/change?id='+e.currentTarget.dataset.id, + }) + }, + changeTab(e){ + var that = this ; + that.setData({value1:e.detail}) + + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { + success: (res) => { + UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ + success: (response) => { + if (response.code == API.SUCCESS_CODE) { + + for (let i = 0; i < response.rows.length; i++) { + response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); + response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); + response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); + response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); + } + + that.setData({ + moneyorderList:response.rows + }) + } + } + }) + } + }) + + + }, + changeTab2(e){ + var that = this ; + that.setData({value2:e.detail}) + + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { + success: (res) => { + UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ + success: (response) => { + if (response.code == API.SUCCESS_CODE) { + + for (let i = 0; i < response.rows.length; i++) { + response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); + response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); + response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); + response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); + } + + that.setData({ + moneyorderList:response.rows + }) + } + } + }) + } + }) + + + }, + delete(e){ + this.setData({ + 'itemId':e.currentTarget.dataset.id, + 'itemIndex':e.currentTarget.dataset.index, + "showPopupDel":true + }); + }, + cancelTemDel:function(e){ + this.setData({ + "itemId":"", + "itemIndex":"", + "showPopupDel":false + }); + }, + confirmTemDel:function(e){ + this.setData({ + "showPopupDel":false + }); + UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + this.data.itemId , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(this.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('删除成功！'); + }else{ + UTIL.showToastNoneIcon('删除失败！'); + } + } + }) + }, + upload(e){ + this.setData({itemId:e.currentTarget.dataset.id}); + this.asyncFun(e.currentTarget.dataset.id) + }, + asyncFun(id){ + this.setData({"fileList":[]}) + let uploadList = this.data.uploadOptions + let newList = [] + let _this = this + uploadList.map( res => { + let oData = { + tableId: id, + tableName: "t_asset_permanent", //上传表 + bizPath: "asset", + fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字 + method:'GET' + } + UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, { + success: (rr) => { + if(rr.rows.length>0){ + rr.rows.map((rrr,index) => { + rrr.url = URL_PREFIX + rrr.fileUrl + if(index==rr.rows.length-1){ + newList.push(Object.assign({},res,{"list":rr.rows})) + _this.setData({"fileList":_this.data.fileList.concat(newList)}); + _this.setData({"showUpload":true}) + } + }) + }else{ + let newuploadList = uploadList + newuploadList.map(rd => { + rd.list = newList + }) + _this.setData({"fileList":newuploadList}); + _this.setData({"showUpload":true}) + } + } + }) + }) + + }, + closeBox(){ + this.setData({"showUpload":false}) + }, + deleteImg(event){ + this.setData({"fileEvent":event}) + this.setData({"showPopup":true}); + }, + cancelTem:function(e){ + this.setData({"fileEvent":"{}"}); + this.setData({"showPopup":false}); + }, + confirmTem:function(e){ + let event = this.data.fileEvent + UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let ll = this.data.fileList + var jsonlist = ll[event.target.dataset.idx].list; + jsonlist.splice(event.detail.index, 1) + ll[event.target.dataset.idx].list = jsonlist + this.setData({"fileList":ll}) + this.setData({showPopup:false}); + wx.showToast({ + title: '删除成功！', + icon: 'success', + duration: 2000, + }) + } + } + }) + }, + uploadFile(uploadFile,event) { + let _this = this + return new Promise((resolve, reject) => { + wx.uploadFile({ + url: API.URL_GET_UPLOAD, + filePath: uploadFile.file.file.url, + name: 'file', + header: { + "Content-Type": "multipart/form-data",//记得设置 + "chartset":"utf-8", + 'Authorization':'Bearer '+getApp().globalData.userInfo.token + }, + formData:uploadFile, + success: (res) => { + res.data = JSON.parse(res.data); + if(res.statusCode == 200){ + let files = _this.data.fileList + let fName = res.data.fileUrl.split('/') + let fLength = fName.length + files[event.currentTarget.dataset.idx].list.push({ + "fileName": fName[fLength-1], + "fileType": "0", + "fileUrl":res.data.fileUrl , + "id": res.data.id, + "tableId": 6, + "url":URL_PREFIX+res.data.fileUrl + }) + _this.setData({"fileList":files}) + wx.hideLoading() + } + }, + fail: (err) => { + //上传失败：修改pedding为reject + reject(err) + } + }); + }) + }, + afterRead(event) { + let _this = this + wx.showLoading({ + title: '上传中...' + }) + let fileForm={ + file: event.detail, + fileType:event.currentTarget.dataset.idx, + tableName: "t_asset_permanent", //上传表 + bizPath: "asset", + tableId:_this.data.itemId + } + this.uploadFile(fileForm,event) + }, + lookDown(file,detail){ + // 获取指定字符串最后一次出现的位置，返回index + var index1 = file.detail.url.lastIndexOf('.'); + // substr(start, length) 抽取从start下标开始的length个字符，返回新的字符串; + var style = file.detail.url.substr(index1 + 1) + //判断图片类型，不需要下载，不做处理 + if(style=='png'||style=='jpg'||style=='jpeg'||style=='bmp'||style=='gif'||style=='webp'||style=='psd'||style== 'svg'||style=='tiff'){ + //判断非图片类型 + }else{ + wx.downloadFile({ + url: file.detail.url, + success(data){ + wx.openDocument({ + filePath: data.tempFilePath, + fileType: style, + showMenu:true, + success(res){ + } + }) + } + }) + } + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.setData({'pageNums':1}) + this.getList(); + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/paymentManager/paymentManager.json b/pages/paymentManager/paymentManager.json new file mode 100644 index 0000000..669beb2 --- /dev/null +++ b/pages/paymentManager/paymentManager.json @@ -0,0 +1,16 @@ +{ + "usingComponents": { + "van-checkbox": "@vant/weapp/checkbox/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-search": "@vant/weapp/search/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "van-action-sheet": "@vant/weapp/action-sheet/index", + "van-upload": "@vant/weapp/uploader/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/paymentManager/paymentManager.wxml b/pages/paymentManager/paymentManager.wxml new file mode 100644 index 0000000..7c762ec --- /dev/null +++ b/pages/paymentManager/paymentManager.wxml @@ -0,0 +1,116 @@ + + + + 支出管理 + + + + + + + + + + + + + {{item.payer}} + + + + {{item.payerAccount}} + {{item.transferType==1?"银行还款":"信用卡还款"}} + + + + + + {{item.applyDate}} + + + + {{item.applyDate}} + + + + + + ￥{{item.expenditureAmount}} + + + + + + + + + + + + + + + + + 报废 + + + + + + + + 出售 + + + + + + + + + + 删除 + + + + + + + + 附件 + + + + + + + + 变更 + + + + + + + + + + + + {{item.dictLabel}} + + + + + + + + + + + + + diff --git a/pages/paymentManager/paymentManager.wxss b/pages/paymentManager/paymentManager.wxss new file mode 100644 index 0000000..3882ff4 --- /dev/null +++ b/pages/paymentManager/paymentManager.wxss @@ -0,0 +1,285 @@ +/* pages/paymentManager/paymentManager.wxss */ +.van-search__content { + border: 1px solid #5CAE77!important; + background: #fff!important; +} +van-search { + flex: 0.8; +} +.search_box{ + display: flex; +} +.add_btn{ + flex: 0.2; + padding: var(--search-padding,10px 12px); + padding-left: 0; +} +.add_btn text{ + background-color: #62AD66; + display: block; + height: 100%; + text-align: center; + line-height: 36px; + color: #fff; + border-radius: 36px; + box-shadow: 0px 5px 5px #ddd; +} +text{display: block;} +.work_plan{ + padding: 40rpx 32.5rpx 30rpx; + display: flex; +} + +.work_plan .menu_item{ + background-color: #fff; + box-shadow: 2px 5px 5px #ddd; + border-radius: 60rpx; + text-align: center; + position: relative; + margin-right: 20px; + padding: 8px 10px; +} +.work_plan .menu_item.active{ + background-color: #2C8E68; + color: #fff; +} +.work_plan .menu_item .remind{ + height: 30rpx; + background: #e90101; + color: #fff; + font-size: 26rpx; + position: absolute; + line-height: 30rpx; + padding:0 10rpx; + border-radius: 25px; + top: -10rpx; + right: -10rpx; +} + +.work_plan .more{ + flex: 1; + text-align: center; + line-height: 60rpx; + font-size: 36rpx; + color: #31936c; +} +.deleteBox{ + width: 130px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} +.moreBox{ + width: 90px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} +.workflow .workflow_list{ + height: 150rpx; + background-color: #fff; + border-radius: 24rpx; + box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1); + margin-bottom: 20rpx; + padding:15rpx 25rpx 10rpx 35rpx; +} +.workflow .workflow_list .process_intro{ + display: flex; + height: 62rpx; + align-items: center; +} + +.workflow .process_intro .name{ + width: 390rpx; + font-size: 34rpx; + margin-right: 30rpx; + display: flex; + justify-content: space-between; + align-items: center; +} +.workflow .process_intro .name .name_tit{ + width: 290rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.van-swipe-cell { + width: 94%; + background: #fff; + border-radius: 10px; + box-shadow: 2px 5px 5px #ddd; + margin: 0 auto; + margin-bottom: 15px; +} +.li{ + width: 100%; + padding: 14px; + display: flex; +} +.tit_box{ + display: flex; +} +.detail_box{ + margin-top: 10px; + display: flex; + justify-content: space-between; +} +.li view text{ + /* margin-top: 15px; */ +} +.li .detail_box view{ + display: flex; + align-items: center; +} +.li .detail_box view text{ + color: #666666; + font-size: 12px; +} + +.li view text:nth-child(1){ + margin-top: 0px; +} +.li .fksr{ + display: flex; + align-items: center; + margin-top: 15px; + color: #2C8E68; + font-size: 16px; +} +.li .wtj{ + display: flex; + align-items: center; + justify-content: center; + padding: 3px 8px; + border-radius: 5px; + font-size: 14px; +} +.no{ + background-color:#fbe3e3; + color: #e90000; +} +.white{ + background-color:#feeadc; + color: #fc9a55; +} +.yes{ + background-color:#ddeee3; + color: #5cae77; +} +.other{ + background-color:#f0f1f6; + color: #878787; +} +.li .tit{ + font-size: 16px; + color: #444444; + line-height: 14px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} +.li .fj_name{ + font-size: 14px; + color: #B3DB62; + line-height: 25px; +} +.li .time{ + font-size: 14px; + color: #9B9CAA; +} +.li .money{ + font-size: 18px; + color: #5CAE77; +} +.van-checkbox__label { + display: flex; + justify-content: space-between; + width: 100%; +} + +.van-checkbox__icon-wrap { + border-radius: 5px; +} +.van-checkbox__icon { + border-radius: 5px; + border: 2px solid #2C8E68!important; + background-color: rgba(44, 142, 104, 0.2); +} +.bottom{ + width: 100%; + margin: 0 auto; + text-align: center; + padding: 15px 0; + display: flex; + position: fixed; + bottom: 0%; + background: #fff; + box-shadow: 0 0 5px #ddd; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 10px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + color: #fff; +} + +.downView{ + display: flex; + justify-content: center; + align-items: center; + padding: 0 20px; + border: 1px solid #5CAE77; + border-radius: 50px; + background: #fff; + margin-left: auto; +} +.downView image{ + width: 10px; + height: 8px; + margin-left: 10px; +} +.fj-box text{ + background-color: #5CAE77; + color: #ffffff; + text-align: center; + border-radius: 5px; + white-space:pre-wrap; + padding: 5rpx 8rpx; + width: 50rpx; + margin: 0px 14px; + font-size: 24rpx; +} +.fj-li{ + margin-top: 20px; + display: flex; + /* flex-wrap: wrap; */ +} +.fj-li .img_li{ + width: 100%; + height: 18.5vw; +} + +.fj-li .img_add{ + overflow: hidden; +} +.van-icon-description{ + font-size: 60px; +} +.van-dropdown-menu { + width:100%; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/utils/API.js b/utils/API.js index 0e85225..9c43a02 100644 --- a/utils/API.js +++ b/utils/API.js @@ -354,6 +354,10 @@ const URL_GET_UPDATERSALE = `${URL_PREFIX}/asset/permanent/updateSale/`; //作废固定资产 const URL_GET_UPDATESCRAP = `${URL_PREFIX}/asset/permanent/updateScrap/`; +//查询支付管理列表 +const URL_GET_TRANSFERPAYLIST = `${URL_PREFIX}/yinnong/transfer/payList/`; + + /****************接口地址end****************/ export { @@ -485,5 +489,6 @@ export { URL_POST_UPDATEDEPRECIATIONVALUE, URL_POST_UPDATERESIDUALSRATE, URL_GET_UPDATERSALE, - URL_GET_UPDATESCRAP + URL_GET_UPDATESCRAP, + URL_GET_TRANSFERPAYLIST } \ No newline at end of file From 9a917a2f889e973b4c371ec935d17b32b2038998 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Thu, 9 Jun 2022 14:52:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=8D=E5=A4=A7=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E4=BB=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 +- component/editor/assets/iconfont.wxss | 240 ++++++++++++++ component/editor/editor.js | 178 ++++++++++ component/editor/editor.json | 3 + component/editor/editor.wxml | 50 +++ component/editor/editor.wxss | 34 ++ image/icon/detailNum_icon.png | Bin 0 -> 529 bytes image/icon/payBg.png | Bin 0 -> 2974 bytes image/index/majorEvent_icon.png | Bin 0 -> 1812 bytes pages/index/index.wxml | 4 + pages/majorEvent/add/add.js | 228 +++++++++++++ pages/majorEvent/add/add.json | 21 ++ pages/majorEvent/add/add.wxml | 24 ++ pages/majorEvent/add/add.wxss | 103 ++++++ pages/majorEvent/majorEvent.js | 398 +++++++++++++++++++++++ pages/majorEvent/majorEvent.json | 17 + pages/majorEvent/majorEvent.wxml | 91 ++++++ pages/majorEvent/majorEvent.wxss | 347 ++++++++++++++++++++ pages/paymentManager/paymentManager.js | 164 ++-------- pages/paymentManager/paymentManager.wxml | 59 +--- pages/paymentManager/paymentManager.wxss | 2 +- pages/project/add/add.wxml | 57 ++-- pages/project/add/add.wxss | 2 + style/iconfont.wxss | 41 ++- utils/API.js | 42 ++- 25 files changed, 1893 insertions(+), 216 deletions(-) create mode 100644 component/editor/assets/iconfont.wxss create mode 100644 component/editor/editor.js create mode 100644 component/editor/editor.json create mode 100644 component/editor/editor.wxml create mode 100644 component/editor/editor.wxss create mode 100644 image/icon/detailNum_icon.png create mode 100644 image/icon/payBg.png create mode 100644 image/index/majorEvent_icon.png create mode 100644 pages/majorEvent/add/add.js create mode 100644 pages/majorEvent/add/add.json create mode 100644 pages/majorEvent/add/add.wxml create mode 100644 pages/majorEvent/add/add.wxss create mode 100644 pages/majorEvent/majorEvent.js create mode 100644 pages/majorEvent/majorEvent.json create mode 100644 pages/majorEvent/majorEvent.wxml create mode 100644 pages/majorEvent/majorEvent.wxss diff --git a/app.json b/app.json index 839086c..198cdb7 100644 --- a/app.json +++ b/app.json @@ -39,7 +39,9 @@ "pages/contractAssets/fixedAssets", "pages/fixedAssets/change/change", "pages/paymentManager/paymentManager", - "pages/paymentManager/toPay/toPay" + "pages/paymentManager/toPay/toPay", + "pages/majorEvent/majorEvent", + "pages/majorEvent/add/add" ], "window": { "backgroundTextStyle": "light", diff --git a/component/editor/assets/iconfont.wxss b/component/editor/assets/iconfont.wxss new file mode 100644 index 0000000..9ff2f5c --- /dev/null +++ b/component/editor/assets/iconfont.wxss @@ -0,0 +1,240 @@ +@font-face {font-family: "iconfont"; + src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468'); /* IE9 */ + src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.woff?t=1547618146468') format('woff'), + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.ttf?t=1547618146468') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.svg?t=1547618146468#iconfont') format('svg'); /* iOS 4.1- */ +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-redo:before { + content: "\e627"; +} + +.icon-undo:before { + content: "\e633"; +} + +.icon-indent:before { + content: "\eb28"; +} + +.icon-outdent:before { + content: "\e6e8"; +} + +.icon-fontsize:before { + content: "\e6fd"; +} + +.icon-format-header-1:before { + content: "\e860"; +} + +.icon-format-header-4:before { + content: "\e863"; +} + +.icon-format-header-5:before { + content: "\e864"; +} + +.icon-format-header-6:before { + content: "\e865"; +} + +.icon-clearup:before { + content: "\e64d"; +} + +.icon-preview:before { + content: "\e631"; +} + +.icon-date:before { + content: "\e63e"; +} + +.icon-fontbgcolor:before { + content: "\e678"; +} + +.icon-clearedformat:before { + content: "\e67e"; +} + +.icon-font:before { + content: "\e684"; +} + +.icon-723bianjiqi_duanhouju:before { + content: "\e65f"; +} + +.icon-722bianjiqi_duanqianju:before { + content: "\e660"; +} + +.icon-text_color:before { + content: "\e72c"; +} + +.icon-format-header-2:before { + content: "\e75c"; +} + +.icon-format-header-3:before { + content: "\e75d"; +} + +.icon--checklist:before { + content: "\e664"; +} + +.icon-baocun:before { + content: "\ec09"; +} + +.icon-line-height:before { + content: "\e7f8"; +} + +.icon-quanping:before { + content: "\ec13"; +} + +.icon-direction-rtl:before { + content: "\e66e"; +} + +.icon-direction-ltr:before { + content: "\e66d"; +} + +.icon-selectall:before { + content: "\e62b"; +} + +.icon-fuzhi:before { + content: "\ec7a"; +} + +.icon-shanchu:before { + content: "\ec7b"; +} + +.icon-bianjisekuai:before { + content: "\ec7c"; +} + +.icon-fengexian:before { + content: "\ec7f"; +} + +.icon-dianzan:before { + content: "\ec80"; +} + +.icon-charulianjie:before { + content: "\ec81"; +} + +.icon-charutupian:before { + content: "\ec82"; +} + +.icon-wuxupailie:before { + content: "\ec83"; +} + +.icon-juzhongduiqi:before { + content: "\ec84"; +} + +.icon-yinyong:before { + content: "\ec85"; +} + +.icon-youxupailie:before { + content: "\ec86"; +} + +.icon-youduiqi:before { + content: "\ec87"; +} + +.icon-zitidaima:before { + content: "\ec88"; +} + +.icon-xiaolian:before { + content: "\ec89"; +} + +.icon-zitijiacu:before { + content: "\ec8a"; +} + +.icon-zitishanchuxian:before { + content: "\ec8b"; +} + +.icon-zitishangbiao:before { + content: "\ec8c"; +} + +.icon-zitibiaoti:before { + content: "\ec8d"; +} + +.icon-zitixiahuaxian:before { + content: "\ec8e"; +} + +.icon-zitixieti:before { + content: "\ec8f"; +} + +.icon-zitiyanse:before { + content: "\ec90"; +} + +.icon-zuoduiqi:before { + content: "\ec91"; +} + +.icon-zitiyulan:before { + content: "\ec92"; +} + +.icon-zitixiabiao:before { + content: "\ec93"; +} + +.icon-zuoyouduiqi:before { + content: "\ec94"; +} + +.icon-duigoux:before { + content: "\ec9e"; +} + +.icon-guanbi:before { + content: "\eca0"; +} + +.icon-shengyin_shiti:before { + content: "\eca5"; +} + +.icon-Character-Spacing:before { + content: "\e964"; +} diff --git a/component/editor/editor.js b/component/editor/editor.js new file mode 100644 index 0000000..c3db795 --- /dev/null +++ b/component/editor/editor.js @@ -0,0 +1,178 @@ +Component({ + properties: { + width: { + type: String + }, + height: { + type: String + }, + insertPicture: { + type: Boolean, + value: true + }, + placeholder: { + type: String, + value: '输入文字...' + } + }, + data: { + formats: {}, + readOnly: false, + // editorHeight: 300, + keyboardHeight: 0, + isIOS: false + }, + ready() { + const platform = wx.getSystemInfoSync().platform + const isIOS = platform === 'ios' + this.setData({ + isIOS + }) + const that = this + this.updatePosition(0) + let keyboardHeight = 0 + wx.onKeyboardHeightChange(res => { + if (res.height === keyboardHeight) return + const duration = res.height > 0 ? res.duration * 1000 : 0 + keyboardHeight = res.height + setTimeout(() => { + wx.pageScrollTo({ + scrollTop: 0, + success() { + that.updatePosition(keyboardHeight) + that.editorCtx.scrollIntoView() + } + }) + }, duration) + + }) + }, + methods: { + readOnlyChange() { + this.setData({ + readOnly: !this.data.readOnly + }) + }, + updatePosition(keyboardHeight) { + const toolbarHeight = 100 + const { + windowHeight, + platform + } = wx.getSystemInfoSync() + // let editorHeight = keyboardHeight > 0 ? (windowHeight - keyboardHeight - toolbarHeight) : windowHeight + this.setData({ + // editorHeight, + keyboardHeight + }) + }, + calNavigationBarAndStatusBar() { + const systemInfo = wx.getSystemInfoSync() + const { + statusBarHeight, + platform + } = systemInfo + const isIOS = platform === 'ios' + const navigationBarHeight = isIOS ? 44 : 48 + return statusBarHeight + navigationBarHeight + }, + onEditorReady() { + const that = this + //组件使用createSelectorQuery加上in(this) + wx.createSelectorQuery().in(that).select('#editor').context(function (res) { + that.editorCtx = res.context + }).exec() + }, + undo() { + this.editorCtx.undo() + }, + redo() { + this.editorCtx.redo() + }, + blur() { + this.editorCtx.blur() + }, + format(e) { + let { + name, + value + } = e.target.dataset + if (!name) return + // console.log('format', name, value) + if (name === "backgroundColor" && value === "#ff0000") { //设置字体颜色为白色 + this.editorCtx.format("color", "#ffffff") + } + if (name === "backgroundColor" && value === "#ffffff") { + this.editorCtx.format("color", "#000000") + } + if (name === "color") { //清除字体样式 + this.editorCtx.removeFormat() + } + this.editorCtx.format(name, value) + + }, + onStatusChange(e) { + const formats = e.detail + this.setData({ + formats + }) + }, + insertDivider() { + this.editorCtx.insertDivider({ + success: function () { + console.log('insert divider success') + } + }) + }, + clear() { + this.editorCtx.clear({ + success: function (res) { + console.log("clear success") + } + }) + }, + removeFormat() { + this.editorCtx.removeFormat() + }, + insertDate() { + const date = new Date() + const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}` + this.editorCtx.insertText({ + text: formatDate + }) + }, + insertImage() { + this.triggerEvent('insertImage'); //触发父组件方法 + }, + insertSrc(src) { //接受图片返回地址 + this.editorCtx.insertImage({ + src, + data: { + id: 'abcd', + role: 'god' + }, + width: '80%', + fail: (err) => { + console.log(`图片插入失败：${err}`); + } + }) + }, + getContent(e) { //获得文本内容 + this.triggerEvent('Content', { + content: e.detail + }) + }, + setHtml(html) { //回显 + if (html) { + this.createSelectorQuery().select('#editor').context((res) => { + this.editorCtx = res.context + this.editorCtx.setContents({ + html, + fail: (err) => { + console.log(`内容回显失败：${err}`); + } + }) + }).exec() + } + }, + } +}) \ No newline at end of file diff --git a/component/editor/editor.json b/component/editor/editor.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/component/editor/editor.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml new file mode 100644 index 0000000..64395ba --- /dev/null +++ b/component/editor/editor.wxml @@ -0,0 +1,50 @@ + + + + \ No newline at end of file diff --git a/component/editor/editor.wxss b/component/editor/editor.wxss new file mode 100644 index 0000000..0dff491 --- /dev/null +++ b/component/editor/editor.wxss @@ -0,0 +1,34 @@ +@import "./assets/iconfont.wxss"; +.ql-container { + font-size: 16px; + line-height: 1.5; + padding: 10px 10px 20px 10px; +} + +.ql-active { + color: #22C704; +} + +.iconfont { + display: flex; + width: 60rpx; + height: 60rpx; + align-items: center; + justify-content: center; + font-size: 40rpx; +} + +.toolbar { + padding: 0 16rpx; + height: 200rpx; + width: 100%; + position: fixed; + left: 0; + right: 100%; + bottom: 0; + display: flex; + flex-wrap: wrap; + align-items: center; + border-top: 1px solid #ECECEC; + background-color: white; +} \ No newline at end of file diff --git a/image/icon/detailNum_icon.png b/image/icon/detailNum_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..55ae3d9bf79acd85f0e30caee8b5553a972c8a29 GIT binary patch literal 529 zcmV+s0`C2ZP)JWClF5{oIna2V@a$hux@}Q?64c_3BaTn zH&BisH{b^14REPQzkf^sp`|mGNSuVwbl!jS=FfkBiV!oZL8CxK9R$e5%`e_D#_Ltw zn>Y-|0$BZ;!w;u`Xz;H^Aq^2Bn?$;tLoD(FGCs@y`>c`&>HZ%;*Dh+RC1SV!$v%$|v9lvXVf=GP87qL^R!6}Op| z_&jLj4v1csaS>u9(>L8=T4IS`tFCB{Y0A!PB89RpwZLmwe;db9(_n9(7-Xm@h{V0lFWj_m1QvbqQL TpCTm{00000NkvXXu0mjfOJ3nO literal 0 HcmV?d00001 diff --git a/image/icon/payBg.png b/image/icon/payBg.png new file mode 100644 index 0000000000000000000000000000000000000000..fe0774bea0a0bef43bb15b365ad13a911cb65933 GIT binary patch literal 2974 zcmbtWX*kqfA3n1g#x{v$$x98mnWp!}TZCFd^C%S*TZfy^gFM`M z2-0$B9_jC_YMLfV(kJz(p|qy(R+-CabVFq|>JloAQy}Moft2JNRfBP#mt{9ajH!;y zpdI$s^VIVU3d*B&m6J;~o@@k{7QU`2+|<)}Y-{~7W_#(OzgjXhRq&gN%_mfZpus8(tzHeb|x0>CzzJ*@Xmc^j580U#P zRKnt+Q+6|JwL6ySD-#2*gwY(^Zoy7WHYV%^{@zg2?&QbS-tnxRg$A`3-(tg2Wv~K- z?!HHW`75VCc==6T-tLvpPrNZ+FzjMlvQ6mrc@FGif5M;p|FDKbN~%Ro7~{8+blX{e)hAR8cU;w>9xe_?UIZzp1z( z^LJEhA90_?Wm=5q2$g9JW+Iu>!WS|z((at0YDBOoWUN5r?p2j6jptt*pT`P#|XDXyK{|-QlhZzAkF}C^$DaX;&;tMpTq6?N>oO??GvKK zwJ!@&wWT{Y8A~$`>|3nG;>Pix?ANcW9JUK>Zq(XwJ8jCO1%MeU-e;Y)x5c)kDBSJ$ zd)8xrYf4z`HE`UV8|TjTtNhA`+2Su99$>TmlXnhsW#ee}PImTAMW!Lc&Gve!$}MEx z!Azw?u`qVISa-O&uH@PvU+7SA^MgZ!^$~80)R))=N`R}!h=Svun}_<`*(`|+)0kmv z8@-Lnu9qS!^<}Kr*!6c^E_?Hx{{ET#qS`5&Y828F*mr|eRG6FRQmuvBtWeYwf&5KZ z-!qJu=BiciQ(Vhxt?irE;&L`;;9ZgD{v^E4^?$^@jn957P(jHl4PL5ul575_R^vc3 zY65RD z>#uH!Dt1S;7DBYrAMqE%uJic;Ne-?ue;;!MQN#0Hd%zCu!sFUGJo_c( zR$cxnq@QGt)b@nDD2~0FlRwwbH0Kr zVP|_|rdWbR2@1V}4c@7z^?MfxB)GVZ1*xjY}9F>@Dtqp%&gmxQ>tE;nJ;nS&`B- z{Abc+Mz+G#t|2`_g}`Hg}eCe@v@Z2G*~K9!If}X}ijHCv>$!R>}w){M{?0=@4L^!r)p)0InQ2 z4w?Hh-f+Ox2qWGxX2^m#DRJ;0DUB~%v(_tOqoI1x@<;=s!@CLQ+FeOdAE()_n0@mhk$xjIpQz zNHqdm&aU1!uif6X?v#;6QniqaLq?Jx)RR$P$uwas>q2Mb)IOzh8#=J-%!wrD( z`?o8fY(J{;o278&waDf!=)Yox<-hYzD4Q=|;s0bEWvPlApN_m+^N1slH z>+qbp5yb{^IaNp0+2w^7G0y2(WxsN1MLx1fs$lt{m&bVxz%dNKrA)IAg zgL-{<=o9o=b+qe3=r8+IoWKe3V1FzOa>1<8vFyV^DCMx#*Hi)x3jz}+3U3-h5!>4g zdeP)*u>`i2hHM*XdrMc}FsE8P=b&!5NWVHJr_TvgO-#c%B+$~JgCCt{sEvVq@OD@_ zv5x12xv&ntKRKWefl2w+EQB0n$wqtqzI`oFCbhjU_C?8qQkA*S|rJBB&egQm^jcdxM6$8nHMeP?DfS7@bDa z;bR>Er6;Sj(&?0gJ;tazK}BQe?&m(nhA09T6pFTjnR(FcD_??{_=UQF1yq}`^T+CPT p(y{jz6AgH6>2Y?g^TYUEblpRK+^(|MJ?O&?$fwOnB?c~c{sr_rIHv#r literal 0 HcmV?d00001 diff --git a/image/index/majorEvent_icon.png b/image/index/majorEvent_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fc073e44e38307e96fdd5dcbe062c542ab20c33c GIT binary patch literal 1812 zcmV+v2kZEWP)1^@s6-S$}h00004b3#c}2nYxW zd^>uP|Xa1WkOLp6*EuA+$#)*U(UsI@fZXcin^KS6i*VshbjV_?UawTo_9G@ z1`GiJSX$uCE6L3&5Cte&ZTQ9h+cW!ahMqC*KW}>efuGkc*aG@n1JDPMmAYc#WyHe3 z=;tp#EJLXr0x{c4Lyh}Xe%!I*#Kr3?jQ=+Ov4WPL)-7nkKpT}5bRNFbel=OW8HpF# zyS!Y)pe$MA;(eb8FH%ND%7v`A+Pf1SBdzgX^>3K=RrL-!@63>OKwL=7L^ ze!XYsc;M-P0_uiu_%9fbpH`U{4~{pW)jrSsLy3xV(l`pI4PG)ho`6pAFhGg~dyc|} zlM0O|E%2e+fu z_CEA=PSHm^0a@^9_GudWbHZx>`EkQba;l#BV5DcmTkUVzMa zbl#`p-^Ucs3S4vbC&Qu7mdp|b+59YtZh2^8;mq&6`P*VmmdljUmiLFQwj`TK^T0!z z);nf+R^e#F!@Fzd3L-2vBlJqr1KaZ-*)|G=8RqY@5&CQ6aL=Zxs(O1Y@aQ$~nBdug zqYcM4Jfz`kT=96o)%(}xK_s70pztKibR^Mqg$JG}fJ@x) zc)=;y(*XgjNEIBf0YlX8{K5qg|PWXEJO(r~=H7cGkWDF8xd|4L4 z6|5O&%-VP>EG(c-GtYeU+wo~jgRg5{AN8&-`AgtnP1AIiQ`LOB)5k2-BCV1vDswx1 zo#2th<2#b~`f<3bGZ<+f6W+?hjR6Q@)S~5qnx=b8=VruYeO$bLa&Xt8Ns~NT^NlMl zW0`sMj@gZH@I>L7BR7o4Wx}g#ZR{iiMpT~^56>xFB-op~7ESibS@VqdHJk$4$~>BK zO0a91UJ^*3VtCtwy)8z7Mm^|4OfC3JX%p`xt^|3Cw=yb%&lqPCW+FhHY zipo4EPlQJ5v4Tfeiifn}uAQWb-8i0qBT@$inVuliC_v~IZi z+g>YeV#~bv6Xit5<^mTvz&Eu(Tw1xfOpv9iq%X{}(&$)t(+jhAH!U1}_mx9Hvr-4$ zhY3%=L_?^a)KWz&BagsVKnSAldYJ;@3TJL4{-U-Z97H98q!lOX6Jz0#y0(&!&ng@< zUc3Y8r~phOk3{E@HyZS{ISgTi3`6zFu0HGppJ-oPTPuR+Zb?AQkpUdNdnXQOD_~$i z6@8r>$%_`|7go{(j~74+>!BIu{s#>Xfn7X@aI{#;@B*arW`@8rp=cEel75UEmp(5O z8lQ?7T|5R=7th6G5MU_kDD&vZ<8A 支付管理 + + + 重大事项 + diff --git a/pages/majorEvent/add/add.js b/pages/majorEvent/add/add.js new file mode 100644 index 0000000..36818c7 --- /dev/null +++ b/pages/majorEvent/add/add.js @@ -0,0 +1,228 @@ +// pages/bankDraft/add/add.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; +let EVN_CONFIG = require('../../../env/env'); +const DISTRIBUTE_ENVIROMENT = 'IMGURL'; +let { + URL_PREFIX, +} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT]; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + form:{ + eventTime: "2020-01-01", //开票日期 必填 + remark: "", + }, + showBtn:true, + showEventTime:false, + status:0, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let that = this + if(options.id!=null&&options.id!=""){ + this.setData({id:options.id}) + UTIL.httpRequest(API.URL_GET_MAJOREVENTGET + this.data.id, {method:'GET'}, { + success: (res) => { + console.log(res); + if(res.data.auditStatus!='0'&&res.data.auditStatus!='2'){ + this.setData({'showBtn':false}); + } + this.setData({'form':res.data}) + this.selectComponent('#hf_editor').setHtml(res.data.eventContent); + } + }) + }else{ + this.onShow() + } + }, + onConfirmEventTime(e){ + let data = this.getNewDate(new Date(e.detail.value)); + this.setData({'form.eventTime':data}); + }, + getHtml(e) {//从组件获取值 + this.data.form.eventContent = e.detail.content.html + }, + insertImage(){ //图片上传插入示例 + wx.chooseImage({ + count: 1, + success: r => { + // 本地测试图片插入 + // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]); + + wx.uploadFile({ //调用图片上传接口 + url: URL_PREFIX+'/common/upload', + filePath: r.tempFilePaths[0], + name: 'imgFile', + success: res => { + console.log(); + let imgUrl = JSON.parse(res.data).url + this.selectComponent('#hf_editor').insertSrc(URL_PREFIX+'/common/upload' + imgUrl);//调用组件insertSrc方法 + } + }) + } + }) + }, + getNewDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time + if(date){ + time = new Date(date); + }else{ + time = new Date(); + } + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + openBox(even){ + console.log(even.currentTarget.dataset.name); + this.setData({ + [even.currentTarget.dataset.name]:true + }) + }, + onChange(event){ + console.log(event); + this.setData({ + [event.currentTarget.dataset.value]: event.detail, + }) + }, + closeBox(even){ + console.log(even.currentTarget.dataset.name); + this.setData({ + [even.currentTarget.dataset.name]:false + }) + }, + goSubmit(){ + if(this.data.form.eventName===''||this.data.form.eventName==null){ //事项名称 + UTIL.showToastNoneIcon('请填写事项名称！'); + return false; + }else if(this.data.form.eventTime===''||this.data.form.eventTime==null){ //事项时间 + UTIL.showToastNoneIcon('事项时间不能为空！'); + return false; + }else if(this.data.form.eventContent===''||this.data.form.eventContent==null){ //事项内容 + UTIL.showToastNoneIcon('事项内容不能为空！'); + return false; + }else if(this.data.status=='0'){ + this.setData({'status':'1'}) + var that = this; + that.data.form.method = 'POST'; + that.data.form.eventContent = that.data.form.eventContent.replace(/\\/g,"/") + console.log(that.data.form); + if(that.data.form.id==""||that.data.form.id==null){ + UTIL.httpRequest(API.URL_POST_MAJOREVENTADD, that.data.form , { + success: (res) => { + this.setData({'status':0}) + if(res.code == 200){ + UTIL.showToastNoneIcon('新增成功'); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon('新增失败：'+res.msg); + } + } + }) + }else{ + UTIL.httpRequest(API.URL_POST_MAJOREVENTUPDATE, that.data.form , { + success: (res) => { + this.setData({'status':0}) + if(res.code == 200){ + UTIL.showToastNoneIcon('修改成功'); + setTimeout(function(){ + wx.navigateBack({ + delta:1 + }) + },2000) + }else{ + UTIL.showToastNoneIcon('修改失败：'+res.msg); + } + } + }) + } + } + }, + onConfirmTime(event){ + this.setData({ + [event.currentTarget.dataset.name]: false, + [event.currentTarget.dataset.value]: UTIL.formatDate(event.detail), + }); + }, + openBox(even){ + console.log(even.currentTarget.dataset.name); + this.setData({ + [even.currentTarget.dataset.name]:true + }) + }, + closeBox(even){ + console.log(even.currentTarget.dataset.name); + this.setData({ + [even.currentTarget.dataset.name]:false + }) + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/majorEvent/add/add.json b/pages/majorEvent/add/add.json new file mode 100644 index 0000000..5cd5fa7 --- /dev/null +++ b/pages/majorEvent/add/add.json @@ -0,0 +1,21 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-tag": "@vant/weapp/tag/index", + "van-icon": "@vant/weapp/icon/index", + "van-steps": "@vant/weapp/steps/index", + "van-button": "@vant/weapp/button/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-field": "@vant/weapp/field/index", + "van-popup": "@vant/weapp/popup/index", + "van-picker": "@vant/weapp/picker/index", + "van-calendar": "@vant/weapp/calendar/index", + "van-datetime-picker": "@vant/weapp/datetime-picker/index", + "hf_editor": "/component/editor/editor" + } +} \ No newline at end of file diff --git a/pages/majorEvent/add/add.wxml b/pages/majorEvent/add/add.wxml new file mode 100644 index 0000000..47ef547 --- /dev/null +++ b/pages/majorEvent/add/add.wxml @@ -0,0 +1,24 @@ + + + + {{form.id?"":"新增"}}重大项目 + + + + + + *发生日期 + + + {{form.eventTime?form.eventTime:'发生日期'}} + + + + + + + + + + 保存 + \ No newline at end of file diff --git a/pages/majorEvent/add/add.wxss b/pages/majorEvent/add/add.wxss new file mode 100644 index 0000000..61f66a2 --- /dev/null +++ b/pages/majorEvent/add/add.wxss @@ -0,0 +1,103 @@ +/* pages/payee/add/add.wxss */ +.main-box{ + background: #ffffff; + padding: 20px; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} +.table-box van-field van-cell .van-cell{ + margin-bottom: 15px; +} +.table-box van-field:last-child van-cell .van-cell{ + margin-bottom: 0px; +} +.van-cell{ + padding: 0!important; + margin-bottom: 15px; +} +.van-cell__value { + display: flex; + justify-content: flex-end; +} +.van-radio--horizontal { + margin-right: 0!important; + margin-left: var(--padding-sm,12px) +} +.van-cell--required:before { + left: 0!important; +} + +.van-field__label { + padding-left: 10px; +} + +.bottom{ + width: 100%; + margin: 0 auto; + text-align: center; + margin-top: 30px; + margin-bottom: 30px; + display: flex; + position: absolute; + bottom: 10%; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 8px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + color: #fff; +} +.table-boxs>view{ + display: flex; + justify-content: space-between; + line-height: 100rpx; +} +.ql-container { + box-sizing: border-box; + width: 100%; + height: 400px; + font-size: 16px; + line-height: 1.5; + overflow: auto; + padding: 10px 10px 20px 10px; + border: 1px solid #ECECEC; +} + +.ql-active { + color: #22C704; +} + +.iconfont { + display: inline-block; + width: 30px; + height: 30px; + cursor: pointer; + font-size: 20px; +} + +.toolbar { + box-sizing: border-box; + padding: 0 10px; + height: 50px; + width: 100%; + position: absolute; + left: 0; + right: 100%; + top: 0; + display: flex; + align-items: center; + justify-content: space-between; + border: 1px solid #ECECEC; + border-left: none; + border-right: none; +} diff --git a/pages/majorEvent/majorEvent.js b/pages/majorEvent/majorEvent.js new file mode 100644 index 0000000..d66132f --- /dev/null +++ b/pages/majorEvent/majorEvent.js @@ -0,0 +1,398 @@ +// pages/project/project.js +import * as UTIL from '../../utils/util.js'; +import * as API from '../../utils/API.js'; +let EVN_CONFIG = require('../../env/env'); +const DISTRIBUTE_ENVIROMENT = 'IMGURL'; +let { + URL_PREFIX, +} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT]; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + eventName:"", + value:'', + pageNums:1, + showUpload:false, + uploadOptions:[], + fileList:[], + itemId:"", + itemIndex:"", + list:[], + fileEvent:{}, + showPopupDel:false, + showPopupSubmit:false, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + var _this = this; + let qu = wx.createSelectorQuery() + qu.select("#top_view").boundingClientRect() + qu.exec(res => { + _this.setData({ + scrollHeight:wx.getSystemInfoSync().windowHeight-res[0].height-res[0].top + }) + }) + //获取附件字典 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'common_attach', {method:'GET'}, { + success: (res) => { + this.setData({ + uploadOptions:res.data, + }) + } + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + this.onShow(); + }, + goSearch(e){ + this.setData({eventName:e.detail}) + this.onShow(); + }, + goAdd(){ + wx.navigateTo({ + url: 'add/add', + }) + }, + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, + + goUpdate(e){ + wx.navigateTo({ + url: 'add/add?id='+ e.currentTarget.dataset.id, + }) + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + var that = this; + let params = { + pageNum : this.data.pageNum, + pageSize: 10, + eventName: this.data.eventName, + method:'GET' + } + UTIL.httpRequest(API.URL_GET_MAJOREVENTLIST, params, { + success: (res) => { + this.setData({ + list:res.rows + }); + } + }) + }, + submit(e){ + this.setData({ + 'itemId':e.currentTarget.dataset.id, + 'itemIndex':e.currentTarget.dataset.index, + "showPopupSubmit":true + }); + }, + confirmTemSub(){ + this.setData({ + "showPopupSubmit":false + }); + UTIL.httpRequest(API.URL_GET_MAJOREVENTSUBMIT + this.data.itemId , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list[this.data.itemIndex].auditStatus = '1' + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('提交成功'); + }else{ + UTIL.showToastNoneIcon('提交失败！'); + } + } + }) + }, + cancelTemSub(){ + this.setData({ + "itemId":"", + "itemIndex":"", + "showPopupSubmit":false + }); + }, + delete(e){ + this.setData({ + 'itemId':e.currentTarget.dataset.id, + 'itemIndex':e.currentTarget.dataset.index, + "showPopupDel":true + }); + }, + cancelTemDel:function(e){ + this.setData({ + "itemId":"", + "itemIndex":"", + "showPopupDel":false + }); + }, + confirmTemDel:function(e){ + this.setData({ + "showPopupDel":false + }); + UTIL.httpRequest(API.URL_GET_MAJOREVENTDELETE + this.data.itemId , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let new_list = this.data.list + new_list.splice(this.data.index,1) + this.setData({'list':new_list}) + UTIL.showToastNoneIcon('删除成功！'); + }else{ + UTIL.showToastNoneIcon('删除失败！'); + } + } + }) + }, + changeTab(e){ + var that = this ; + that.setData({value1:e.detail}) + + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { + success: (res) => { + UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ + success: (response) => { + if (response.code == API.SUCCESS_CODE) { + + for (let i = 0; i < response.rows.length; i++) { + response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); + response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); + response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); + response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); + } + + that.setData({ + moneyorderList:response.rows + }) + } + } + }) + } + }) + }, + changeTab2(e){ + var that = this ; + that.setData({value2:e.detail}) + + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { + success: (res) => { + UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ + success: (response) => { + if (response.code == API.SUCCESS_CODE) { + + for (let i = 0; i < response.rows.length; i++) { + response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); + response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); + response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); + response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); + } + + that.setData({ + moneyorderList:response.rows + }) + } + } + }) + } + }) + }, + upload(e){ + this.setData({itemId:e.currentTarget.dataset.id}); + this.asyncFun(e.currentTarget.dataset.id) + }, + asyncFun(id){ + this.setData({"fileList":[]}) + let uploadList = this.data.uploadOptions + let newList = [] + let _this = this + uploadList.map( res => { + let oData = { + tableId: id, + tableName: "t_yinnong_majorevent", //上传表 + bizPath: "yinnong", + fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字 + method:'GET' + } + UTIL.httpRequest(API.URL_GET_ATTACHMENTLIST, oData, { + success: (rr) => { + if(rr.code==200&&rr.rows.length>0){ + rr.rows.map((rrr,index) => { + rrr.url = URL_PREFIX + rrr.fileUrl + if(index==rr.rows.length-1){ + newList.push(Object.assign({},res,{"list":rr.rows})) + _this.setData({"fileList":_this.data.fileList.concat(newList)}); + _this.setData({"showUpload":true}) + } + }) + }else{ + let newuploadList = uploadList + newuploadList.map(rd => { + rd.list = newList + }) + _this.setData({"fileList":newuploadList}); + _this.setData({"showUpload":true}) + } + }, + fail:(rr) =>{ + + }, + complete:(rr) => { + + } + }) + }) + }, + closeBox(){ + this.setData({"showUpload":false}) + }, + deleteImg(event){ + this.setData({"fileEvent":event}) + this.setData({"showPopup":true}); + }, + cancelTem:function(e){ + this.setData({"fileEvent":"{}"}); + this.setData({"showPopup":false}); + }, + confirmTem:function(e){ + let event = this.data.fileEvent + UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, { + success: (res) => { + if(res.code==200){ + let ll = this.data.fileList + var jsonlist = ll[event.target.dataset.idx].list; + jsonlist.splice(event.detail.index, 1) + ll[event.target.dataset.idx].list = jsonlist + this.setData({"fileList":ll}) + this.setData({showPopup:false}); + wx.showToast({ + title: '删除成功！', + icon: 'success', + duration: 2000, + }) + } + } + }) + }, + uploadFile(uploadFile,event) { + let _this = this + return new Promise((resolve, reject) => { + wx.uploadFile({ + url: API.URL_GET_UPLOAD, + filePath: uploadFile.file.file.url, + name: 'file', + header: { + "Content-Type": "multipart/form-data",//记得设置 + "chartset":"utf-8", + 'Authorization':'Bearer '+getApp().globalData.userInfo.token + }, + formData:uploadFile, + success: (res) => { + res.data = JSON.parse(res.data); + if(res.statusCode == 200){ + let files = _this.data.fileList + let fName = res.data.fileUrl.split('/') + let fLength = fName.length + files[event.currentTarget.dataset.idx].list.push({ + "fileName": fName[fLength-1], + "fileType": "0", + "fileUrl":res.data.fileUrl , + "id": res.data.id, + "tableId": 6, + "url":URL_PREFIX+res.data.fileUrl + }) + _this.setData({"fileList":files}) + wx.hideLoading() + } + }, + fail: (err) => { + //上传失败：修改pedding为reject + reject(err) + } + }); + }) + }, + afterRead(event) { + let _this = this + wx.showLoading({ + title: '上传中...' + }) + let fileForm={ + file: event.detail, + fileType:event.currentTarget.dataset.idx, + tableName: "t_yinnong_majorevent", //上传表 + bizPath: "yinnong", + tableId:_this.data.itemId + } + this.uploadFile(fileForm,event) + }, + lookDown(file,detail){ + // 获取指定字符串最后一次出现的位置，返回index + var index1 = file.detail.url.lastIndexOf('.'); + // substr(start, length) 抽取从start下标开始的length个字符，返回新的字符串; + var style = file.detail.url.substr(index1 + 1) + //判断图片类型，不需要下载，不做处理 + if(style=='png'||style=='jpg'||style=='jpeg'||style=='bmp'||style=='gif'||style=='webp'||style=='psd'||style== 'svg'||style=='tiff'){ + //判断非图片类型 + }else{ + wx.downloadFile({ + url: file.detail.url, + success(data){ + wx.openDocument({ + filePath: data.tempFilePath, + fileType: style, + showMenu:true, + success(res){ + } + }) + } + }) + } + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/majorEvent/majorEvent.json b/pages/majorEvent/majorEvent.json new file mode 100644 index 0000000..6e4aadf --- /dev/null +++ b/pages/majorEvent/majorEvent.json @@ -0,0 +1,17 @@ +{ + "usingComponents": { + "van-checkbox": "@vant/weapp/checkbox/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-search": "@vant/weapp/search/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", + "van-dropdown-item": "@vant/weapp/dropdown-item/index", + "van-tag": "@vant/weapp/tag/index", + "van-action-sheet": "@vant/weapp/action-sheet/index", + "van-upload": "@vant/weapp/uploader/index" + } +} \ No newline at end of file diff --git a/pages/majorEvent/majorEvent.wxml b/pages/majorEvent/majorEvent.wxml new file mode 100644 index 0000000..4dcbde1 --- /dev/null +++ b/pages/majorEvent/majorEvent.wxml @@ -0,0 +1,91 @@ + + + + 重大事项 + + + + + 新增 + + + + + + + + {{item.eventName}} + + + + + + {{item.eventTime}} + + + 草稿 + 待审 + 驳回 + 通过 + + + + + + + + + + 删除 + + + + + + + + 附件 + + + + + + + + 提交 + + + + + + + + + + + {{item.dictLabel}} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/majorEvent/majorEvent.wxss b/pages/majorEvent/majorEvent.wxss new file mode 100644 index 0000000..183fd24 --- /dev/null +++ b/pages/majorEvent/majorEvent.wxss @@ -0,0 +1,347 @@ +/* pages/bank/bank.wxss */ +.van-search__content { + border: 1px solid #5CAE77!important; + background: #fff!important; +} +van-search { + flex: 0.8; +} +.search_box{ + display: flex; +} +.add_btn{ + flex: 0.2; + padding: var(--search-padding,10px 12px); + padding-left: 0; +} +.add_btn text{ + background-color: #62AD66; + display: block; + height: 100%; + text-align: center; + line-height: 36px; + color: #fff; + border-radius: 36px; + box-shadow: 0px 5px 5px #ddd; +} +text{display: block;} +.work_plan{ + padding: 40rpx 32.5rpx 30rpx; + display: flex; +} + +.work_plan .menu_item{ + background-color: #fff; + box-shadow: 2px 5px 5px #ddd; + border-radius: 60rpx; + text-align: center; + position: relative; + margin-right: 20px; + padding: 8px 10px; +} +.work_plan .menu_item.active{ + background-color: #2C8E68; + color: #fff; +} +.work_plan .menu_item .remind{ + height: 30rpx; + background: #e90101; + color: #fff; + font-size: 26rpx; + position: absolute; + line-height: 30rpx; + padding:0 10rpx; + border-radius: 25px; + top: -10rpx; + right: -10rpx; +} + +.work_plan .more{ + flex: 1; + text-align: center; + line-height: 60rpx; + font-size: 36rpx; + color: #31936c; +} +.deleteBox{ + width: 130px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} +.workflow .workflow_list{ + height: 150rpx; + background-color: #fff; + border-radius: 24rpx; + box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1); + margin-bottom: 20rpx; + padding:15rpx 25rpx 10rpx 35rpx; +} +.workflow .workflow_list .process_intro{ + display: flex; + height: 62rpx; + align-items: center; +} + +.workflow .process_intro .name{ + width: 390rpx; + font-size: 34rpx; + margin-right: 30rpx; + display: flex; + justify-content: space-between; + align-items: center; +} +.workflow .process_intro .name .name_tit{ + width: 290rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.van-swipe-cell { + width: 94%; + background: #fff; + border-radius: 10px; + box-shadow: 2px 5px 5px #ddd; + margin: 0 auto; + margin-bottom: 15px; +} +.li{ + width: 100%; + padding: 14px; +} +.tit_box{ + display: flex; + justify-content: space-between; +} +.tit_box_left{ + display: flex; + align-items: center; +} +.detail_box{ + margin-top: 10px; + display: flex; + justify-content: space-between; +} +.detail_box text{ + color:#878787; +} +.fkmc { + line-height: 20px; + font-size: 16px; +} +.detail_time .detail_box_money{ + font-size: 14px; +} +.detail_time_box{ + display: flex; + justify-content: space-between; + margin-top: 10px; +} +.detail_time{ + display: flex; + align-items: center; + padding-left: 3px; +} +.detail_time text{ + font-size: 12px; + margin-left: 5px; + color: #878787; +} +.li .detail_box_left text{ + text-align: center; +} +.li .detail_box_left .fkdw{ + color: #B5B5B5; + font-size: 14px; + margin-top: 5px; +} +.li .detail_box_center{ + color: #666666; + font-size: 12px; + text-align: center; +} +.li .detail_box_right text{ + text-align: center; +} +.li .detail_box_right .skdw{ + color: #B5B5B5; + font-size: 14px; + margin-top: 5px; +} + +.li .fksr{ + display: flex; + align-items: center; + margin-top: 15px; + color: #2C8E68; + font-size: 16px; +} +.li .wtj{ + display: flex; + align-items: center; + justify-content: center; + padding: 3px 8px; + border-radius: 5px; + font-size: 14px; +} +.no{ + background-color:#fbe3e3; + color: #e90000; +} +.white{ + background-color:#feeadc; + color: #fc9a55; +} +.yes{ + background-color:#ddeee3; + color: #5cae77; +} +.other{ + background-color:#f0f1f6; + color: #878787; +} +.li .tit{ + font-size: 16px; + color: #333333; + line-height: 25px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; + margin-left: 5px; +} +.li .fj_name{ + font-size: 14px; + color: #B3DB62; + line-height: 25px; +} +.li .time{ + font-size: 14px; + color: #9B9CAA; +} +.li .money{ + font-size: 18px; + color: #5CAE77; +} +.tit_type{ + display: flex; + align-items: center; +} +.tit_type text{ + background: rgba(92, 174, 119, 0.2); + color: #5CAE77; + padding: 2px 10px; +} +.van-checkbox__label { + display: flex; + justify-content: space-between; + width: 100%; +} + +.van-checkbox__icon-wrap { + border-radius: 5px; +} +.van-checkbox__icon { + border-radius: 5px; + border: 2px solid #2C8E68!important; + background-color: rgba(44, 142, 104, 0.2); +} +.bottom{ + width: 100%; + margin: 0 auto; + text-align: center; + padding: 15px 0; + display: flex; + position: fixed; + bottom: 0%; + background: #fff; + box-shadow: 0 0 5px #ddd; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 10px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + color: #fff; +} + +.downView{ + display: flex; + justify-content: center; + align-items: center; + padding: 0 20px; + border: 1px solid #5CAE77; + border-radius: 50px; + background: #fff; + margin-left: auto; +} +.downView image{ + width: 10px; + height: 8px; + margin-left: 10px; +} +.hp_type{ + padding: 4vw 3%; + display: flex; + border-bottom: 1px solid #eee; +} +.hp_type view{ + padding: 2vw 6%; + background: #EEEEEE; + border-radius: 60px; + margin-right: 3%; + width: 30vw; + text-align: center; +} +.hp_button{ + display: flex; + justify-content: space-around; + padding:4vw 0 6vw; +} +.hp_button view{ + padding: 3vw 6%; + background: #EEEEEE; + border-radius: 60px; + width: 30vw; + text-align: center; +} +.van-dropdown-menu { + margin-bottom: 15px; +} +.fj-box text{ + background-color: #5CAE77; + color: #ffffff; + text-align: center; + border-radius: 5px; + white-space:pre-wrap; + padding: 5rpx 8rpx; + width: 50rpx; + margin: 0px 14px; + font-size: 24rpx; +} +.fj-li{ + margin-top: 20px; + display: flex; + /* flex-wrap: wrap; */ +} +.fj-li .img_li{ + width: 100%; + height: 18.5vw; +} + +.fj-li .img_add{ + overflow: hidden; +} +.van-icon-description{ + font-size: 60px; +} diff --git a/pages/paymentManager/paymentManager.js b/pages/paymentManager/paymentManager.js index 39911b1..c3244b5 100644 --- a/pages/paymentManager/paymentManager.js +++ b/pages/paymentManager/paymentManager.js @@ -87,7 +87,16 @@ Page({ * 生命周期函数--监听页面初次渲染完成 */ onReady() { - + //获取附件字典 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bookkeeping_type', {method:'GET'}, { + success: (res) => { + if(res.data.length>0){ + this.setData({ + uploadOptions:res.data, + }) + } + } + }) }, getList:function(){ @@ -101,7 +110,6 @@ Page({ } UTIL.httpRequest(API.URL_GET_TRANSFERPAYLIST,params,{ success: (res) => { - console.log(res); let _this = this if(res.code == 200){ if(this.data.pageNums!=1&&this.data.list.length { - UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ - success: (response) => { - if (response.code == API.SUCCESS_CODE) { - - for (let i = 0; i < response.rows.length; i++) { - response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); - response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); - response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); - response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); - } - - that.setData({ - moneyorderList:response.rows - }) - } - } - }) - } - }) - - + that.setData({value1:e.detail,pageNum:1}) + this.getList() }, changeTab2(e){ var that = this ; - that.setData({value2:e.detail}) - - UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, { - success: (res) => { - UTIL.httpRequest(API.URL_GET_GETMONEYORDERLIST, {method:'GET',orderType:that.data.value1,orderStatus:that.data.value2},{ - success: (response) => { - if (response.code == API.SUCCESS_CODE) { - - for (let i = 0; i < response.rows.length; i++) { - response.rows[i].orderTypeText = UTIL.getTransform(response.rows[i].orderType,res.data); - response.rows[i].startTime = response.rows[i].startTime.replace(/-/g,"."); - response.rows[i].endTime = response.rows[i].endTime.replace(/-/g,"."); - response.rows[i].orderAmount = parseFloat(response.rows[i].orderAmount).toFixed(2); - } - - that.setData({ - moneyorderList:response.rows - }) - } - } - }) - } - }) - - - }, - delete(e){ - this.setData({ - 'itemId':e.currentTarget.dataset.id, - 'itemIndex':e.currentTarget.dataset.index, - "showPopupDel":true - }); - }, - cancelTemDel:function(e){ - this.setData({ - "itemId":"", - "itemIndex":"", - "showPopupDel":false - }); - }, - confirmTemDel:function(e){ - this.setData({ - "showPopupDel":false - }); - UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + this.data.itemId , {method:'GET'}, { - success: (res) => { - if(res.code==200){ - let new_list = this.data.list - new_list.splice(this.data.index,1) - this.setData({'list':new_list}) - UTIL.showToastNoneIcon('删除成功！'); - }else{ - UTIL.showToastNoneIcon('删除失败！'); - } - } - }) + that.setData({value2:e.detail,pageNum:1}) + this.getList() }, + upload(e){ this.setData({itemId:e.currentTarget.dataset.id}); this.asyncFun(e.currentTarget.dataset.id) @@ -321,13 +253,14 @@ Page({ asyncFun(id){ this.setData({"fileList":[]}) let uploadList = this.data.uploadOptions - let newList = [] let _this = this - uploadList.map( res => { + uploadList.map( (res,idx) => { + res.list=[] + console.log(res); let oData = { tableId: id, - tableName: "t_asset_permanent", //上传表 - bizPath: "asset", + tableName: "t_yinnong_transfer", //上传表 + bizPath: "transfer", fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字 method:'GET' } @@ -336,18 +269,17 @@ Page({ if(rr.rows.length>0){ rr.rows.map((rrr,index) => { rrr.url = URL_PREFIX + rrr.fileUrl + rrr.name = rrr.fileName if(index==rr.rows.length-1){ - newList.push(Object.assign({},res,{"list":rr.rows})) - _this.setData({"fileList":_this.data.fileList.concat(newList)}); + res.list = rr.rows + let lis = uploadList + lis[idx] = res + _this.setData({"fileList":lis}); _this.setData({"showUpload":true}) } }) - }else{ - let newuploadList = uploadList - newuploadList.map(rd => { - rd.list = newList - }) - _this.setData({"fileList":newuploadList}); + } + else{ _this.setData({"showUpload":true}) } } @@ -358,34 +290,6 @@ Page({ closeBox(){ this.setData({"showUpload":false}) }, - deleteImg(event){ - this.setData({"fileEvent":event}) - this.setData({"showPopup":true}); - }, - cancelTem:function(e){ - this.setData({"fileEvent":"{}"}); - this.setData({"showPopup":false}); - }, - confirmTem:function(e){ - let event = this.data.fileEvent - UTIL.httpRequest(API.URL_GET_GETFILEREMOVE+event.detail.file.id , {method:'GET'}, { - success: (res) => { - if(res.code==200){ - let ll = this.data.fileList - var jsonlist = ll[event.target.dataset.idx].list; - jsonlist.splice(event.detail.index, 1) - ll[event.target.dataset.idx].list = jsonlist - this.setData({"fileList":ll}) - this.setData({showPopup:false}); - wx.showToast({ - title: '删除成功！', - icon: 'success', - duration: 2000, - }) - } - } - }) - }, uploadFile(uploadFile,event) { let _this = this return new Promise((resolve, reject) => { @@ -407,6 +311,7 @@ Page({ let fLength = fName.length files[event.currentTarget.dataset.idx].list.push({ "fileName": fName[fLength-1], + "name":fName[fLength-1], "fileType": "0", "fileUrl":res.data.fileUrl , "id": res.data.id, @@ -432,13 +337,14 @@ Page({ let fileForm={ file: event.detail, fileType:event.currentTarget.dataset.idx, - tableName: "t_asset_permanent", //上传表 - bizPath: "asset", + tableName: "t_yinnong_transfer", //上传表 + bizPath: "transfer", tableId:_this.data.itemId } this.uploadFile(fileForm,event) }, - lookDown(file,detail){ + lookDown(e){ + let file =e // 获取指定字符串最后一次出现的位置，返回index var index1 = file.detail.url.lastIndexOf('.'); // substr(start, length) 抽取从start下标开始的length个字符，返回新的字符串; diff --git a/pages/paymentManager/paymentManager.wxml b/pages/paymentManager/paymentManager.wxml index 7c762ec..91f86f4 100644 --- a/pages/paymentManager/paymentManager.wxml +++ b/pages/paymentManager/paymentManager.wxml @@ -9,8 +9,8 @@ - - + + @@ -35,44 +35,19 @@ - ￥{{item.expenditureAmount}} + + ￥{{item.expenditureAmount}} + - + - + - + - - - - - - - - - - 报废 - - - - - - - - 出售 - - + - - - - - - 删除 - - @@ -81,20 +56,12 @@ 附件 - - - - - - 变更 - - - + @@ -102,7 +69,7 @@ - + @@ -110,7 +77,3 @@ - - diff --git a/pages/paymentManager/paymentManager.wxss b/pages/paymentManager/paymentManager.wxss index 3882ff4..116395b 100644 --- a/pages/paymentManager/paymentManager.wxss +++ b/pages/paymentManager/paymentManager.wxss @@ -64,7 +64,7 @@ text{display: block;} color: #31936c; } .deleteBox{ - width: 130px; + width: 50px; text-align: center; height: 100%; background: #F6F6F6; diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml index 8bd644d..61255e1 100644 --- a/pages/project/add/add.wxml +++ b/pages/project/add/add.wxml @@ -1,42 +1,37 @@ - - {{form.id?"":"新增"}}工程项目 + + 新增工程项目 - + - - *开工日期 - - - {{form.startTime?form.startTime:'开工日期'}} - - - - - *竣工日期 - - - {{form.endTime?form.endTime:'竣工日期'}} - - - - + + - - *工程状态 - - - {{ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel?ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel:"选择所属银行"}} - - - - - + + + + + + + + + + + + - 保存 + 确认 \ No newline at end of file diff --git a/pages/project/add/add.wxss b/pages/project/add/add.wxss index c080460..ba73b72 100644 --- a/pages/project/add/add.wxss +++ b/pages/project/add/add.wxss @@ -1,4 +1,6 @@ /* pages/payee/add/add.wxss */ + +@import "../../../style/iconfont.wxss"; .main-box{ background: #ffffff; padding: 20px; diff --git a/style/iconfont.wxss b/style/iconfont.wxss index e186a3c..9f598cc 100644 --- a/style/iconfont.wxss +++ b/style/iconfont.wxss @@ -1,8 +1,10 @@ -@font-face { - font-family: "iconfont"; /* Project id 3051601 */ - src: url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.woff2?t=1640658441847') format('woff2'), - url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.woff?t=1640658441847') format('woff'), - url('//at.alicdn.com/t/font_3051601_80e3j4e5om7.ttf?t=1640658441847') format('truetype'); +@font-face {font-family: "iconfont"; + src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468'); /* IE9 */ + src: url('//at.alicdn.com/t/font_945958_zfsfjju1dim.eot?t=1547618146468#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.woff?t=1547618146468') format('woff'), + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.ttf?t=1547618146468') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('//at.alicdn.com/t/font_945958_zfsfjju1dim.svg?t=1547618146468#iconfont') format('svg'); /* iOS 4.1- */ } .iconfont { @@ -40,3 +42,32 @@ .icon-guanbi:before { content: "\e62a"; } + +.icon-format-header-2:before { + content: "\e75c"; +} + +.icon-format-header-3:before { + content: "\e75d"; +} +.icon-zitijiacu:before { + content: "\ec8a"; +} +.icon-zitixieti:before { + content: "\ec8f"; +} +.icon-zitixiahuaxian:before { + content: "\ec8e"; +} +.icon--checklist:before { + content: "\e664"; +} +.icon-youxupailie:before { + content: "\ec86"; +} +.icon-wuxupailie:before { + content: "\ec83"; +} +.icon-charutupian:before { + content: "\ec82"; +} \ No newline at end of file diff --git a/utils/API.js b/utils/API.js index 9c43a02..dc7533e 100644 --- a/utils/API.js +++ b/utils/API.js @@ -357,6 +357,36 @@ const URL_GET_UPDATESCRAP = `${URL_PREFIX}/asset/permanent/updateScrap/`; //查询支付管理列表 const URL_GET_TRANSFERPAYLIST = `${URL_PREFIX}/yinnong/transfer/payList/`; +//查询转账详情 +const URL_GET_TRANSFERINFO= `${URL_PREFIX}/yinnong/transfer/get/`; + +//查询转账列表 +const URL_GET_TRANSFERINFOS= `${URL_PREFIX}/yinnong/transferDetail/getDetails/`; + +//支付验证码 +const URL_GET_SENDMSG= `${URL_PREFIX}/yinnong/transfer/sendSms/`; + +//支付 +const URL_GET_PAY= `${URL_PREFIX}/yinnong/transfer/pay/`; + +//重大事项列表 +const URL_GET_MAJOREVENTLIST= `${URL_PREFIX}/yinnong/majorevent/list/`; + +//重大事项查询 +const URL_GET_MAJOREVENTGET= `${URL_PREFIX}/yinnong/majorevent/get/`; + +//重大事项新增 +const URL_POST_MAJOREVENTADD= `${URL_PREFIX}/yinnong/majorevent/add/`; + +//重大事项修改 +const URL_POST_MAJOREVENTUPDATE= `${URL_PREFIX}/yinnong/majorevent/edit/`; + +//重大事项删除 +const URL_GET_MAJOREVENTDELETE= `${URL_PREFIX}/yinnong/majorevent/remove/`; + +//重大事项提交 +const URL_GET_MAJOREVENTSUBMIT= `${URL_PREFIX}/yinnong/majorevent/customSubmit/`; + /****************接口地址end****************/ @@ -490,5 +520,15 @@ export { URL_POST_UPDATERESIDUALSRATE, URL_GET_UPDATERSALE, URL_GET_UPDATESCRAP, - URL_GET_TRANSFERPAYLIST + URL_GET_TRANSFERPAYLIST, + URL_GET_TRANSFERINFO, + URL_GET_TRANSFERINFOS, + URL_GET_SENDMSG, + URL_GET_PAY, + URL_GET_MAJOREVENTLIST, + URL_GET_MAJOREVENTGET, + URL_POST_MAJOREVENTADD, + URL_POST_MAJOREVENTUPDATE, + URL_GET_MAJOREVENTDELETE, + URL_GET_MAJOREVENTSUBMIT } \ No newline at end of file