sxyanzhu
/
jhwxapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

main
姜玉琦 2023-09-23 20:13:40 +08:00
parent ad09ede70a
commit 96eaa19819
61 changed files with 3298 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
miniprogram/app.json
View File

@ -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": [
{

2
miniprogram/pageage/project_checkDetection/add/index.js
View File

@ -134,7 +134,7 @@ Page({
})
},
//添加抄送人
//添加监理专员
onAddSend(e){
if(e.detail.length>0){
let phoneNumbers="";

4
miniprogram/pageage/project_checkDetection/add/index.wxml
View File

@ -48,9 +48,9 @@
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">见证人</view>
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">监理专员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{true}}" bindselected="onAddSend" index="{{0}}" title="请选择见证人">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddSend" index="{{0}}" title="请选择监理专员">
</select-group-person>
</view>
</view>

17
miniprogram/pageage/project_checkDetection/check/index.js
View File

@ -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
}

2
miniprogram/pageage/project_checkDetection/check/index.wxml
View File

@ -95,7 +95,7 @@
<view>登记取样复试结果</view>
</view>
<view class="inspect_info">
<view class="inspect_info_list">
<view class="inspect_info_list" wx:if="{{false}}">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">检测结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择检测结果" bindchange="onSelect" ></voucher-select>

62
miniprogram/pageage/project_checkDetection/info/index.js
View File

@ -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',
})
},
/**
* 生命周期函数--监听页面初次渲染完成

5
miniprogram/pageage/project_checkDetection/info/index.json
View File

@ -1,4 +1,7 @@
{
"usingComponents": {},
"usingComponents": {
"van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom"
}

108
miniprogram/pageage/project_checkDetection/info/index.wxml
View File

@ -14,6 +14,36 @@
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
@ -90,47 +120,47 @@
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.detectionResult!=nulll}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>材料取样复试结果</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview" wx:if="{{infoData.checkState==2}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>检测报告登记结果</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">登记用户</text></van-col>
<van-col span="18">{{infoData.updateBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">登记时间</text></van-col>
<van-col span="18">{{infoData.updateTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复试结果</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.detectionResult==1}}" class="color_green" style="font-weight: 700;">合格</text>
<text wx:if="{{infoData.detectionResult==2}}" style="color: red;font-weight: 700;">不合格</text>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检测报告</text></van-col>
<van-col span="18">
<view class="in-img-div" wx:if="{{minDetectionFileImages.length>0}}" wx:for="{{minDetectionFileImages}}" wx:key="index">
<image bindtap='showDetectionFileImg' data-index="{{index}}" src='{{item}}'></image>
</view>
<view class="in-img-div" wx:if="{{detectionFiles.length>0}}">
<image src='https://cf.makalu.cc/profile/wechat/icon/pdf.png'></image>
<text class="files" style="color:#89a3ed;margin-left:50rpx;" bindtap='downFile' data-index="{{0}}" >下载附件</text>
</view>
</van-col>
</van-row>
</view>
<van-row>
<van-col span="6"><text class="color_purple">登记用户</text></van-col>
<van-col span="18">{{infoData.updateBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">登记时间</text></van-col>
<van-col span="18">{{infoData.updateTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.detectionFile!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">检测报告</text></van-col>
<van-col span="18">
<view class="in-img-div" wx:if="{{minDetectionFileImages.length>0}}" wx:for="{{minDetectionFileImages}}" wx:key="index">
<image bindtap='showDetectionFileImg' data-index="{{index}}" src='{{item}}'></image>
</view>
<view class="in-img-div" wx:if="{{detectionFiles.length>0}}">
<image src='https://cf.makalu.cc/profile/wechat/icon/pdf.png'></image>
<text class="files" style="color:#89a3ed;margin-left:50rpx;" bindtap='downFile' data-index="{{0}}" >下载附件</text>
</view>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.detectionResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">检测结果</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.detectionResult == 1}}" class="color_green">合格</text>
<text wx:if="{{infoData.detectionResult == 2}}" class="color_orange">不合格</text>
</van-col>
</van-row>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">删除</view>

47
miniprogram/pageage/project_checkDetection/info/index.wxss
View File

@ -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;
}

23
miniprogram/pageage/project_checkDetection/list/index.js
View File

@ -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
});

2
miniprogram/pageage/project_checkDetection/list/index.wxml
View File

@ -13,7 +13,7 @@
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='sjz'?'active':''}}" bindtap="typeJump" data-index="1"><text>送检中（{{sjzCount}}）</text></view>
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">

20
miniprogram/pageage/project_checking/add/index.js
View File

@ -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()
}

4
miniprogram/pageage/project_checking/add/index.wxml
View File

@ -32,7 +32,7 @@
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">监理专员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData2}}" multiple="{{fales}}" bindselected="onAddSuperviseUser" data-index="2" choose="{{item.person_responsible}}" title="请选择监理专员" >
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddSuperviseUser" data-index="2" choose="{{item.person_responsible}}" title="请选择监理专员" >
</select-group-person>
</view>
</view>
@ -55,7 +55,7 @@
<voucher-datetime counts="5" currentDate="{{currentDate}}" placeholder="请选择验收时间" maxDate="{{maxDate}}" bindchange="onInputTime"></voucher-datetime>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_list" wx:if="{{false}}">
<view class="inspect_info_title">验收结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择验收结果" bindchange="onSelectType" ></voucher-select>

32
miniprogram/pageage/project_checking/info/index.js
View File

@ -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;

4
miniprogram/pageage/project_checking/info/index.json
View File

@ -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": "举牌验收详情"

32
miniprogram/pageage/project_checking/info/index.wxml
View File

@ -14,6 +14,36 @@
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
@ -64,7 +94,7 @@
<van-col span="18">{{infoData.checkingDate}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<view class="inspect_overview_list" wx:if="{{infoData.checkResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">验收结果</text></van-col>
<van-col wx:if="{{infoData.checkResult == '1'}}" span="18" class="color_green">验收合格</van-col>

47
miniprogram/pageage/project_checking/info/index.wxss
View File

@ -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;
}

50
miniprogram/pageage/project_checking/list/index.js
View File

@ -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"){

4
miniprogram/pageage/project_checking/list/index.wxml
View File

@ -12,6 +12,10 @@
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">

63
miniprogram/pageage/project_materialSeal/add/index.js
View File

@ -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({

7
miniprogram/pageage/project_materialSeal/add/index.wxml
View File

@ -55,6 +55,13 @@
<voucher-datetime counts="5" placeholder="请选择封样时间" maxDate="{{maxDate}}" currentDate="{{currentDate}}" bindchange="onInputTime"></voucher-datetime>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">监理专员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddSend" index="{{0}}" title="请选择监理专员">
</select-group-person>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">会签单图片</view>
<view class="problem_list_info_con">

32
miniprogram/pageage/project_materialSeal/info/index.js
View File

@ -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;

4
miniprogram/pageage/project_materialSeal/info/index.json
View File

@ -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": "形象进度详情"

45
miniprogram/pageage/project_materialSeal/info/index.wxml
View File

@ -14,6 +14,36 @@
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
@ -52,6 +82,12 @@
<van-col span="18">{{infoData.useBrand}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">监理专员</text></van-col>
<van-col span="18">{{infoData.witnessUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">封样时间</text></van-col>
@ -87,6 +123,15 @@
</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.materialResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">封样结果</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.materialResult == 1}}" class="color_green">合格</text>
<text wx:if="{{infoData.materialResult == 2}}" class="color_orange">不合格</text>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交单位</text></van-col>

47
miniprogram/pageage/project_materialSeal/info/index.wxss
View File

@ -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;
}

48
miniprogram/pageage/project_materialSeal/list/index.js
View File

@ -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"){

4
miniprogram/pageage/project_materialSeal/list/index.wxml
View File

@ -12,6 +12,10 @@
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">

20
miniprogram/pageage/project_measure/add/index.js
View File

@ -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({

4
miniprogram/pageage/project_measure/add/index.wxml
View File

@ -59,7 +59,7 @@
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">监理专员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData2}}" multiple="{{fales}}" bindselected="onAddSuperviseUser" index="{{1}}" title="请选择监理专员" >
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddSuperviseUser" index="{{1}}" title="请选择监理专员" >
</select-group-person>
</view>
</view>
@ -69,7 +69,7 @@
<voucher-datetime counts="5" placeholder="请选择测量时间" maxDate="{{maxDate}}" currentDate="{{currentDate}}" bindchange="onInputTime"></voucher-datetime>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_list" wx:if="{{false}}">
<view class="inspect_info_title">测量结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{resultList}}" placeholder="请选择测量结果" bindchange="onSelectType" ></voucher-select>

32
miniprogram/pageage/project_measure/info/index.js
View File

@ -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;

5
miniprogram/pageage/project_measure/info/index.json
View File

@ -1,4 +1,7 @@
{
"usingComponents": {},
"usingComponents": {
"van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom"
}

33
miniprogram/pageage/project_measure/info/index.wxml
View File

@ -14,11 +14,40 @@
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量图片</text></van-col>
@ -71,7 +100,7 @@
<van-col span="18">{{infoData.superviseUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<view class="inspect_overview_list" wx:if="{{infoData.measureResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">测量结果</text></van-col>
<van-col span="18">

47
miniprogram/pageage/project_measure/info/index.wxss
View File

@ -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;
}

41
miniprogram/pageage/project_measure/list/index.js
View File

@ -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);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

4
miniprogram/pageage/project_measure/list/index.wxml
View File

@ -12,6 +12,10 @@
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">

9
miniprogram/pages/gengduogongneng/gengduogongneng.js
View File

@ -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,
})
}
}

3
miniprogram/pages/gengduogongneng/gengduogongneng.wxml
View File

@ -59,7 +59,8 @@
<van-row class="demo clearfix">
<van-col span="8" wx:for="{{menuList}}" wx:key="unique">
<view class="gd_min" data-id="{{item.menu_identi}}" data-url="{{item.menu_url}}" bindtap="goMenu">
<span class="tabNum_active" wx:if="{{item.menu_identi=='GCSQGL' && db>0}}">{{db}}</span>
<span class="tabNum_active" wx:if="{{item.menu_identi=='GCSQGL' && todoDB>0}}">{{todoDB}}</span>
<span class="tabNum_active" wx:if="{{item.menu_identi=='XMSPGL' && approveDB>0}}">{{approveDB}}</span>
<image src="{{item.menu_img}}"></image>
<view>{{item.menu_name}}</view>
</view>

302
miniprogram/pages/project_approve/approveCheckDetection/index.js 100644
View File

@ -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() {
}
})

8
miniprogram/pages/project_approve/approveCheckDetection/index.json 100644
View File

@ -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"
}

187
miniprogram/pages/project_approve/approveCheckDetection/index.wxml 100644
View File

@ -0,0 +1,187 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">取样复试审批</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_blue">送检类型</text></van-col>
<van-col span="18" class="color_blue">{{infoData.checkTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_orange">材料名称</text></van-col>
<van-col span="18" class="color_orange">{{infoData.materialName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">取样数量</text></van-col>
<van-col span="18">{{infoData.sampleNum}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">使用部位</text></van-col>
<van-col span="18">{{infoData.usePosition}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">合格证</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.qualifiedFlag=='Y'}}" class="color_green">已提供</text>
<text wx:else>未提供</text>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">见证人</text></van-col>
<van-col span="18">{{infoData.witnessUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">送检时间</text></van-col>
<van-col span="18">{{infoData.checkTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">实验室</text></van-col>
<van-col span="18">{{infoData.laboratoryName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交用户</text></van-col>
<van-col span="18">{{infoData.createBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==2}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>检测报告登记结果</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">登记用户</text></van-col>
<van-col span="18">{{infoData.updateBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">登记时间</text></van-col>
<van-col span="18">{{infoData.updateTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.detectionFile!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">检测报告</text></van-col>
<van-col span="18">
<view class="in-img-div" wx:if="{{minDetectionFileImages.length>0}}" wx:for="{{minDetectionFileImages}}" wx:key="index">
<image bindtap='showDetectionFileImg' data-index="{{index}}" src='{{item}}'></image>
</view>
<view class="in-img-div" wx:if="{{detectionFiles.length>0}}">
<image src='https://cf.makalu.cc/profile/wechat/icon/pdf.png'></image>
<text class="files" style="color:#89a3ed;margin-left:50rpx;" bindtap='downFile' data-index="{{0}}" >下载附件</text>
</view>
</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.approveStatus=='1'}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>取样复试审批结果</view>
</view>
<view class="inspect_info">
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">审批结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择审批结果" bindchange="onSelect" ></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">审批意见</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写审批意见（200字内）"
placeholder-style="color:#6777aa;" bindinput="onInputValue" maxlength="200"/>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="returnToPage">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">提交审批</view>
</view>
</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="/images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

70
miniprogram/pages/project_approve/approveCheckDetection/index.wxss 100644
View File

@ -0,0 +1,70 @@
/* pageage/project_checking/info/index.wxss */
.in-img-max:after{
display:block;
clear:both;
content:"";
visibility:hidden;
height:0
}
.in-img-max{
width: auto;
zoom:1
}
.in-img-div{
position: relative;
margin: 0 8px 8px 0;
float: left;
}
.in-img-div image{
width: 180rpx;
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;
}

