From 96eaa19819bb5c1a9c0db7d005d43d5a110efc09 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: Sat, 23 Sep 2023 20:13:40 +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.json | 7 +- .../project_checkDetection/add/index.js | 2 +- .../project_checkDetection/add/index.wxml | 4 +- .../project_checkDetection/check/index.js | 17 +- .../project_checkDetection/check/index.wxml | 2 +- .../project_checkDetection/info/index.js | 62 ++- .../project_checkDetection/info/index.json | 5 +- .../project_checkDetection/info/index.wxml | 108 +++-- .../project_checkDetection/info/index.wxss | 47 +++ .../project_checkDetection/list/index.js | 23 +- .../project_checkDetection/list/index.wxml | 2 +- .../pageage/project_checking/add/index.js | 20 +- .../pageage/project_checking/add/index.wxml | 4 +- .../pageage/project_checking/info/index.js | 32 ++ .../pageage/project_checking/info/index.json | 4 +- .../pageage/project_checking/info/index.wxml | 32 +- .../pageage/project_checking/info/index.wxss | 47 +++ .../pageage/project_checking/list/index.js | 50 ++- .../pageage/project_checking/list/index.wxml | 4 + .../pageage/project_materialSeal/add/index.js | 63 ++- .../project_materialSeal/add/index.wxml | 7 + .../project_materialSeal/info/index.js | 32 ++ .../project_materialSeal/info/index.json | 4 +- .../project_materialSeal/info/index.wxml | 45 ++ .../project_materialSeal/info/index.wxss | 47 +++ .../project_materialSeal/list/index.js | 48 ++- .../project_materialSeal/list/index.wxml | 4 + .../pageage/project_measure/add/index.js | 20 +- .../pageage/project_measure/add/index.wxml | 4 +- .../pageage/project_measure/info/index.js | 32 ++ .../pageage/project_measure/info/index.json | 5 +- .../pageage/project_measure/info/index.wxml | 33 +- .../pageage/project_measure/info/index.wxss | 47 +++ .../pageage/project_measure/list/index.js | 41 +- .../pageage/project_measure/list/index.wxml | 4 + .../pages/gengduogongneng/gengduogongneng.js | 9 +- .../gengduogongneng/gengduogongneng.wxml | 3 +- .../approveCheckDetection/index.js | 302 ++++++++++++++ .../approveCheckDetection/index.json | 8 + .../approveCheckDetection/index.wxml | 187 +++++++++ .../approveCheckDetection/index.wxss | 70 ++++ .../project_approve/approveChecking/index.js | 278 +++++++++++++ .../approveChecking/index.json | 10 + .../approveChecking/index.wxml | 150 +++++++ .../approveChecking/index.wxss | 70 ++++ .../approveMaterialSeal/index.js | 390 ++++++++++++++++++ .../approveMaterialSeal/index.json | 10 + .../approveMaterialSeal/index.wxml | 189 +++++++++ .../approveMaterialSeal/index.wxss | 70 ++++ .../project_approve/approveMeasure/index.js | 272 ++++++++++++ .../project_approve/approveMeasure/index.json | 8 + .../project_approve/approveMeasure/index.wxml | 165 ++++++++ .../project_approve/approveMeasure/index.wxss | 70 ++++ miniprogram/pages/project_approve/index.js | 184 +++++++++ miniprogram/pages/project_approve/index.json | 8 + miniprogram/pages/project_approve/index.wxml | 58 +++ miniprogram/pages/project_approve/index.wxss | 1 + .../project_flowable/editLeaveTask/index.js | 2 +- miniprogram/pages/quality_manage/index.js | 5 +- miniprogram/pages/safety_manage/index.js | 5 +- .../pages/xiangmugaikuang/xiangmugaikuang.js | 5 +- 61 files changed, 3298 insertions(+), 139 deletions(-) create mode 100644 miniprogram/pages/project_approve/approveCheckDetection/index.js create mode 100644 miniprogram/pages/project_approve/approveCheckDetection/index.json create mode 100644 miniprogram/pages/project_approve/approveCheckDetection/index.wxml create mode 100644 miniprogram/pages/project_approve/approveCheckDetection/index.wxss create mode 100644 miniprogram/pages/project_approve/approveChecking/index.js create mode 100644 miniprogram/pages/project_approve/approveChecking/index.json create mode 100644 miniprogram/pages/project_approve/approveChecking/index.wxml create mode 100644 miniprogram/pages/project_approve/approveChecking/index.wxss create mode 100644 miniprogram/pages/project_approve/approveMaterialSeal/index.js create mode 100644 miniprogram/pages/project_approve/approveMaterialSeal/index.json create mode 100644 miniprogram/pages/project_approve/approveMaterialSeal/index.wxml create mode 100644 miniprogram/pages/project_approve/approveMaterialSeal/index.wxss create mode 100644 miniprogram/pages/project_approve/approveMeasure/index.js create mode 100644 miniprogram/pages/project_approve/approveMeasure/index.json create mode 100644 miniprogram/pages/project_approve/approveMeasure/index.wxml create mode 100644 miniprogram/pages/project_approve/approveMeasure/index.wxss create mode 100644 miniprogram/pages/project_approve/index.js create mode 100644 miniprogram/pages/project_approve/index.json create mode 100644 miniprogram/pages/project_approve/index.wxml create mode 100644 miniprogram/pages/project_approve/index.wxss diff --git a/miniprogram/app.json b/miniprogram/app.json index e211d13..d7e21a0 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -30,7 +30,12 @@ "pages/project_flowable/detailLeaveTask/index", "pages/project_flowable/editTask/index", "pages/project_flowable/editLeaveTask/index", - "pages/project_flowable/myProcessIns/index" + "pages/project_flowable/myProcessIns/index", + "pages/project_approve/index", + "pages/project_approve/approveCheckDetection/index", + "pages/project_approve/approveChecking/index", + "pages/project_approve/approveMaterialSeal/index", + "pages/project_approve/approveMeasure/index" ], "subpackages": [ { diff --git a/miniprogram/pageage/project_checkDetection/add/index.js b/miniprogram/pageage/project_checkDetection/add/index.js index 632b66d..3eaf3d2 100644 --- a/miniprogram/pageage/project_checkDetection/add/index.js +++ b/miniprogram/pageage/project_checkDetection/add/index.js @@ -134,7 +134,7 @@ Page({ }) }, - //添加抄送人 + //添加监理专员 onAddSend(e){ if(e.detail.length>0){ let phoneNumbers=""; diff --git a/miniprogram/pageage/project_checkDetection/add/index.wxml b/miniprogram/pageage/project_checkDetection/add/index.wxml index 47405ef..aa03ae1 100644 --- a/miniprogram/pageage/project_checkDetection/add/index.wxml +++ b/miniprogram/pageage/project_checkDetection/add/index.wxml @@ -48,9 +48,9 @@ - 见证人 + 监理专员 - + diff --git a/miniprogram/pageage/project_checkDetection/check/index.js b/miniprogram/pageage/project_checkDetection/check/index.js index cd23387..dd97199 100644 --- a/miniprogram/pageage/project_checkDetection/check/index.js +++ b/miniprogram/pageage/project_checkDetection/check/index.js @@ -110,13 +110,13 @@ Page({ }) return; } - if(detectionResult==""){ - app.toast("请选择检测结果!") - that.setData({ - loadShow:false - }) - return; - } + // if(detectionResult==""){ + // app.toast("请选择检测结果!") + // that.setData({ + // loadShow:false + // }) + // return; + // } if(detectionFileData.length==0){ app.toast("请上传检测报告!") that.setData({ @@ -142,8 +142,9 @@ Page({ let params = { id, checkState:"2", - detectionResult, + //detectionResult, detectionFile:obj.data.fileName, + approveStatus:"1", updateBy:loginName } diff --git a/miniprogram/pageage/project_checkDetection/check/index.wxml b/miniprogram/pageage/project_checkDetection/check/index.wxml index d58a638..0f8ab90 100644 --- a/miniprogram/pageage/project_checkDetection/check/index.wxml +++ b/miniprogram/pageage/project_checkDetection/check/index.wxml @@ -95,7 +95,7 @@ 登记取样复试结果 - + 检测结果 diff --git a/miniprogram/pageage/project_checkDetection/info/index.js b/miniprogram/pageage/project_checkDetection/info/index.js index a37d98e..0903701 100644 --- a/miniprogram/pageage/project_checkDetection/info/index.js +++ b/miniprogram/pageage/project_checkDetection/info/index.js @@ -15,6 +15,8 @@ Page({ minDetectionFileImages:[], detectionFiles:[], fileUrls:[], + activeName:"", + flowRecordList:[], request:app.globalData.reqUrl }, @@ -32,11 +34,11 @@ Page({ loginName:res.data.loginName }) this.getInfo(); + this.getAuditinfo(); } }) }, - /** * 获取安全检查详情信息 * @@ -85,13 +87,43 @@ Page({ if(res.data.createBy==that.data.loginName){ that.setData({ showDel:true - }) + }) } } } }) }, + /** + * 查询流程日志 + */ + getAuditinfo(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', + method:"get", + data:{ + fromType:"1", + fromId:this.data.id + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + flowRecordList:res.data + }) + } + } + }) + }, + + // 手风琴 + onChange(event) { + this.setData({ + activeName: event.detail, + }); + }, + onDelete(){ //弹出确认 let that = this @@ -128,13 +160,13 @@ Page({ }) }, - //展示图片 - showImg:function(e){ - var that=this; - wx.previewImage({ - urls: that.data.imageList, - current: that.data.imageList[e.currentTarget.dataset.index] - }) + //展示图片 + showImg:function(e){ + var that=this; + wx.previewImage({ + urls: that.data.imageList, + current: that.data.imageList[e.currentTarget.dataset.index] + }) }, downFile:function(e){ @@ -158,12 +190,12 @@ Page({ //app.toast("暂不支持下载！如需下载请前往后台管理系统！！") }, - returnToPage: function () { - /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ - wx.redirectTo({ - url: '../list/index', - }) - }, + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.redirectTo({ + url: '../list/index', + }) + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pageage/project_checkDetection/info/index.json b/miniprogram/pageage/project_checkDetection/info/index.json index ba2821f..8f17a33 100644 --- a/miniprogram/pageage/project_checkDetection/info/index.json +++ b/miniprogram/pageage/project_checkDetection/info/index.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item" + }, "navigationStyle":"custom" } \ No newline at end of file diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxml b/miniprogram/pageage/project_checkDetection/info/index.wxml index 666fea9..30a1718 100644 --- a/miniprogram/pageage/project_checkDetection/info/index.wxml +++ b/miniprogram/pageage/project_checkDetection/info/index.wxml @@ -14,6 +14,36 @@ + + + + + + + + + {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + + 提交取样复试 + 审批取样复试 + {{item.commentResult}} + 合格 + 不合格 + + + + + 办理用户：{{item.userName}} + 办理单位：{{item.deptName}} + 办理时间：{{item.createTime}} + 审批意见：{{item.comment}} + + + + + + + {{infoData.projectName}} @@ -90,47 +120,47 @@ - - - 材料取样复试结果 - - + + + 检测报告登记结果 + + - - 登记用户 - {{infoData.updateBy}} - - - - - 登记时间 - {{infoData.updateTime}} - - - - - 复试结果 - - 合格 - 不合格 - - - - - - 检测报告 - - - - - - - 下载附件 - - - - + + 登记用户 + {{infoData.updateBy}} + + + + 登记时间 + {{infoData.updateTime}} + + + + + 检测报告 + + + + + + + 下载附件 + + + + + + + 检测结果 + + 合格 + 不合格 + + + + 删除 diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxss b/miniprogram/pageage/project_checkDetection/info/index.wxss index e8ea92e..029322f 100644 --- a/miniprogram/pageage/project_checkDetection/info/index.wxss +++ b/miniprogram/pageage/project_checkDetection/info/index.wxss @@ -20,4 +20,51 @@ height: 180rpx; border-radius: 15rpx; position: relative; + } + .van-collapse.van-hairline--top-bottom:after{ + border-width: 0px 0; + } + .van-cell.van-cell--borderless{ + background-color: #2b345b; + color: #fff; + margin-top: 30rpx; + border-radius: 5rpx; + } + .van-cell.van-cell--borderless:active{ + background-color: #2b345b; + } + .van-collapse-item__title.van-collapse-item__title--expanded:active{ + background-color: #2b345b; + } + .van-collapse-item .van-cell:after{ + border-bottom: 0; + } + .van-collapse-item.van-hairline--top:after{ + border-top-width:0 + } + .van-cell.van-cell--clickable{ + background-color: #2b345b; + margin-top: 30rpx; + color: #fff; + border-radius: 15rpx; + + } + .van-cell.van-cell--clickable:active{ + background-color: #2b345b; + } + .van-collapse-item__wrapper .van-collapse-item__content{ + background-color: #1e2336; + color:#8ca4ec ; + border-width: 0px 0; + } + .gk_open_con view{ + padding: 10rpx 0; + width: 100%; + } + .gk_open_con image{ + width: 30rpx; + height: 30rpx; + margin-right: 5rpx; + position: relative; + top: 5rpx; } \ No newline at end of file diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js index 93daddd..a0f978a 100644 --- a/miniprogram/pageage/project_checkDetection/list/index.js +++ b/miniprogram/pageage/project_checkDetection/list/index.js @@ -14,8 +14,8 @@ Page({ initData: {}, show:false, listData:[], - activeState:"sjz", - sjzCount:0, + activeState:"jxz", + jxzCount:0, ywcCount:0, request:app.globalData.reqUrl }, @@ -96,38 +96,29 @@ Page({ } let that = this; wx.request({ - url: app.globalData.reqUrl + '/wechat/projectDetection/queryCount', + url: app.globalData.reqUrl + '/wechat/projectDetection/findGroupCountByApprove', data: param, method: "get", success: function (res) { - let check1=0; - let check2=0; - if(res.data.data.check1){ - check1+=res.data.data.check1; - } - if(res.data.data.check2){ - check2+=res.data.data.check2; - } that.setData({ - sjzCount:check1, - ywcCount:check2 + jxzCount:res.data.data.jxz, + ywcCount:res.data.data.ywc }); } }); }, - /** + /** * 标签切换 */ typeJump(e){ let index = e.currentTarget.dataset.index; let nav = ""; if(index == 1){ - nav = 'sjz'; + nav = 'jxz'; }else if(index == 2){ nav = 'ywc'; } - this.setData({ activeState:nav }); diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml index 06c99b5..6a1315d 100644 --- a/miniprogram/pageage/project_checkDetection/list/index.wxml +++ b/miniprogram/pageage/project_checkDetection/list/index.wxml @@ -13,7 +13,7 @@ - 送检中（{{sjzCount}}） + 进行中（{{jxzCount}}） 已完成（{{ywcCount}}） diff --git a/miniprogram/pageage/project_checking/add/index.js b/miniprogram/pageage/project_checking/add/index.js index 98c4b78..cd28eeb 100644 --- a/miniprogram/pageage/project_checking/add/index.js +++ b/miniprogram/pageage/project_checking/add/index.js @@ -14,7 +14,6 @@ Page({ loginName:"", userName:"", rectifierData:[], - rectifierData2:[], imageInfoData:[], checkingResult:"1", //验收时间 @@ -57,6 +56,7 @@ Page({ url: app.globalData.reqUrl+'/wechat/projectuserinfo/list', method:"get", data:{ + unitType:"4", projectId:that.data.projectId }, header:{ @@ -68,7 +68,6 @@ Page({ let tempData = [] that.setData({ rectifierData:res.data, - rectifierData2:res.data }) } } @@ -196,13 +195,13 @@ Page({ }) return; } - if(checkingResult==""){ - app.toast("请选择验收结果!") - that.setData({ - loadShow:false - }) - return; - } + // if(checkingResult==""){ + // app.toast("请选择验收结果!") + // that.setData({ + // loadShow:false + // }) + // return; + // } let fileUrls = []; imageInfoData.forEach(async (item)=>{ @@ -223,7 +222,8 @@ Page({ checkWorkingPosition, intro, checkingDate:checkTime, - checkResult:checkingResult, + //checkResult:checkingResult, + approveStatus:"1", createBy:loginName, imageUrls:fileUrls.toString() } diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml index e5dc006..d41cc2e 100644 --- a/miniprogram/pageage/project_checking/add/index.wxml +++ b/miniprogram/pageage/project_checking/add/index.wxml @@ -32,7 +32,7 @@ 监理专员 - + @@ -55,7 +55,7 @@ - + 验收结果 diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js index 1ad1e47..6306714 100644 --- a/miniprogram/pageage/project_checking/info/index.js +++ b/miniprogram/pageage/project_checking/info/index.js @@ -13,6 +13,8 @@ Page({ loadShow:false, loginName:"", showDel:false, + activeName:"", + flowRecordList:[], request:app.globalData.reqUrl }, @@ -112,6 +114,36 @@ Page({ }) }, + /** + * 查询流程日志 + */ + getAuditinfo(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', + method:"get", + data:{ + fromType:"3", + fromId:this.data.id + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + flowRecordList:res.data + }) + } + } + }) + }, + + // 手风琴 + onChange(event) { + this.setData({ + activeName: event.detail, + }); + }, + //展示图片 showImg:function(e){ var that=this; diff --git a/miniprogram/pageage/project_checking/info/index.json b/miniprogram/pageage/project_checking/info/index.json index f15e56b..ec4d810 100644 --- a/miniprogram/pageage/project_checking/info/index.json +++ b/miniprogram/pageage/project_checking/info/index.json @@ -1,6 +1,8 @@ { "usingComponents": { - "van-popup": "@vant/weapp/popup/index" + "van-popup": "@vant/weapp/popup/index", + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item" }, "navigationStyle":"custom", "navigationBarTitleText": "举牌验收详情" diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml index dc7148b..17d3191 100644 --- a/miniprogram/pageage/project_checking/info/index.wxml +++ b/miniprogram/pageage/project_checking/info/index.wxml @@ -14,6 +14,36 @@ + + + + + + + + + {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + + 提交取样复试 + 审批取样复试 + {{item.commentResult}} + 合格 + 不合格 + + + + + 办理用户：{{item.userName}} + 办理单位：{{item.deptName}} + 办理时间：{{item.createTime}} + 审批意见：{{item.comment}} + + + + + + + {{infoData.projectName}} @@ -64,7 +94,7 @@ {{infoData.checkingDate}} - + 验收结果 验收合格 diff --git a/miniprogram/pageage/project_checking/info/index.wxss b/miniprogram/pageage/project_checking/info/index.wxss index e8ea92e..029322f 100644 --- a/miniprogram/pageage/project_checking/info/index.wxss +++ b/miniprogram/pageage/project_checking/info/index.wxss @@ -20,4 +20,51 @@ height: 180rpx; border-radius: 15rpx; position: relative; + } + .van-collapse.van-hairline--top-bottom:after{ + border-width: 0px 0; + } + .van-cell.van-cell--borderless{ + background-color: #2b345b; + color: #fff; + margin-top: 30rpx; + border-radius: 5rpx; + } + .van-cell.van-cell--borderless:active{ + background-color: #2b345b; + } + .van-collapse-item__title.van-collapse-item__title--expanded:active{ + background-color: #2b345b; + } + .van-collapse-item .van-cell:after{ + border-bottom: 0; + } + .van-collapse-item.van-hairline--top:after{ + border-top-width:0 + } + .van-cell.van-cell--clickable{ + background-color: #2b345b; + margin-top: 30rpx; + color: #fff; + border-radius: 15rpx; + + } + .van-cell.van-cell--clickable:active{ + background-color: #2b345b; + } + .van-collapse-item__wrapper .van-collapse-item__content{ + background-color: #1e2336; + color:#8ca4ec ; + border-width: 0px 0; + } + .gk_open_con view{ + padding: 10rpx 0; + width: 100%; + } + .gk_open_con image{ + width: 30rpx; + height: 30rpx; + margin-right: 5rpx; + position: relative; + top: 5rpx; } \ No newline at end of file diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js index c013572..a2bb8bd 100644 --- a/miniprogram/pageage/project_checking/list/index.js +++ b/miniprogram/pageage/project_checking/list/index.js @@ -16,6 +16,9 @@ Page({ initData: {}, show:false, listData:[], + jxzCount:0, + ywcCount:0, + activeState:"jxz", request:app.globalData.reqUrl }, @@ -70,13 +73,16 @@ Page({ if(minRoleId==2||minRoleId==3||minRoleId==4){ deptId=0; } + let param = { + "projectId": projectId, + "nowUserName":loginName, + "deptId":deptId, + "activeName":this.data.activeState + } + this.queryCount(param); wx.request({ url: app.globalData.reqUrl + '/wechat/projectchecking/list', - data: { - "projectId": projectId, - "nowUserName":loginName, - "deptId":deptId - }, + data: param, method: "get", success: function (res) { that.setData({ @@ -86,6 +92,40 @@ Page({ }) }, + //查询统计 + queryCount(param){ + //查询统计数量 + let that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectchecking/findGroupCountByApprove', + data: param, + method: "get", + success: function (res) { + that.setData({ + jxzCount:res.data.data.jxz, + ywcCount:res.data.data.ywc + }); + } + }); + }, + + /** + * 标签切换 + */ + typeJump(e){ + let index = e.currentTarget.dataset.index; + let nav = ""; + if(index == 1){ + nav = 'jxz'; + }else if(index == 2){ + nav = 'ywc'; + } + this.setData({ + activeState:nav + }); + this.getProjectCheckingData(this.initData.id,this.data.loginName,this.data.deptId,this.data.minRoleId) + }, + returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index c11b7b4..5acb729 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -12,6 +12,10 @@ + + 进行中（{{jxzCount}}） + 已完成（{{ywcCount}}） + diff --git a/miniprogram/pageage/project_materialSeal/add/index.js b/miniprogram/pageage/project_materialSeal/add/index.js index 9b46b8e..eeeff33 100644 --- a/miniprogram/pageage/project_materialSeal/add/index.js +++ b/miniprogram/pageage/project_materialSeal/add/index.js @@ -21,7 +21,10 @@ Page({ signFileData:[], alterationFileData:[], limit:1, - showBgd:false + showBgd:false, + rectifierData:[], + witnessUser:"", + witnessUserName:"" }, /** @@ -66,6 +69,27 @@ Page({ }) }, + //添加监理专员 + onAddSend(e){ + if(e.detail.length>0){ + let phoneNumbers=""; + let userNames=""; + e.detail.forEach(it =>{ + phoneNumbers+=","+it.phoneNumber; + userNames+=","+it.userName; + }); + this.setData({ + witnessUserName:userNames.substring(1), + witnessUser:phoneNumbers.substring(1) + }) + }else{ + this.setData({ + witnessUser:"", + witnessUserName:"" + }) + } + }, + //取消页面 cancelSaveView(){ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ @@ -81,8 +105,7 @@ Page({ }) let that = this let {projectId,projectName,deptId,loginName,imageInfoData,materialName, - usePosition,contractBrand,useBrand,sealDate,signFileData,alterationFileData} = that.data; - debugger + usePosition,contractBrand,useBrand,sealDate,witnessUser,witnessUserName,signFileData,alterationFileData} = that.data; //数据效验 if(projectId==""||loginName==""||deptId==""){ app.toast("数据异常，请刷新页面重试!") @@ -133,6 +156,13 @@ Page({ }) return; } + if(witnessUser==""||witnessUserName==""){ + app.toast("请选择监理专员!") + that.setData({ + loadShow:false + }) + return; + } if(signFileData.length==0){ app.toast("请上传会签单照片!") that.setData({ @@ -174,8 +204,11 @@ Page({ contractBrand, useBrand, sealDate:sealDate+":00", + witnessUser, + witnessUserName, signFiles:signFile.data.fileName, alterationFiles:alterationFilePath, + approveStatus:"1", createBy:loginName } wx.request({ @@ -254,6 +287,30 @@ Page({ this.showBgdLabel() }, + //查询项目人员数据 + getProjectUserData(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser', + method:"get", + data:{ + unitType:"4", + projectId:that.data.projectId + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + rectifierData:res.data + }) + } + } + }) + }, + showBgdLabel(){ if(this.data.contractBrand!="" && this.data.useBrand!="" && this.data.contractBrand.indexOf(this.data.useBrand)==-1){ this.setData({ diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxml b/miniprogram/pageage/project_materialSeal/add/index.wxml index ad0bf99..77c45a9 100644 --- a/miniprogram/pageage/project_materialSeal/add/index.wxml +++ b/miniprogram/pageage/project_materialSeal/add/index.wxml @@ -55,6 +55,13 @@ + + 监理专员 + + + + + 会签单图片 diff --git a/miniprogram/pageage/project_materialSeal/info/index.js b/miniprogram/pageage/project_materialSeal/info/index.js index 8b3d422..9320075 100644 --- a/miniprogram/pageage/project_materialSeal/info/index.js +++ b/miniprogram/pageage/project_materialSeal/info/index.js @@ -21,6 +21,8 @@ Page({ alterationFileImages:[], fileUrls:[], fileUrls2:[], + activeName:"", + flowRecordList:[], request:app.globalData.reqUrl }, @@ -169,6 +171,36 @@ Page({ }) }, + /** + * 查询流程日志 + */ + getAuditinfo(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', + method:"get", + data:{ + fromType:"4", + fromId:this.data.id + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + flowRecordList:res.data + }) + } + } + }) + }, + + // 手风琴 + onChange(event) { + this.setData({ + activeName: event.detail, + }); + }, + //展示图片 showImg:function(e){ var that=this; diff --git a/miniprogram/pageage/project_materialSeal/info/index.json b/miniprogram/pageage/project_materialSeal/info/index.json index ef67f38..b6d8dd8 100644 --- a/miniprogram/pageage/project_materialSeal/info/index.json +++ b/miniprogram/pageage/project_materialSeal/info/index.json @@ -1,6 +1,8 @@ { "usingComponents": { - "van-popup": "@vant/weapp/popup/index" + "van-popup": "@vant/weapp/popup/index", + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item" }, "navigationStyle":"custom", "navigationBarTitleText": "形象进度详情" diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxml b/miniprogram/pageage/project_materialSeal/info/index.wxml index af71fa1..eee3556 100644 --- a/miniprogram/pageage/project_materialSeal/info/index.wxml +++ b/miniprogram/pageage/project_materialSeal/info/index.wxml @@ -14,6 +14,36 @@ + + + + + + + + + {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + + 提交取样复试 + 审批取样复试 + {{item.commentResult}} + 合格 + 不合格 + + + + + 办理用户：{{item.userName}} + 办理单位：{{item.deptName}} + 办理时间：{{item.createTime}} + 审批意见：{{item.comment}} + + + + + + + {{infoData.projectName}} @@ -52,6 +82,12 @@ {{infoData.useBrand}} + + + 监理专员 + {{infoData.witnessUserName}} + + 封样时间 @@ -87,6 +123,15 @@ + + + 封样结果 + + 合格 + 不合格 + + + 提交单位 diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxss b/miniprogram/pageage/project_materialSeal/info/index.wxss index e8ea92e..029322f 100644 --- a/miniprogram/pageage/project_materialSeal/info/index.wxss +++ b/miniprogram/pageage/project_materialSeal/info/index.wxss @@ -20,4 +20,51 @@ height: 180rpx; border-radius: 15rpx; position: relative; + } + .van-collapse.van-hairline--top-bottom:after{ + border-width: 0px 0; + } + .van-cell.van-cell--borderless{ + background-color: #2b345b; + color: #fff; + margin-top: 30rpx; + border-radius: 5rpx; + } + .van-cell.van-cell--borderless:active{ + background-color: #2b345b; + } + .van-collapse-item__title.van-collapse-item__title--expanded:active{ + background-color: #2b345b; + } + .van-collapse-item .van-cell:after{ + border-bottom: 0; + } + .van-collapse-item.van-hairline--top:after{ + border-top-width:0 + } + .van-cell.van-cell--clickable{ + background-color: #2b345b; + margin-top: 30rpx; + color: #fff; + border-radius: 15rpx; + + } + .van-cell.van-cell--clickable:active{ + background-color: #2b345b; + } + .van-collapse-item__wrapper .van-collapse-item__content{ + background-color: #1e2336; + color:#8ca4ec ; + border-width: 0px 0; + } + .gk_open_con view{ + padding: 10rpx 0; + width: 100%; + } + .gk_open_con image{ + width: 30rpx; + height: 30rpx; + margin-right: 5rpx; + position: relative; + top: 5rpx; } \ No newline at end of file diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js index a29bc2c..c5366bc 100644 --- a/miniprogram/pageage/project_materialSeal/list/index.js +++ b/miniprogram/pageage/project_materialSeal/list/index.js @@ -12,6 +12,9 @@ Page({ initData: {}, show:false, listData:[], + jxzCount:0, + ywcCount:0, + activeState:"jxz", request:app.globalData.reqUrl }, @@ -57,12 +60,15 @@ Page({ if(minRoleId==2||minRoleId==3||minRoleId==4){ deptId=0; } + let param = { + "deptId":deptId, + "projectId": projectId, + "activeName": this.data.activeState, + } + this.queryCount(param); wx.request({ url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list', - data: { - "deptId":deptId, - "projectId": projectId - }, + data: param, method: "get", success: function (res) { that.setData({ @@ -72,6 +78,40 @@ Page({ }) }, + //查询统计 + queryCount(param){ + //查询统计数量 + let that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/findGroupCountByApprove', + data: param, + method: "get", + success: function (res) { + that.setData({ + jxzCount:res.data.data.jxz, + ywcCount:res.data.data.ywc + }); + } + }); + }, + + /** + * 标签切换 + */ + typeJump(e){ + let index = e.currentTarget.dataset.index; + let nav = ""; + if(index == 1){ + nav = 'jxz'; + }else if(index == 2){ + nav = 'ywc'; + } + this.setData({ + activeState:nav + }); + this.getListData(this.initData.id,this.data.deptId,this.data.minRoleId); + }, + returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml index d108e86..312889e 100644 --- a/miniprogram/pageage/project_materialSeal/list/index.wxml +++ b/miniprogram/pageage/project_materialSeal/list/index.wxml @@ -12,6 +12,10 @@ + + 进行中（{{jxzCount}}） + 已完成（{{ywcCount}}） + diff --git a/miniprogram/pageage/project_measure/add/index.js b/miniprogram/pageage/project_measure/add/index.js index bc87112..65b2d87 100644 --- a/miniprogram/pageage/project_measure/add/index.js +++ b/miniprogram/pageage/project_measure/add/index.js @@ -13,7 +13,6 @@ Page({ projectName:"", loginName:"", rectifierData:[], - rectifierData2:[], imageInfoData:[], loadShow:false, measureType:"1", @@ -61,6 +60,7 @@ Page({ url: app.globalData.reqUrl+'/wechat/projectuserinfo/list', method:"get", data:{ + unitType:"4", projectId:that.data.projectId }, header:{ @@ -71,7 +71,6 @@ Page({ if(res.code == 200){ that.setData({ rectifierData:res.data, - rectifierData2:res.data }) } } @@ -275,13 +274,13 @@ Page({ }) return; } - if(measureResult==""){ - app.toast("请选择测量结果!") - that.setData({ - loadShow:false - }) - return; - } + // if(measureResult==""){ + // app.toast("请选择测量结果!") + // that.setData({ + // loadShow:false + // }) + // return; + // } if(superviseUser==qualityUser){ app.toast("质量专员和监理专员不能是同一人!") that.setData({ @@ -311,7 +310,8 @@ Page({ superviseUser, superviseUserName, measureTime:measureTime+":00", - measureResult, + //measureResult, + approveStatus:"1", createBy:loginName } wx.request({ diff --git a/miniprogram/pageage/project_measure/add/index.wxml b/miniprogram/pageage/project_measure/add/index.wxml index 4a64444..c5e010a 100644 --- a/miniprogram/pageage/project_measure/add/index.wxml +++ b/miniprogram/pageage/project_measure/add/index.wxml @@ -59,7 +59,7 @@ 监理专员 - + @@ -69,7 +69,7 @@ - + 测量结果 diff --git a/miniprogram/pageage/project_measure/info/index.js b/miniprogram/pageage/project_measure/info/index.js index 8b25b31..2bfd4e3 100644 --- a/miniprogram/pageage/project_measure/info/index.js +++ b/miniprogram/pageage/project_measure/info/index.js @@ -13,6 +13,8 @@ Page({ showDel:false, imageList:[], minImageList:[], + activeName:"", + flowRecordList:[], request:app.globalData.reqUrl }, @@ -113,6 +115,36 @@ Page({ }) }, + /** + * 查询流程日志 + */ + getAuditinfo(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', + method:"get", + data:{ + fromType:"2", + fromId:this.data.id + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + flowRecordList:res.data + }) + } + } + }) + }, + + // 手风琴 + onChange(event) { + this.setData({ + activeName: event.detail, + }); + }, + //展示图片 showImg:function(e){ var that=this; diff --git a/miniprogram/pageage/project_measure/info/index.json b/miniprogram/pageage/project_measure/info/index.json index ba2821f..1f022fa 100644 --- a/miniprogram/pageage/project_measure/info/index.json +++ b/miniprogram/pageage/project_measure/info/index.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item" + }, "navigationStyle":"custom" } \ No newline at end of file diff --git a/miniprogram/pageage/project_measure/info/index.wxml b/miniprogram/pageage/project_measure/info/index.wxml index 5cef8a3..0d3abca 100644 --- a/miniprogram/pageage/project_measure/info/index.wxml +++ b/miniprogram/pageage/project_measure/info/index.wxml @@ -14,11 +14,40 @@ + + + + + + + + + {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + + 提交取样复试 + 审批取样复试 + {{item.commentResult}} + 合格 + 不合格 + + + + + 办理用户：{{item.userName}} + 办理单位：{{item.deptName}} + 办理时间：{{item.createTime}} + 审批意见：{{item.comment}} + + + + + + + {{infoData.projectName}} - 测量图片 @@ -71,7 +100,7 @@ {{infoData.superviseUserName}} - + 测量结果 diff --git a/miniprogram/pageage/project_measure/info/index.wxss b/miniprogram/pageage/project_measure/info/index.wxss index e8ea92e..029322f 100644 --- a/miniprogram/pageage/project_measure/info/index.wxss +++ b/miniprogram/pageage/project_measure/info/index.wxss @@ -20,4 +20,51 @@ height: 180rpx; border-radius: 15rpx; position: relative; + } + .van-collapse.van-hairline--top-bottom:after{ + border-width: 0px 0; + } + .van-cell.van-cell--borderless{ + background-color: #2b345b; + color: #fff; + margin-top: 30rpx; + border-radius: 5rpx; + } + .van-cell.van-cell--borderless:active{ + background-color: #2b345b; + } + .van-collapse-item__title.van-collapse-item__title--expanded:active{ + background-color: #2b345b; + } + .van-collapse-item .van-cell:after{ + border-bottom: 0; + } + .van-collapse-item.van-hairline--top:after{ + border-top-width:0 + } + .van-cell.van-cell--clickable{ + background-color: #2b345b; + margin-top: 30rpx; + color: #fff; + border-radius: 15rpx; + + } + .van-cell.van-cell--clickable:active{ + background-color: #2b345b; + } + .van-collapse-item__wrapper .van-collapse-item__content{ + background-color: #1e2336; + color:#8ca4ec ; + border-width: 0px 0; + } + .gk_open_con view{ + padding: 10rpx 0; + width: 100%; + } + .gk_open_con image{ + width: 30rpx; + height: 30rpx; + margin-right: 5rpx; + position: relative; + top: 5rpx; } \ No newline at end of file diff --git a/miniprogram/pageage/project_measure/list/index.js b/miniprogram/pageage/project_measure/list/index.js index 874028e..cbf13c5 100644 --- a/miniprogram/pageage/project_measure/list/index.js +++ b/miniprogram/pageage/project_measure/list/index.js @@ -14,6 +14,9 @@ Page({ initData: {}, show:false, listData:[], + jxzCount:0, + ywcCount:0, + activeState:"jxz", request:app.globalData.reqUrl }, @@ -62,8 +65,10 @@ Page({ } let param = { "projectId": projectId, - "deptId":deptId + "deptId":deptId, + "activeName": this.data.activeState, } + this.queryCount(param); wx.request({ url: app.globalData.reqUrl + '/wechat/projectMeasure/list', data:param, @@ -76,6 +81,40 @@ Page({ }); }, + //查询统计 + queryCount(param){ + //查询统计数量 + let that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectMeasure/findGroupCountByApprove', + data: param, + method: "get", + success: function (res) { + that.setData({ + jxzCount:res.data.data.jxz, + ywcCount:res.data.data.ywc + }); + } + }); + }, + + /** + * 标签切换 + */ + typeJump(e){ + let index = e.currentTarget.dataset.index; + let nav = ""; + if(index == 1){ + nav = 'jxz'; + }else if(index == 2){ + nav = 'ywc'; + } + this.setData({ + activeState:nav + }); + this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId); + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pageage/project_measure/list/index.wxml b/miniprogram/pageage/project_measure/list/index.wxml index 0227637..f18d325 100644 --- a/miniprogram/pageage/project_measure/list/index.wxml +++ b/miniprogram/pageage/project_measure/list/index.wxml @@ -12,6 +12,10 @@ + + 进行中（{{jxzCount}}） + 已完成（{{ywcCount}}） + diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js index e1f2834..b55b8a0 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.js +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js @@ -19,7 +19,8 @@ Page({ menuList:[], initData:{}, hiddenn:true, - db:0, + todoDB:0, + approveDB:0, }, @@ -201,7 +202,8 @@ Page({ "nowRole":minRoleId, "nowDept":deptId, "nowUserName":loginName, - "nowUser":userId + "nowUser":userId, + "activeName":"await" } var that = this; wx.request({ @@ -212,7 +214,8 @@ Page({ res = res.data; if(res.code=="200"){ that.setData({ - db:res.data.length + todoDB:res.data.todo, + approveDB:res.data.approve, }) } } diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml index ba56d04..8d3d66f 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml @@ -59,7 +59,8 @@ - {{db}} + {{todoDB}} + {{approveDB}} {{item.menu_name}} diff --git a/miniprogram/pages/project_approve/approveCheckDetection/index.js b/miniprogram/pages/project_approve/approveCheckDetection/index.js new file mode 100644 index 0000000..d6d2585 --- /dev/null +++ b/miniprogram/pages/project_approve/approveCheckDetection/index.js @@ -0,0 +1,302 @@ +// pageage/project_checking/info/index.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + id:"", + infoData:{}, + loadShow:false, + loginName:"", + detectionImageList:[], + minDetectionFileImages:[], + detectionFiles:[], + fileUrls:[], + activeName:"", + flowRecordList:[], + request:app.globalData.reqUrl, + list:[{id:1,text:"合格"},{id:2,text:"不合格"}], + result:"1", + comment:"", + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let {id} = options + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success:res=>{ + this.setData({ + id, + loginName:res.data.loginName + }) + this.getInfo(); + this.getAuditinfo(); + } + }) + }, + + /** + * 获取安全检查详情信息 + * + */ + getInfo(){ + let {id} = this.data + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectDetection/info', + method:"get", + data:{ + id:id + }, + success(res){ + res = res.data + if(res.code == 200){ + let imageUrls = []; + let minImageUrls = []; + let fileUrls = []; + let fileNames = []; + //判断附件 + if(res.data.detectionFile){ + res.data.detectionFile.split(',').forEach(element => { + let _file = element.split('.'); + _file = _file[_file.length-1].toLocaleUpperCase(); + //判断附件类型，如果是图片直接展示，非图片则显示附件 + if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){ + imageUrls.push(that.data.request+element); + minImageUrls.push(that.data.request+element+'.min.jpg'); + }else{ + let it = element.split('/'); + fileNames.push(it[it.length-1]); + fileUrls.push(element); + } + }); + } + that.setData({ + infoData:res.data, + detectionImageList:imageUrls, + minDetectionFileImages:minImageUrls, + detectionFiles:fileNames, + fileUrls, + loadShow:false + }) + } + } + }) + }, + + /** + * 查询流程日志 + */ + getAuditinfo(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', + method:"get", + data:{ + fromType:"1", + fromId:this.data.id + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + flowRecordList:res.data + }) + } + } + }) + }, + + // 手风琴 + onChange(event) { + this.setData({ + activeName: event.detail, + }); + }, + + //保存 + onSubmitSave(){ + this.setData({ + loadShow:true + }) + let that = this + let {infoData,result,comment,loginName} = that.data; + //数据效验 + if(infoData && infoData.id){ + + }else{ + app.toast("数据异常，请刷新页面重试!") + that.setData({ + loadShow:false + }) + return; + } + + if(result==""){ + app.toast("请选择审批结果!") + that.setData({ + loadShow:false + }) + return; + } + if(comment==""){ + app.toast("请填写审批意见!") + that.setData({ + loadShow:false + }) + return; + } + let params = { + id:infoData.id, + detectionResult:result, + comment, + approveStatus:result=='1'?'4':'3', + updateBy:loginName + } + let msg = result=='1'?'合格':'不合格'; + wx.showModal({ + title: '提示', + content: '是否确定审批'+msg+'？', + success: function (sm) { + if (sm.confirm) { + // 用户点击了确定 可以调用了 + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectDetection/edit', + method:"POST", + data:params, + header: { + "Username": loginName, + "Content-Type": "application/json" + }, + success(res){ + that.setData({ + loadShow:false + }) + res = res.data + if(res.code == 200){ + app.toast("审批成功!") + setTimeout(()=>{ + wx.redirectTo({ + url: '../index', + }) + },200) + } + } + }) + } else if (sm.cancel) { + that.setData({ + loadShow:false + }) + console.log('用户点击取消'); + } + } + }) + }, + + //展示图片 + showImg:function(e){ + var that=this; + wx.previewImage({ + urls: that.data.imageList, + current: that.data.imageList[e.currentTarget.dataset.index] + }) + }, + + downFile:function(e){ + let that = this; + wx.downloadFile({ + // 示例 url，并非真实存在 + url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls[0], + success: function (res) { + const filePath = res.tempFilePath + wx.openDocument({ + filePath: filePath, + success: function (res) { + console.log('打开文档成功') + }, + fail:function(res) { + console.log(res) + } + }) + } + }) + //app.toast("暂不支持下载！如需下载请前往后台管理系统！！") + }, + + //选择检测结果 + onSelect(e){ + this.setData({ + result:e.detail.id + }) + }, + + //审批意见 + onInputValue(e){ + let comment = e.detail.value + this.setData({ + comment + }) + }, + + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.redirectTo({ + url: '../index', + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/project_approve/approveCheckDetection/index.json b/miniprogram/pages/project_approve/approveCheckDetection/index.json new file mode 100644 index 0000000..fc37221 --- /dev/null +++ b/miniprogram/pages/project_approve/approveCheckDetection/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "van-overlay": "@vant/weapp/overlay/index", + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item" + }, + "navigationStyle":"custom" +} \ No newline at end of file diff --git a/miniprogram/pages/project_approve/approveCheckDetection/index.wxml b/miniprogram/pages/project_approve/approveCheckDetection/index.wxml new file mode 100644 index 0000000..bce59f0 --- /dev/null +++ b/miniprogram/pages/project_approve/approveCheckDetection/index.wxml @@ -0,0 +1,187 @@ + + + + + + + + + 取样复试审批 + + + + + + + + + + + + + + + + {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + + 提交取样复试 + 审批取样复试 + {{item.commentResult}} + 合格 + 不合格 + + + + + 办理用户：{{item.userName}} + 办理单位：{{item.deptName}} + 办理时间：{{item.createTime}} + 审批意见：{{item.comment}} + + + + + + + + + {{infoData.projectName}} + + + + + 送检类型 + {{infoData.checkTypeName}} + + + + + 材料名称 + {{infoData.materialName}} + + + + + 取样数量 + {{infoData.sampleNum}} + + + + + 使用部位 + {{infoData.usePosition}} + + + + + 合格证 + + 已提供 + 未提供 + + + + + + 见证人 + {{infoData.witnessUserName}} + + + + + 送检时间 + {{infoData.checkTime}} + + + + + 实验室 + {{infoData.laboratoryName}} + + + + + 提交单位 + {{infoData.deptName}} + + + + + 提交用户 + {{infoData.createBy}} + + + + + 提交时间 + {{infoData.createTime}} + + + + + + + + 检测报告登记结果 + + + + + 登记用户 + {{infoData.updateBy}} + + + + + 登记时间 + {{infoData.updateTime}} + + + + + 检测报告 + + + + + + + 下载附件 + + + + + + + + + 取样复试审批结果 + + + + 审批结果 + + + + + + 审批意见 + +