From 03f9ec6ed55ef36b205333fed3ec4ae2d99835ef Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Wed, 13 Apr 2022 14:16:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- image/index/dept.png | Bin 0 -> 1325 bytes image/index/local.png | Bin 0 -> 1256 bytes pages/apply/approval/approval.js | 14 +++++- pages/index/index.js | 6 ++- pages/index/index.wxml | 10 ++--- pages/index/index.wxss | 11 ++++- pages/index/settle/eSign/index.js | 62 ++++++++++++++++++++------- pages/index/settle/eSign/index.wxml | 3 +- pages/index/settle/passWord/index.js | 28 +++++------- utils/API.js | 5 ++- 10 files changed, 94 insertions(+), 45 deletions(-) create mode 100644 image/index/dept.png create mode 100644 image/index/local.png diff --git a/image/index/dept.png b/image/index/dept.png new file mode 100644 index 0000000000000000000000000000000000000000..d41648cbf31ebdb4fb161f17b5be7f1542b24183 GIT binary patch literal 1325 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yc06!V;*iRM zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>-ja9Ssf4O^uu!UEK@~U7ej=Oif%3Eu5V! zjZKW4+{|ElUGkGlb5rw5V0u#!dW~`F1*L`D0-((Gs+w#awY zl1>e$ORPCt1bSK%xTIMf4Fxs?)a=`P{3dUtiP#}Ii#z9yi__jM-Mx6Cfr*6Y`Qx3p zj&%A7)k<#K`@n48qReGX|AlAzr+3&#?_FBc`{uanW^QJ|F6UIQvEO3n z^w|3D!cucan?;|CRd#LJpSYn*aGlfp;C(`m*RgI}z!l107O^F+v}DGCw&>*Il>)Pu z25z7GXRYDnz}%^)m@R$tEJW%8oB9?%^vRC+ll`jkOl-Jy{@lXL53_%yZ%dBkoii!t zyx{aDAOCcjn}!EJoz(HWbxXn%-R^E`cEu( zns+(wVc#*v#&0VMSo3bP`rAL{Ne?YfE8VsDQT&qgcl1{s7hc@EqFY$-$wA9y=QP6Z zPd9A-ez!(I|4NzXl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz zEwNPsx)kDt+yc06!V;*iRM zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>-j3%?yo9P0gJgUEK@~U7a0`Elix9ot(`q z3|x)PO^soCUGkGlb5rw5V0u#!dM$A31*L`D0-((Sj}!K=ez5@i!r_BjRB9xx}P%^g*b};^p?4h zeb4%!NQbhIoKoj+jel)B=B&2#am?Z|=2FetxcZvVoZBVx { let data={ loginDeptID : this.getRegionId('areas') diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8c78354..7d79f60 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -18,24 +18,24 @@ + {{ region || "请选择" }} - + + + + {{array[index]|| bookName}} - - - {{userInfoObj.allDeptName}} - diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 2eb0fd7..1c90d02 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -73,7 +73,14 @@ border-radius: 44rpx; border:2rpx solid #2c8e68; text-align: center; - font-size: 28rpx; + font-size: 24rpx; +} + +.information_header .task_wrap .flex_block .icon{ + width: 30rpx; + height: 30rpx; + vertical-align: sub; + display:inline-block; } .information_header .task_wrap .flex_block .desc{ width: 115rpx; @@ -105,7 +112,7 @@ .information_header .task_wrap .flex_block .event{ color: #2c8e68; margin-left: -2%; - padding:0 8rpx 0 5rpx; + padding:0 20rpx 0 20rpx; } diff --git a/pages/index/settle/eSign/index.js b/pages/index/settle/eSign/index.js index 16c7631..404dc1c 100644 --- a/pages/index/settle/eSign/index.js +++ b/pages/index/settle/eSign/index.js @@ -12,16 +12,43 @@ Page({ isEmpty: true, baseItem:"", item:{}, + url:"", + isShow:false }, onLoad: function(options) { - this.setData({baseItem:options.item}); - this.setData({item:JSON.parse(options.item)}); - console.log(this.data.item); - var ctx = wx.createCanvasContext('handWriting'); - const data = { - devicePixelRatio: pix, - }; - signaturePad = new SignaturePad(ctx, data); + this.getUserInfo(); + this.getBaseUrl() + }, + /* 获取用户信息*/ + getUserInfo(){ + UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + this.setData({item:res.user}) + if(this.data.item.electronicSignature==null||this.data.item.electronicSignature==""){ + this.setData({isShow:false}) + var ctx = wx.createCanvasContext('handWriting'); + const data = { + devicePixelRatio: pix, + }; + signaturePad = new SignaturePad(ctx, data); + }else{ + this.setData({isShow:true}) + } + } + } + }) + }, + getBaseUrl:function(){ + let params={ + configKey: "system.attachment.url"} + UTIL.httpRequest(API.URL_GET_SYSCONFIG,params,{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + this.setData({url:res.rows[0].configValue+this.data.item.electronicSignature}) + } + } + }) }, uploadScaleStart(e) { const item = { @@ -46,6 +73,12 @@ Page({ }) }, retDraw: function() { + this.setData({isShow:false}) + var ctx = wx.createCanvasContext('handWriting'); + const data = { + devicePixelRatio: pix, + }; + signaturePad = new SignaturePad(ctx, data); signaturePad.clear(); const isEmpty = signaturePad.isEmpty(); this.setData({ @@ -73,7 +106,6 @@ Page({ wx.canvasToTempFilePath({ canvasId: 'handWriting', success: function(res) { - console.log(res); wx.uploadFile({       url: API.URL_POST_UPLOADFILE, //服务器地址       filePath:res.tempFilePath,//本地照片地址 @@ -84,11 +116,6 @@ Page({ },       success (res){ let dd = JSON.parse(res.data) - // console.log(dd); - // let a = _this.data.item - // a.electronicSignature = dd.fileName - // _this.setData({item:a}); - // _this.saveESign(JSON.stringify(_this.data.item)); if(dd.code==200){ wx.showToast({ title: dd.msg, @@ -117,9 +144,12 @@ Page({ saveESign : function(item){ UTIL.httpRequest(API.URL_POST_USEREDIT,item,{ success: (res) => { - console.log(res); if (res.code == API.SUCCESS_CODE) { - console.log(res); + wx.showToast({ + title: "保存成功！", + duration: 2000, + icon:"success" + }) } } }) diff --git a/pages/index/settle/eSign/index.wxml b/pages/index/settle/eSign/index.wxml index 475c5c2..5142fe5 100644 --- a/pages/index/settle/eSign/index.wxml +++ b/pages/index/settle/eSign/index.wxml @@ -9,8 +9,9 @@ - + + 手写签名 diff --git a/pages/index/settle/passWord/index.js b/pages/index/settle/passWord/index.js index ccbe1d3..4fb979d 100644 --- a/pages/index/settle/passWord/index.js +++ b/pages/index/settle/passWord/index.js @@ -20,9 +20,17 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.setData({baseItem:options.item}); - this.setData({item:JSON.parse(options.item)}); - console.log(this.data.item); + this.getUserInfo() + }, + /* 获取用户信息*/ + getUserInfo(){ + UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + this.setData({item:res.user}) + } + } + }) }, bindOldInput: function (e) { console.log(e); @@ -86,20 +94,6 @@ updatePassword(){ console.log(response); } }) - // UTIL.httpRequest(API.URL_POST_UPDATEPWD, d, { - // success: (res) => { - // console.log(res); - // if (res.code == API.SUCCESS_CODE) { - - // } - // }, - // fail:(res) => { - // console.log(res); - // }, - // complete:(res) => { - // console.log(res); - // } - // }) } }, back:function(){ diff --git a/utils/API.js b/utils/API.js index 56e1f92..f0657f6 100644 --- a/utils/API.js +++ b/utils/API.js @@ -92,6 +92,8 @@ const URL_POST_APPROVALITEMSEDIT = `${URL_PREFIX}/yinnong/approvalItems/edit`; const URL_POST_TEMPLATEEDIT = `${URL_PREFIX}/service/templateDetail/editBatch`; //审核事项申请 const URL_POST_APPROVALITEMSSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/approvalItemsSubmit/`; +//附件上传配置列表 +const URL_GET_SYSCONFIG = `${URL_PREFIX}/system/config/list`; /****************接口地址end****************/ export { @@ -135,5 +137,6 @@ export { URL_GET_APPROVALITEMSBYID, URL_POST_APPROVALITEMSEDIT, URL_POST_TEMPLATEEDIT, - URL_POST_APPROVALITEMSSUBMIT + URL_POST_APPROVALITEMSSUBMIT, + URL_GET_SYSCONFIG } \ No newline at end of file