278
miniprogram/pages/project_approve/approveChecking/index.js 100644
View File

@ -0,0 +1,278 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imageList:[],
minImageList:[],
loadShow:false,
loginName:"",
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();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
let minUrls = [];
if(res.data.imageUrls){
res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element);
minUrls.push(that.data.request+element+'.min.jpg');
});
}
that.setData({
infoData:res.data,
imageList:urls,
minImageList:minUrls,
loadShow:false
})
}
}
})
},
//保存
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,
checkResult: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/projectchecking/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('用户点击取消');
}
}
})
},
//选择检测结果
onSelect(e){
this.setData({
result:e.detail.id
})
},
//审批意见
onInputValue(e){
let comment = e.detail.value
this.setData({
comment
})
},
/**
* 查询流程日志
*/
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;
wx.previewImage({
urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index]
})
},
//选择检测结果
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() {
}
})

10
miniprogram/pages/project_approve/approveChecking/index.json 100644
View File

@ -0,0 +1,10 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index",
"van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom",
"navigationBarTitleText": "举牌验收详情"
}

150
miniprogram/pages/project_approve/approveChecking/index.wxml 100644
View File

@ -0,0 +1,150 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">举牌验收审批</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">单位名称</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">验收图片</text></van-col>
<view class="problem_list_info_con in-img-max">
<view class="in-img-div" wx:for="{{minImageList}}" wx:key="index">
<image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
</view>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">质量专员</text></van-col>
<van-col span="18">{{infoData.qualityUserName}} {{infoData.qualityUser}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">监理专员</text></van-col>
<van-col span="18">{{infoData.superviseUserName}} {{infoData.superviseUser}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">工序部位</text></van-col>
<van-col span="18">{{infoData.checkWorkingPosition}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">验收描述</text></van-col>
<van-col span="18">{{infoData.intro}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">验收时间</text></van-col>
<van-col span="18">{{infoData.checkingDate}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.checkResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">验收结果</text></van-col>
<van-col wx:if="{{infoData.checkResult == '1'}}" span="18" class="color_green">验收合格</van-col>
<van-col wx:if="{{infoData.checkResult == '2'}}" span="18" class="color_orange">验收不合格</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交用户</text></van-col>
<van-col span="18">{{infoData.createBy}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.approveStatus=='1'}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>举牌验收审批结果</view>
</view>
<view class="inspect_info">
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">审批结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择审批结果" bindchange="onSelect" ></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">审批意见</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写审批意见（200字内）"
placeholder-style="color:#6777aa;" bindinput="onInputValue" maxlength="200"/>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="returnToPage">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">提交审批</view>
</view>
</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="/images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

70
miniprogram/pages/project_approve/approveChecking/index.wxss 100644
View File

@ -0,0 +1,70 @@
/* pageage/project_checking/info/index.wxss */
.in-img-max:after{
display:block;
clear:both;
content:"";
visibility:hidden;
height:0
}
.in-img-max{
width: auto;
zoom:1
}
.in-img-div{
position: relative;
margin: 0 8px 8px 0;
float: left;
}
.in-img-div image{
width: 180rpx;
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;
}

390
miniprogram/pages/project_approve/approveMaterialSeal/index.js 100644
View File

@ -0,0 +1,390 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imageList:[],
minImageList:[],
loadShow:false,
loginName:"",
showDel:false,
signFileNames:[],
minSignFileImages:[],
signFileImages:[],
alterationFileNames:[],
minAlterationFileImages:[],
alterationFileImages:[],
fileUrls:[],
fileUrls2:[],
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();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectMaterialSeal/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
let minUrls = [];
if(res.data.imageUrls){
res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element);
minUrls.push(that.data.request+element+'.min.jpg');
});
}
let fileNames = [];
let minFileImages = [];
let fileImages = [];
let fileUrls = [];
//判断附件
if(res.data.signFiles){
res.data.signFiles.split(',').forEach(element => {
let _file = element.split('.');
_file = _file[_file.length-1].toLocaleUpperCase();
//判断附件类型，如果是图片直接展示，非图片则显示附件
if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
fileImages.push(that.data.request+element);
minFileImages.push(that.data.request+element+'.min.jpg');
}else{
let it = element.split('/');
fileNames.push(it[it.length-1]);
fileUrls.push(element);
}
});
}
let fileNames2 = [];
let minFileImages2 = [];
let fileImages2 = [];
let fileUrls2 = [];
//判断附件
if(res.data.alterationFiles){
res.data.alterationFiles.split(',').forEach(element => {
let _file = element.split('.');
_file = _file[_file.length-1].toLocaleUpperCase();
//判断附件类型，如果是图片直接展示，非图片则显示附件
if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
fileImages2.push(that.data.request+element);
minFileImages2.push(that.data.request+element+'.min.jpg');
}else{
let it = element.split('/');
fileNames2.push(it[it.length-1]);
fileUrls2.push(element);
}
});
}
that.setData({
fileUrls,
fileUrls2,
signFileNames:fileNames,
minSignFileImages:minFileImages,
signFileImages:fileImages,
alterationFileNames:fileNames2,
minAlterationFileImages:minFileImages2,
alterationFileImages:fileImages2,
infoData:res.data,
imageList:urls,
minImageList:minUrls,
loadShow:false
})
//判断当前能否删除
if(res.data.createBy==that.data.loginName){
that.setData({
showDel:true
})
}
}
}
})
},
//保存
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,
materialResult: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/projectMaterialSeal/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('用户点击取消');
}
}
})
},
//选择检测结果
onSelect(e){
this.setData({
result:e.detail.id
})
},
//审批意见
onInputValue(e){
let comment = e.detail.value
this.setData({
comment
})
},
/**
* 查询流程日志
*/
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;
wx.previewImage({
urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index]
})
},
//展示图片
showSignFileImg:function(e){
var that=this;
wx.previewImage({
urls: that.data.sifnFileImages,
current: that.data.sifnFileImages[e.currentTarget.dataset.index]
})
},
//展示图片
showAlterationFileImg:function(e){
var that=this;
wx.previewImage({
urls: that.data.alterationFileImages,
current: that.data.alterationFileImages[e.currentTarget.dataset.index]
})
},
downFile:function(e){
let idx = e.currentTarget.dataset['index'];
let that = this;
wx.downloadFile({
// 示例 url，并非真实存在
url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls[idx],
success: function (res) {
const filePath = res.tempFilePath
wx.openDocument({
filePath: filePath,
success: function (res) {
console.log('打开文档成功')
},
fail:function(res) {
console.log(res)
}
})
}
})
//app.toast("暂不支持下载！如需下载请前往后台管理系统！！")
},
downFile2:function(e){
let idx = e.currentTarget.dataset['index'];
let that = this;
wx.downloadFile({
// 示例 url，并非真实存在
url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls2[idx],
success: function (res) {
const filePath = res.tempFilePath
wx.openDocument({
filePath: filePath,
success: function (res) {
console.log('打开文档成功')
},
fail:function(res) {
console.log(res)
}
})
}
})
//app.toast("暂不支持下载！如需下载请前往后台管理系统！！")
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
url: '../list/index'
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

10
miniprogram/pages/project_approve/approveMaterialSeal/index.json 100644
View File

@ -0,0 +1,10 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index",
"van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom",
"navigationBarTitleText": "形象进度详情"
}

