From f3c3daa5e65696b479e3176ec279118ffa1a4e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 17 Sep 2023 15:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.js | 3 +- miniprogram/app.json | 17 +- miniprogram/app.wxss | 54 +++- .../quality/list/index.js | 26 +- .../security/list/index.js | 24 +- .../pageage/project_schedule/info/index.wxml | 2 +- .../pageage/project_train/add/index.js | 5 +- .../pageage/project_train/info/index.js | 2 +- .../pages/gengduogongneng/gengduogongneng.js | 28 +- .../gengduogongneng/gengduogongneng.wxml | 2 + .../pages/project_flowable/await/index.js | 2 +- .../pages/project_flowable/await/index.wxml | 1 + .../pages/project_flowable/finished/index.js | 42 ++- .../project_flowable/finished/index.wxml | 3 +- .../project_flowable/myProcessIns/index.js | 277 ++++++++++++++++++ .../project_flowable/myProcessIns/index.json | 7 + .../project_flowable/myProcessIns/index.wxml | 58 ++++ .../project_flowable/myProcessIns/index.wxss | 19 ++ miniprogram/pages/quality_manage/index.js | 37 ++- miniprogram/pages/quality_manage/index.wxml | 1 + miniprogram/pages/safety_manage/index.js | 29 +- miniprogram/pages/safety_manage/index.wxml | 1 + .../pages/xiangmugaikuang/xiangmugaikuang.js | 28 +- .../xiangmugaikuang/xiangmugaikuang.wxml | 1 + 24 files changed, 629 insertions(+), 40 deletions(-) create mode 100644 miniprogram/pages/project_flowable/myProcessIns/index.js create mode 100644 miniprogram/pages/project_flowable/myProcessIns/index.json create mode 100644 miniprogram/pages/project_flowable/myProcessIns/index.wxml create mode 100644 miniprogram/pages/project_flowable/myProcessIns/index.wxss diff --git a/miniprogram/app.js b/miniprogram/app.js index 7a66cd7..3802ede 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -33,6 +33,7 @@ App({ reqUrl:'https://cf.makalu.cc', //reqUrl:'http://127.0.0.1:8091', uploadUrl:"https://cf.makalu.cc/wechat", + //uploadUrl:'http://127.0.0.1:8091/wechat', //御景路数字化集成管控平台接口访问域名 szhUrl:'https://szh.makalu.cc', @@ -88,7 +89,7 @@ App({ wx.showToast({ title: msg, icon: 'none', - duration: 2000, + duration: 1000, mask: true }); }, diff --git a/miniprogram/app.json b/miniprogram/app.json index 4916d38..e211d13 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -18,7 +18,19 @@ "pages/Construction-Log/index", "pages/updatePassword/updatePassword", "pages/safety_manage/index", - "pages/quality_manage/index" + "pages/quality_manage/index", + "pages/project_flowable/initTask/index", + "pages/project_flowable/myFlowDefinition/index", + "pages/project_flowable/await/index", + "pages/project_flowable/approveTask/index", + "pages/project_flowable/approveLeaveTask/index", + "pages/project_flowable/finished/index", + "pages/project_flowable/initLeaveTask/index", + "pages/project_flowable/detailTask/index", + "pages/project_flowable/detailLeaveTask/index", + "pages/project_flowable/editTask/index", + "pages/project_flowable/editLeaveTask/index", + "pages/project_flowable/myProcessIns/index" ], "subpackages": [ { @@ -136,8 +148,7 @@ "select-group-person": "./newComponents/select-group-person/index", "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", "van-dropdown-item": "@vant/weapp/dropdown-item/index", - "curve-echarts": "pages/components/curve-echarts/index", - "curve-echarts-copy": "pages/components/curve-echarts-copy/index" + "curve-echarts": "pages/components/curve-echarts/index" }, "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index 8e574ff..01f2431 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -55,7 +55,7 @@ page{ padding: 166rpx 0 180rpx; } .max_content_scroll{ - padding: 166rpx 0 180rpx; + padding: 166rpx 0 10rpx; } .min_content{ padding: 166rpx 0 20rpx; @@ -132,6 +132,17 @@ page{ padding-bottom: 5rpx; color: #F56C6C; } +.left_begin{ + text-align: center; + padding-bottom: 5rpx; + color: #faf8ff; +} +.left_manage2{ + float: left; + width: 50%; + margin-bottom: 35rpx; + color: #ffffff; +} /* 底部导航 */ .van-tabbar.van-tabbar--fixed{ @@ -1094,7 +1105,7 @@ swiper-item video{ } .inspect_max_scroll{ - height:125vh; + height:75vh; } .inspect_list_scroll{ padding: 10rpx 0; @@ -1497,8 +1508,12 @@ swiper-item video{ padding-right: 25rpx; } .problem_submit_to_delete{ - border-bottom: 1px solid #c13636; - background-color: #c13636; + border-bottom: 1px solid #ff6d6d; + background-color: #ff6d6d; +} +.problem_submit_to_warning{ + border-bottom: 1px solid #E6A23C; + background-color: #E6A23C; } .code_label{ font-size: 0.6rem; @@ -1541,12 +1556,43 @@ swiper-item video{ .files{ word-break: break-all; text-decoration: underline; + padding-bottom: 20rpx; } .zxjc{ border: 5rpx solid #3fabb7; border-radius: 12px; margin-bottom: 12rpx; } +.tabNum{ + position: absolute; + right: 10px; + background-color: #f56c6c; + border-radius: 10px; + color: #fff; + display: inline-block; + font-size: 12px; + height: 18px; + line-height: 18px; + padding: 0 6px; + text-align: center; + white-space: nowrap; + top: 10rpx; +} +.tabNum_active{ + position: absolute; + background-color: #f56c6c; + border-radius: 10px; + color: #fff; + display: inline-block; + font-size: 12px; + height: 18px; + line-height: 18px; + padding: 0 6px; + text-align: center; + white-space: nowrap; + margin-left: 110rpx; + margin-top: 16rpx; +} diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js index 9500629..3e5072b 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js @@ -23,7 +23,8 @@ Page({ pageNum:1, pageSize:10, lastDataSize:10, - minRoleId:"" + minRoleId:"", + list:[], }, skipAdd(){ @@ -109,11 +110,19 @@ Page({ success: function (res) { res = res.data; if(res.code=="200"){ - that.setData({ - pageNum:that.data.pageNum+1, - lastDataSize:res.data.length, - listData:that.data.listData.concat(res.data) - }) + //这里处理this.data.lastDataSize=this.data.pageSize + if(that.data.list.length>0 && res.data.length>0 && that.data.list[0].id==res.data[0].id){ + that.setData({ + lastDataSize:0, + }) + }else{ + that.setData({ + pageNum:that.data.pageNum+1, + lastDataSize:res.data.length, + list:res.data, + listData:that.data.listData.concat(res.data) + }) + } } } }); @@ -155,7 +164,7 @@ Page({ }); }, - /** + /** * 标签切换 */ trainingTypeJump(e){ @@ -174,7 +183,8 @@ Page({ pageNum:1, pageSize:10, lastDataSize:10, - listData:[] + listData:[], + list:[] }); this.getListData(); }, diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js index 1f27b55..bb26b48 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.js +++ b/miniprogram/pageage/project_problemmodify/security/list/index.js @@ -23,7 +23,8 @@ Page({ pageNum:1, pageSize:10, lastDataSize:10, - minRoleId:"" + minRoleId:"", + list:[] }, skipAdd(){ @@ -109,11 +110,19 @@ Page({ success: function (res) { res = res.data; if(res.code=="200"){ - that.setData({ - pageNum:that.data.pageNum+1, - lastDataSize:res.data.length, - listData:that.data.listData.concat(res.data) - }) + //这里处理this.data.lastDataSize=this.data.pageSize + if(that.data.list.length>0 && res.data.length>0 && that.data.list[0].id==res.data[0].id){ + that.setData({ + lastDataSize:0, + }) + }else{ + that.setData({ + pageNum:that.data.pageNum+1, + lastDataSize:res.data.length, + list:res.data, + listData:that.data.listData.concat(res.data) + }) + } } } }); @@ -172,7 +181,8 @@ Page({ pageNum:1, pageSize:10, lastDataSize:10, - listData:[] + listData:[], + list:[] }); this.getListData(); }, diff --git a/miniprogram/pageage/project_schedule/info/index.wxml b/miniprogram/pageage/project_schedule/info/index.wxml index 7d6afad..e8adc91 100644 --- a/miniprogram/pageage/project_schedule/info/index.wxml +++ b/miniprogram/pageage/project_schedule/info/index.wxml @@ -97,7 +97,7 @@ 提交用户 - {{infoData.createBy}} + {{infoData.createBy?infoData.createBy:''}} diff --git a/miniprogram/pageage/project_train/add/index.js b/miniprogram/pageage/project_train/add/index.js index 52b79bf..ae58cd9 100644 --- a/miniprogram/pageage/project_train/add/index.js +++ b/miniprogram/pageage/project_train/add/index.js @@ -283,10 +283,9 @@ Page({ this.data.trainContent = options.detail.value }, - fileUpload(a,b,c){ - let file=a.detail; + fileUpload(e){ this.setData({ - trainFileData: file + trainFileData:e.detail }); }, diff --git a/miniprogram/pageage/project_train/info/index.js b/miniprogram/pageage/project_train/info/index.js index e9e7d5e..3b0208c 100644 --- a/miniprogram/pageage/project_train/info/index.js +++ b/miniprogram/pageage/project_train/info/index.js @@ -185,7 +185,7 @@ Page({ let that = this; wx.downloadFile({ // 示例 url，并非真实存在 - url: that.data.request+that.fileUrls[idx], + url: app.globalData.uploadUrl+'/common/upload/'+that.fileUrls[idx], success: function (res) { const filePath = res.tempFilePath wx.openDocument({ diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js index 93ab174..e1f2834 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.js +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js @@ -19,6 +19,7 @@ Page({ menuList:[], initData:{}, hiddenn:true, + db:0, }, @@ -63,7 +64,8 @@ Page({ projectName:app.globalData.projectName, initData:{text:app.globalData.projectName,id:app.globalData.projectId} }) - that.selectMenuList(res.data.loginName); + that.selectMenuList(res.data.loginName); + that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); } }) @@ -192,4 +194,28 @@ Page({ this.setData({ show: false }); }, + //查询当前登录人的代办任务 + awaitTask(minRoleId,deptId,loginName,userId) { + let param = { + //"businessKey":this.data.projectId, + "nowRole":minRoleId, + "nowDept":deptId, + "nowUserName":loginName, + "nowUser":userId + } + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', + data:param, + method: "post", + success: function (res) { + res = res.data; + if(res.code=="200"){ + that.setData({ + db:res.data.length + }) + } + } + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml index f7c1084..ba56d04 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml @@ -59,6 +59,7 @@ + {{db}} {{item.menu_name}} @@ -174,5 +175,6 @@ style="width:40rpx; height:40rpx;" /> 更多功能 + {{db}} diff --git a/miniprogram/pages/project_flowable/await/index.js b/miniprogram/pages/project_flowable/await/index.js index 7bdd15d..8c1f1d3 100644 --- a/miniprogram/pages/project_flowable/await/index.js +++ b/miniprogram/pages/project_flowable/await/index.js @@ -122,7 +122,7 @@ Page({ }) }, - goWDLC:function(){ + goWDSQ:function(){ wx.redirectTo({ url: '../myProcessIns/index', }) diff --git a/miniprogram/pages/project_flowable/await/index.wxml b/miniprogram/pages/project_flowable/await/index.wxml index cbc4c01..f051bc8 100644 --- a/miniprogram/pages/project_flowable/await/index.wxml +++ b/miniprogram/pages/project_flowable/await/index.wxml @@ -48,6 +48,7 @@ + 项目名称：{{item.businessKeyName}} 审批事项：{{item.procDefName}} 接收时间：{{item.createTime}} 申请用户：{{item.startUserName}} diff --git a/miniprogram/pages/project_flowable/finished/index.js b/miniprogram/pages/project_flowable/finished/index.js index 8163b59..0051c02 100644 --- a/miniprogram/pages/project_flowable/finished/index.js +++ b/miniprogram/pages/project_flowable/finished/index.js @@ -82,11 +82,16 @@ Page({ lastDataSize:0, }) }else{ + let _list = []; + res.rows.forEach( it => { + it.duration = that.getDurationDate(it.duration); + _list.push(it); + }); that.setData({ pageNum:that.data.pageNum+1, lastDataSize:res.rows.length, list:res.rows, - listData:that.data.listData.concat(res.rows) + listData:that.data.listData.concat(_list) }) } }else{ @@ -96,6 +101,41 @@ Page({ }); }, + getDurationDate(val){ + let day=0; + let hours=0; + let min = val; + if(min>1440){ + day = parseInt(min/1440); + min = min % 1440; + if(min>60){ + hours = parseInt(min/60); + min = min % 60; + } + }else if(min>60){ + hours = parseInt(min/60); + min = min % 60; + } + if(day>0){ + if(day<10) day="0"+day; + if(hours<10) hours="0"+hours; + if(min<10) min="0"+min; + return day+"天"+hours+"小时"+min+"分钟"; + } + if(hours>0){ + if(hours<10) hours="0"+hours; + if(min<10) min="0"+min; + return hours+"小时"+min+"分钟"; + } + if(min>0){ + if(min<10) min="0"+min; + return min+"分钟"; + } + if(min==0){ + return "1分钟"; + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/project_flowable/finished/index.wxml b/miniprogram/pages/project_flowable/finished/index.wxml index 3b0175b..abb0596 100644 --- a/miniprogram/pages/project_flowable/finished/index.wxml +++ b/miniprogram/pages/project_flowable/finished/index.wxml @@ -5,7 +5,7 @@ - 申请办理完成 + 流程办理完成 @@ -34,6 +34,7 @@ 接收时间：{{item.createTime}} 申请用户：{{item.startUserName}} 申请单位：{{item.startDeptName}} + 处理耗时：{{item.duration}} diff --git a/miniprogram/pages/project_flowable/myProcessIns/index.js b/miniprogram/pages/project_flowable/myProcessIns/index.js new file mode 100644 index 0000000..1a42815 --- /dev/null +++ b/miniprogram/pages/project_flowable/myProcessIns/index.js @@ -0,0 +1,277 @@ +// pageage/safetyManagement/securityCheckGR/index.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + userId:"", + projectId:"", + projectData:{}, + initData: {}, + show:false, + list:[], + listData:[], + pageNum:1, + pageSize:10, + lastDataSize:10, + activeState:"await", + allCount:0, + awaitCount:0, + finishedCount:0, + }, + + /** + * 标签切换 + */ + typeJump(e){ + let index = e.currentTarget.dataset.index; + let nav = ""; + if(index == 1){ + nav = 'all'; + }else if(index == 2){ + nav = 'await'; + }else if(index == 3){ + nav = 'finished'; + } + + this.setData({ + activeState:nav, + pageNum:1, + pageSize:10, + lastDataSize:10, + listData:[], + list:[] + }); + this.getListData(this.data.userId); + }, + + getInfo(e){ + let {deployId,procInsId,taskId,taskName,procDefKey,startDeptName,startUserName,procDefName,businessKeyName,finishTime} = e.currentTarget.dataset.set + if(!finishTime){ + finishTime=""; + } + if(taskName=="提交申请"){ + if(procDefKey=="flow_xmglzdl_qjspb"){ + wx.redirectTo({ + url: `../editLeaveTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&ret=myProcess`, + }) + }else{ + wx.redirectTo({ + url: `../editTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&ret=myProcess`, + }) + } + }else{ + //根据不同业务跳转不同表单 + if(procDefKey=="flow_xmglzdl_qjspb"){ + wx.redirectTo({ + url: `../detailLeaveTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&finishTime=${finishTime}&ret=myProcess`, + }) + }else{ + wx.redirectTo({ + url: `../detailTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&finishTime=${finishTime}&ret=myProcess`, + }) + } + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success:res=>{ + this.setData({ + userId:res.data.userId, + projectId:app.globalData.projectId, + initData:{text:app.globalData.projectName,id:app.globalData.projectId} + }) + this.getListData(res.data.userId); + } + }) + }, + + /** + * 查询项目举牌验收数据 + */ + getListData(userId) { + //进入这里说明数据加载完毕 + if(this.data.lastDataSize0 && res.rows.length>0 && that.data.list[0].taskId==res.rows[0].taskId){ + that.setData({ + lastDataSize:0, + }) + }else{ + let _list = []; + res.rows.forEach( it => { + it.duration = that.getDurationDate(it.duration); + _list.push(it); + }); + that.setData({ + pageNum:that.data.pageNum+1, + lastDataSize:res.rows.length, + list:res.rows, + listData:that.data.listData.concat(_list) + }) + } + }else{ + app.toast(res.msg); + } + } + }); + }, + + queryCount(param){ + let that = this; + //查询统计数量 + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/queryCount', + data: param, + method: "get", + success: function (res) { + let awaits=0; + if(res.data.data.await){ + awaits=res.data.data.await; + } + let finished=0; + if(res.data.data.finished){ + finished=res.data.data.finished; + } + that.setData({ + allCount:awaits+finished, + awaitCount:awaits, + finishedCount:finished + }); + } + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.redirectTo({ + url: '../await/index', + }) + }, + + onScrollToLower(){ + console.log("滚动条到底了，开始加载新数据"); + this.getListData(this.data.userId); + }, + + //项目切换 返回值 + onProjectSelect(e){ + let projectId = e.detail.id; + let projectName = e.detail.text; + app.globalData.projectId = projectId; + app.globalData.projectName = projectName; + this.onLoad(); + }, + + getDurationDate(val){ + let day=0; + let hours=0; + let min = val; + if(min>1440){ + day = parseInt(min/1440); + min = min % 1440; + if(min>60){ + hours = parseInt(min/60); + min = min % 60; + } + }else if(min>60){ + hours = parseInt(min/60); + min = min % 60; + } + if(day>0){ + if(day<10) day="0"+day; + if(hours<10) hours="0"+hours; + if(min<10) min="0"+min; + return day+"天"+hours+"小时"+min+"分钟"; + } + if(hours>0){ + if(hours<10) hours="0"+hours; + if(min<10) min="0"+min; + return hours+"小时"+min+"分钟"; + } + if(min>0){ + if(min<10) min="0"+min; + return min+"分钟"; + } + if(min==0){ + return "1分钟"; + } + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/project_flowable/myProcessIns/index.json b/miniprogram/pages/project_flowable/myProcessIns/index.json new file mode 100644 index 0000000..c38e268 --- /dev/null +++ b/miniprogram/pages/project_flowable/myProcessIns/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-overlay": "@vant/weapp/overlay/index" , + "van-popup": "@vant/weapp/popup/index" + }, + "navigationStyle":"custom" +} \ No newline at end of file diff --git a/miniprogram/pages/project_flowable/myProcessIns/index.wxml b/miniprogram/pages/project_flowable/myProcessIns/index.wxml new file mode 100644 index 0000000..435eef6 --- /dev/null +++ b/miniprogram/pages/project_flowable/myProcessIns/index.wxml @@ -0,0 +1,58 @@ + + + + + + + + 我发起的流程 + + + + + + + + 全部（{{allCount}}） + 进行中（{{awaitCount}}） + 已完成（{{finishedCount}}） + + + + + + + {{index < 9 ?'0'+(index+1):(index+1)}} + {{item.createTime}} + 进行中 + 已完成 + 已终止 + + + + + 项目名称：{{item.businessKeyName}} + 审批事项：{{item.procDefName}} {{' v'+item.procDefVersion}} + 流程类别：程序及质量类安全类认价类图纸类项目管理制度类索赔类特殊事项确认类 + 当前节点：{{item.taskName}} + 流程结束 + + 处理耗时：{{item.duration}} + 办结时间：{{item.finishTime}} + + + + + + + 暂无数据 + + + + + + + + + + diff --git a/miniprogram/pages/project_flowable/myProcessIns/index.wxss b/miniprogram/pages/project_flowable/myProcessIns/index.wxss new file mode 100644 index 0000000..8aacdd7 --- /dev/null +++ b/miniprogram/pages/project_flowable/myProcessIns/index.wxss @@ -0,0 +1,19 @@ +/* pageage/project_checking_list/project_checking_list.wxss */ +.gd_max{ + padding:10rpx 50rpx 0; + } + .gd_min{ + padding: 30rpx 0; + text-align: center; + } + .gd_min image{ + width: 150rpx; + height: 150rpx; + } + .gd_min view{ + padding: 10rpx; + color: #89a4eb; + } + .inspect_max_scroll_1 { + height: 82vh; +} \ No newline at end of file diff --git a/miniprogram/pages/quality_manage/index.js b/miniprogram/pages/quality_manage/index.js index f52a59f..e180d70 100644 --- a/miniprogram/pages/quality_manage/index.js +++ b/miniprogram/pages/quality_manage/index.js @@ -37,26 +37,29 @@ Page({ //举牌验收 checkValue:0, checkPassRate:100, - materialSealStatistics:[{ name: "其它", value: 0, prop: 0}] + materialSealStatistics:[{ name: "其它", value: 0, prop: 0}], + db:0, }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + let that = this; //获取缓存数据 wx.getStorage({ key: 'userinfo', success:res=>{ - this.setData({ + that.setData({ loginName:res.data.loginName, nickName:res.data.nickName, projectId:app.globalData.projectId, projectNameArgs:app.globalData.projectName, initData:{text:app.globalData.projectName,id:app.globalData.projectId} }) - this.selectMenuList(res.data.loginName); - this.initPage(app.globalData.projectId) + that.selectMenuList(res.data.loginName); + that.initPage(app.globalData.projectId); + that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); } }) }, @@ -432,5 +435,29 @@ Page({ onClosePopup() { this.setData({ show: false }); }, - + + //查询当前登录人的代办任务 + awaitTask(minRoleId,deptId,loginName,userId) { + let param = { + //"businessKey":this.data.projectId, + "nowRole":minRoleId, + "nowDept":deptId, + "nowUserName":loginName, + "nowUser":userId + } + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', + data:param, + method: "post", + success: function (res) { + res = res.data; + if(res.code=="200"){ + that.setData({ + db:res.data.length + }) + } + } + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/quality_manage/index.wxml b/miniprogram/pages/quality_manage/index.wxml index 3cebbc9..000c6fe 100644 --- a/miniprogram/pages/quality_manage/index.wxml +++ b/miniprogram/pages/quality_manage/index.wxml @@ -474,5 +474,6 @@ style="width:40rpx; height:40rpx;" /> 更多功能 + {{db}} diff --git a/miniprogram/pages/safety_manage/index.js b/miniprogram/pages/safety_manage/index.js index 51848d7..4e13092 100644 --- a/miniprogram/pages/safety_manage/index.js +++ b/miniprogram/pages/safety_manage/index.js @@ -36,7 +36,8 @@ Page({ specialCheckNumber: 0,//专项检查次数 }, menuList:[], - request:app.globalData.reqUrl + request:app.globalData.reqUrl, + db:0, }, //项目切换 返回值 @@ -73,6 +74,7 @@ Page({ }) that.selectMenuList(res.data.loginName); that.initPage(app.globalData.projectId); + that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); } }) }, @@ -445,5 +447,28 @@ Page({ }) }, - + //查询当前登录人的代办任务 + awaitTask(minRoleId,deptId,loginName,userId) { + let param = { + //"businessKey":this.data.projectId, + "nowRole":minRoleId, + "nowDept":deptId, + "nowUserName":loginName, + "nowUser":userId + } + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', + data:param, + method: "post", + success: function (res) { + res = res.data; + if(res.code=="200"){ + that.setData({ + db:res.data.length, + }) + } + } + }) + }, }) diff --git a/miniprogram/pages/safety_manage/index.wxml b/miniprogram/pages/safety_manage/index.wxml index c366db7..3e08246 100644 --- a/miniprogram/pages/safety_manage/index.wxml +++ b/miniprogram/pages/safety_manage/index.wxml @@ -260,6 +260,7 @@ style="width:40rpx; height:40rpx;" /> 更多功能 + {{db}} diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js index 5e44ac0..7f2166c 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js +++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js @@ -296,6 +296,7 @@ Page({ //加载模板参数 loadShow:false, initData:{}, + db:0, }, //项目切换 返回值 @@ -401,6 +402,7 @@ Page({ projectNameArgs:app.globalData.projectName, initData:{text:app.globalData.projectName,id:app.globalData.projectId} }) + that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); } }) //根据id获取组件 @@ -668,7 +670,31 @@ Page({ wx.redirectTo({ url: '../gongchengliebiao/gongchengliebiao' }) - } + }, + //查询当前登录人的代办任务 + awaitTask(minRoleId,deptId,loginName,userId) { + let param = { + //"businessKey":this.data.projectId, + "nowRole":minRoleId, + "nowDept":deptId, + "nowUserName":loginName, + "nowUser":userId + } + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', + data:param, + method: "post", + success: function (res) { + res = res.data; + if(res.code=="200"){ + that.setData({ + db:res.data.length + }) + } + } + }) + }, }) diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml index f29fb8e..c2acad4 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml +++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml @@ -231,6 +231,7 @@ style="width:40rpx; height:40rpx;" /> 更多功能 + {{db}}