189
miniprogram/pages/project_approve/approveMaterialSeal/index.wxml 100644
View File

@ -0,0 +1,189 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">材料封样审批</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">封样图片</text></van-col>
<view class="problem_list_info_con in-img-max">
<view class="in-img-div" wx:for="{{minImageList}}" wx:key="index">
<image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
</view>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_blue">封样名称</text></van-col>
<van-col span="18" class="color_blue">{{infoData.materialName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_orange">使用部位</text></van-col>
<van-col span="18" class="color_orange">{{infoData.usePosition}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">指定品牌</text></van-col>
<van-col span="18">{{infoData.contractBrand}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">拟用品牌</text></van-col>
<van-col span="18">{{infoData.useBrand}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">监理专员</text></van-col>
<van-col span="18">{{infoData.witnessUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">封样时间</text></van-col>
<van-col span="18">{{infoData.sealDate}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.signFiles!=null && infoData.signFiles!=''}}">
<van-row>
<van-col span="6"><text class="color_purple" style="letter-spacing: 15rpx;">会签单</text></van-col>
<van-col span="18">
<view class="in-img-div" wx:if="{{minSignFileImages.length>0}}" wx:for="{{minSignFileImages}}" wx:key="index">
<image bindtap='showSignFileImg' data-index="{{index}}" src='{{item}}'></image>
</view>
<view class="in-img-div" wx:if="{{signFileNames.length>0}}">
<image src='https://cf.makalu.cc/profile/wechat/icon/pdf.png'></image>
<text class="files" style="color:#89a3ed;margin-left:50rpx;" bindtap='downFile' data-index="{{0}}" >下载附件</text>
</view>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.alterationFiles!=null && infoData.alterationFiles!=''}}">
<van-row>
<van-col span="6"><text class="color_purple" style="letter-spacing: 15rpx;">变更单</text></van-col>
<van-col span="18">
<view class="in-img-div" wx:if="{{minAlterationFileImages.length>0}}" wx:for="{{minAlterationFileImages}}" wx:key="index">
<image bindtap='showAlterationFileImg' data-index="{{index}}" src='{{item}}'></image>
</view>
<view class="in-img-div" wx:if="{{alterationFileNames.length>0}}">
<image src='https://cf.makalu.cc/profile/wechat/icon/pdf.png'></image>
<text class="files" style="color:#89a3ed;margin-left:50rpx;" bindtap='downFile2' data-index="{{0}}" >下载附件</text>
</view>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.materialResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">封样结果</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.materialResult == 1}}" class="color_green">合格</text>
<text wx:if="{{infoData.materialResult == 2}}" class="color_orange">不合格</text>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交单位</text></van-col>
<van-col span="18">
{{infoData.deptName}}
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交用户</text></van-col>
<van-col span="18">{{infoData.createBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.approveStatus=='1'}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>材料封样审批结果</view>
</view>
<view class="inspect_info">
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">审批结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择审批结果" bindchange="onSelect" ></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">审批意见</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写审批意见（200字内）"
placeholder-style="color:#6777aa;" bindinput="onInputValue" maxlength="200"/>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="returnToPage">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">提交审批</view>
</view>
</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="/images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

70
miniprogram/pages/project_approve/approveMaterialSeal/index.wxss 100644
View File

@ -0,0 +1,70 @@
/* pageage/project_checking/info/index.wxss */
.in-img-max:after{
display:block;
clear:both;
content:"";
visibility:hidden;
height:0
}
.in-img-max{
width: auto;
zoom:1
}
.in-img-div{
position: relative;
margin: 0 8px 8px 0;
float: left;
}
.in-img-div image{
width: 180rpx;
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;
}

272
miniprogram/pages/project_approve/approveMeasure/index.js 100644
View File

@ -0,0 +1,272 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
loadShow:false,
loginName:"",
showDel:false,
imageList:[],
minImageList:[],
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();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
let minUrls = [];
if(res.data.imageUrls){
res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element);
minUrls.push(that.data.request+element+'.min.jpg');
});
}
that.setData({
infoData:res.data,
imageList:urls,
minImageList:minUrls,
loadShow:false
})
//判断当前能否删除
if(res.data.createBy==that.data.loginName){
that.setData({
showDel:true
})
}
}
}
})
},
//保存
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,
measureResult: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/projectMeasure/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('用户点击取消');
}
}
})
},
//选择检测结果
onSelect(e){
this.setData({
result:e.detail.id
})
},
//审批意见
onInputValue(e){
let comment = e.detail.value
this.setData({
comment
})
},
/**
* 查询流程日志
*/
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;
wx.previewImage({
urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index]
})
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

8
miniprogram/pages/project_approve/approveMeasure/index.json 100644
View File

@ -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"
}

165
miniprogram/pages/project_approve/approveMeasure/index.wxml 100644
View File

@ -0,0 +1,165 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">实测实量审批</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<van-collapse-item title="审批日志" name="2">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">
<text wx:if="{{item.approveStatus==1}}">提交取样复试</text>
<text wx:if="{{item.approveStatus!=1}}">审批取样复试</text>
{{item.commentResult}}
<text wx:if="{{item.commentResult==4}}" class="timeline_for_state_1 color_green">合格</text>
<text wx:if="{{item.commentResult==3}}" class="timeline_for_state_2 color_purple">不合格</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="module_title module_title_padding">
<view>{{infoData.projectName}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量图片</text></van-col>
<view class="problem_list_info_con in-img-max">
<view class="in-img-div" wx:for="{{minImageList}}" wx:key="index">
<image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
</view>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量类型</text></van-col>
<van-col span="18" class="color_blue">{{infoData.measureTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量内容</text></van-col>
<van-col span="18" class="color_blue">{{infoData.measureInfoName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量部位</text></van-col>
<van-col span="18">{{infoData.measurePosition}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量点位</text></van-col>
<van-col span="18">{{infoData.measurePointPosition}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">测量时间</text></van-col>
<van-col span="18">{{infoData.measureTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">质量专员</text></van-col>
<van-col span="18">{{infoData.qualityUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">监理专员</text></van-col>
<van-col span="18">{{infoData.superviseUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.measureResult!=null}}">
<van-row>
<van-col span="6"><text class="color_purple">测量结果</text></van-col>
<van-col span="18">
<text wx:if="{{infoData.measureResult == 1}}" class="color_green">合格</text>
<text wx:if="{{infoData.measureResult == 2}}" class="color_orange">不合格</text>
</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交用户</text></van-col>
<van-col span="18">{{infoData.createBy}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">提交时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.approveStatus=='1'}}">
<view class="safety_inspect_title module_title_flex module_title_padding">
<view>实测实量审批结果</view>
</view>
<view class="inspect_info">
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">审批结果</view>
<view class="inspect_info_content">
<voucher-select columns="{{list}}" placeholder="请选择审批结果" bindchange="onSelect" ></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">审批意见</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写审批意见（200字内）"
placeholder-style="color:#6777aa;" bindinput="onInputValue" maxlength="200"/>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="returnToPage">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">提交审批</view>
</view>
</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="/images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

70
miniprogram/pages/project_approve/approveMeasure/index.wxss 100644
View File

@ -0,0 +1,70 @@
/* pageage/project_checking/info/index.wxss */
.in-img-max:after{
display:block;
clear:both;
content:"";
visibility:hidden;
height:0
}
.in-img-max{
width: auto;
zoom:1
}
.in-img-div{
position: relative;
margin: 0 8px 8px 0;
float: left;
}
.in-img-div image{
width: 180rpx;
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;
}

184
miniprogram/pages/project_approve/index.js 100644
View File

@ -0,0 +1,184 @@
// pageage/safetyManagement/securityCheckGR/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
deptId:"",
loginName:"",
projectId:"",
minRoleId:"",
projectData:{},
initData: {},
show:false,
listData:[],
activeState:"await",
dspCount:0,
ywcCount:0
},
getInfo(e){
let {id,type} = e.currentTarget.dataset.set
if(type=="1"){
wx.redirectTo({
url: `approveCheckDetection/index?id=${id}`,
})
}else if(type=="2"){
wx.redirectTo({
url: `approveMeasure/index?id=${id}`,
})
}else if(type=="3"){
wx.redirectTo({
url: `approveChecking/index?id=${id}`,
})
}else if(type=="4"){
wx.redirectTo({
url: `approveMaterialSeal/index?id=${id}`,
})
}else{
//没有这个类型
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
deptId:res.data.deptId,
loginName:res.data.loginName,
projectId:app.globalData.projectId,
minRoleId:res.data.minRoleId,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData(res.data.loginName);
}
})
},
/**
* 查询项目审批数据
*/
getListData(loginName) {
var that = this;
let param = {
"nowUserName": loginName,
"activeName":that.data.activeState
}
this.queryCount(param);
wx.request({
url: app.globalData.reqUrl + '/wechat/projectAuditinfo/findList',
data:param,
method: "get",
success: function (res) {
that.setData({
listData:res.data.data
})
}
});
},
//查询统计
queryCount(param){
let that = this;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectAuditinfo/findAuditCount',
data: param,
method: "get",
success: function (res) {
that.setData({
dspCount:res.data.data.await,
ywcCount:res.data.data.finished
});
}
});
},
/**
* 标签切换
*/
typeJump(e){
let index = e.currentTarget.dataset.index;
let nav = "";
if(index == 1){
nav = 'await';
}else if(index == 2){
nav = 'finished';
}
this.setData({
activeState:nav
});
this.getListData(this.data.loginName);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
url: '../gengduogongneng/gengduogongneng',
})
},
//项目切换 返回值
onProjectSelect(e){
let projectId = e.detail.id;
let projectName = e.detail.text;
app.globalData.projectId = projectId;
app.globalData.projectName = projectName;
this.onLoad();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

8
miniprogram/pages/project_approve/index.json 100644
View File

@ -0,0 +1,8 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "质量隐患排查"
}

58
miniprogram/pages/project_approve/index.wxml 100644
View File

@ -0,0 +1,58 @@
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">项目审批管理</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='await'?'active':''}}" bindtap="typeJump" data-index="1"><text>待审批（{{dspCount}}）</text></view>
<view class="{{activeState=='finished'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text color_orange">审批类型：{{item.typeName}}</view>
<view wx:if="{{item.approve_status==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approve_status==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approve_status==3}}" class="code_label_2 code_label_red">不合格</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="">
<view class="inspect_list_info_data_prop color_purple">项目名称：<text>{{item.projectName}}</text></view>
<view class="inspect_list_info_data_prop safety_issue_number">提交时间：<text>{{item.create_time}}</text></view>
<view class="inspect_list_info_data_prop color_blue">提交用户：<text>{{item.nick_name}}</text></view>
<view class="inspect_list_info_data_prop">提交单位：<text>{{item.dept_name}}</text></view>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="/images/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
</view>
</view>

1
miniprogram/pages/project_approve/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking_list/project_checking_list.wxss */

2
miniprogram/pages/project_flowable/editLeaveTask/index.js
View File

@ -391,7 +391,7 @@ Page({
return fmt;
},
// 手风琴
// 手风琴
onChange(event) {
this.setData({
activeName: event.detail,

5
miniprogram/pages/quality_manage/index.js
View File

@ -443,7 +443,8 @@ Page({
"nowRole":minRoleId,
"nowDept":deptId,
"nowUserName":loginName,
"nowUser":userId
"nowUser":userId,
"activeName":"await"
}
var that = this;
wx.request({
@ -454,7 +455,7 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
db:res.data.length
db:(res.data.todo+res.data.approve)
})
}
}

5
miniprogram/pages/safety_manage/index.js
View File

@ -454,7 +454,8 @@ Page({
"nowRole":minRoleId,
"nowDept":deptId,
"nowUserName":loginName,
"nowUser":userId
"nowUser":userId,
"activeName":"await"
}
var that = this;
wx.request({
@ -465,7 +466,7 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
db:res.data.length,
db:(res.data.todo+res.data.approve)
})
}
}

5
miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
View File

@ -679,7 +679,8 @@ Page({
"nowRole":minRoleId,
"nowDept":deptId,
"nowUserName":loginName,
"nowUser":userId
"nowUser":userId,
"activeName":"await"
}
var that = this;
wx.request({
@ -690,7 +691,7 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
db:res.data.length
db:(res.data.todo+res.data.approve)
})
}
}