提交代码

main
姜玉琦 2024-04-14 21:28:11 +08:00
parent 366a897e54
commit cab1ad2759
165 changed files with 2493 additions and 1739 deletions

View File

@ -21,7 +21,7 @@ export function startProcessInstance(data) {
// 查询流程节点 // 查询流程节点
export function readDeployNotes(deployId) { export function readDeployNotes(deployId) {
return request({ return request({
url: '/wxApi/flowTask/readNotes/'+deployId, url: '/wechat/flowTask/readDeployNotes/'+deployId,
method: 'get' method: 'get'
}) })
} }
@ -136,7 +136,7 @@ export function myFinishedFlowTaskList(data) {
// 根据条件查询所有流申请 // 根据条件查询所有流申请
export function allInstanceList(data) { export function allInstanceList(data) {
return request({ return request({
url: '/wxApi/flowTask/allList', url: '/wechat/flowTask/allList',
method: 'get', method: 'get',
data: data data: data
}) })

View File

@ -33,3 +33,19 @@ export function loginOut() {
'method': 'get' 'method': 'get'
}) })
} }
// 查询公众号消息授权
export function findOpenUserMsgId(openId) {
return request({
'url': '/wechat/findOpenUserMsgId/'+openId,
'method': 'get'
})
}
// 删除公众号消息授权
export function delOpenUserMsgId(openId) {
return request({
'url': '/wechat/delOpenUserMsgId/'+openId,
'method': 'get'
})
}

View File

@ -1380,6 +1380,7 @@ swiper-item video {
.color_green { .color_green {
color: #1ab400; color: #1ab400;
font-weight: 800;
} }
.color_blue { .color_blue {
@ -1841,3 +1842,12 @@ swiper-item video {
.inspect_list_info_data_2 { .inspect_list_info_data_2 {
width: 100%; width: 100%;
} }
.van-steps{
background-color: transparent !important;
}
.van-step--horizontal .van-step__circle-container{
background-color: transparent !important;
}
.van-steps--horizontal{
padding: 10px 20px !important;
}

View File

@ -8,6 +8,10 @@ component_1.VantComponent({
icon: String, icon: String,
steps: Array, steps: Array,
active: Number, active: Number,
rejectNode:{
type: Number,
value: 100,
},
direction: { direction: {
type: String, type: String,
value: 'horizontal', value: 'horizontal',

View File

@ -2,45 +2,31 @@
<view class="custom-class {{ utils.bem('steps', [direction]) }}"> <view class="custom-class {{ utils.bem('steps', [direction]) }}">
<view class="van-step__wrapper"> <view class="van-step__wrapper">
<view <view wx:for="{{ steps }}" wx:key="index" bindtap="onClick" data-index="{{ index }}" class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline" style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}">
wx:for="{{ steps }}" <view class="van-step__title" style="{{ index === active ? 'color: #45affb': (index === rejectNode? 'color: #fd6060;font-weight:800':'')}}">
wx:key="index" <view style="{{ index < active ? 'color: ' + activeColor : '' }}">{{ item.text }}</view>
bindtap="onClick"
data-index="{{ index }}"
class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
>
<view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
<view>{{ item.text }}</view>
<view class="desc-class">{{ item.desc }}</view> <view class="desc-class">{{ item.desc }}</view>
</view> </view>
<view class="van-step__circle-container"> <view class="van-step__circle-container">
<block wx:if="{{ index !== active }}"> <block wx:if="{{ index > active }}">
<van-icon <block wx:if="{{ index === rejectNode }}">
wx:if="{{ item.inactiveIcon || inactiveIcon }}" <van-icon color="#fd6060" name="clear" custom-class="van-step__icon" />
color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
name="{{ item.inactiveIcon || inactiveIcon }}"
custom-class="van-step__icon"
/>
<view
wx:else
class="van-step__circle"
style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
/>
</block> </block>
<block wx:if="{{ index != rejectNode }}">
<van-icon wx:else name="{{ item.activeIcon || activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" /> <van-icon wx:if="{{ item.inactiveIcon || inactiveIcon }}" color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}" name="{{ item.inactiveIcon || inactiveIcon }}" custom-class="van-step__icon" />
<view wx:else class="van-step__circle" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}" />
</block>
</block>
<van-icon wx:else name="{{ index < active ? 'checked': 'checked' }}" style="{{index < active ? 'color:#07c160':'color:#45affb;font-size:30rpx !important;'}}" custom-class="van-step__icon" />
</view> </view>
<view <view wx:if="{{ index === rejectNode -1 }}" class="van-step__line" style="background-color:#fd6060" />
wx:if="{{ index !== steps.length - 1 }}" <view wx:if="{{ (index !== steps.length - 1) && index != rejectNode -1 }}" class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}" />
class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
/>
</view> </view>
</view> </view>
</view> </view>
<wxs module="status"> <wxs module="status">
function get(index, active) { function get(index, active) {
if (index < active) { if (index < active) {
return 'finish'; return 'finish';
} else if (index === active) { } else if (index === active) {
@ -48,7 +34,7 @@ function get(index, active) {
} }
return 'inactive'; return 'inactive';
} }
module.exports = get; module.exports = get;
</wxs> </wxs>

View File

@ -1 +1 @@
@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff;background-color:var(--steps-background-color,#fff)}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;font-size:var(--step-font-size,14px);color:#969799;color:var(--step-text-color,#969799)}.van-step--finish{color:#323233;color:var(--step-finish-text-color,#323233)}.van-step__circle{border-radius:50%;width:5px;width:var(--step-circle-size,5px);height:5px;height:var(--step-circle-size,5px);background-color:#969799;background-color:var(--step-circle-color,#969799)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;-webkit-transform:none;transform:none}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0);background-color:#fff;background-color:var(--white,#fff);padding:0 8px;padding:0 var(--padding-xs,8px)}.van-step--horizontal .van-step__title{display:inline-block;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);font-size:12px;font-size:var(--step-horizontal-title-font-size,12px)}.van-step--horizontal .van-step__line{position:absolute;right:0;bottom:6px;left:0;height:1px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step--horizontal.van-step--process{color:#323233;color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical{padding:10px 10px 10px 0;line-height:18px}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{position:absolute;top:0;left:-15px;z-index:1;width:1px;height:20px;content:"";background-color:#fff;background-color:var(--white,#fff)}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__icon{line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)} @import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff;background-color:var(--steps-background-color,#fff)}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;font-size:var(--step-font-size,14px);color:#969799;color:var(--step-text-color,#969799)}.van-step--finish{color:#323233;color:var(--step-finish-text-color,#323233)}.van-step__circle{border-radius:50%;width:5px;width:var(--step-circle-size,5px);height:5px;height:var(--step-circle-size,5px);background-color:#969799;background-color:var(--step-circle-color,#969799)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;-webkit-transform:none;transform:none}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0);background-color:#fff;background-color:var(--white,#fff);padding:0 8px;padding:0 var(--padding-xs,8px)}.van-step--horizontal .van-step__title{display:inline-block;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);font-size:12px;font-size:var(--step-horizontal-title-font-size,12px)}.van-step--horizontal .van-step__line{position:absolute;right:0;bottom:6px;left:0;height:2px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step--horizontal.van-step--process{color:#323233;color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;line-height:1;}.van-step--vertical{padding:10px 10px 10px 0;line-height:18px}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{position:absolute;top:0;left:-15px;z-index:1;width:1px;height:20px;content:"";background-color:#fff;background-color:var(--white,#fff)}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__icon{line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step__title{padding-bottom: 10rpx;}

View File

@ -24,7 +24,9 @@ Page({
witnessUserName:"", witnessUserName:"",
checkTime:"", checkTime:"",
laboratoryName:"", laboratoryName:"",
qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}] qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -18,7 +18,9 @@ Page({
detectionResult:"1", detectionResult:"1",
detectionFileData:[], detectionFileData:[],
fileType:["pdf","png","jpg","jpeg"], fileType:["pdf","png","jpg","jpeg"],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
active: 2
}, },
/** /**

View File

@ -1,4 +1,6 @@
{ {
"usingComponents": {"van-overlay": "@vant/weapp/overlay/index"}, "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index"},
"navigationStyle":"custom" "navigationStyle":"custom"
} }

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -34,7 +34,9 @@ Page({
qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}], qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
detectionFileData:[], detectionFileData:[],
fileType:["pdf","png","jpg","jpeg"], fileType:["pdf","png","jpg","jpeg"],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
active: 1
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index", "van-overlay": "@vant/weapp/overlay/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -28,7 +28,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -6,32 +6,46 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
loadShow:false, loadShow: false,
loginName:"", loginName: "",
showDel:false, showDel: false,
detectionImageList:[], detectionImageList: [],
minDetectionFileImages:[], minDetectionFileImages: [],
detectionFiles:[], detectionFiles: [],
fileUrls:[], fileUrls: [],
activeName:"", activeName: "",
flowRecordList:[], flowRecordList: [],
request:app.globalData.reqUrl request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交申请'
}, {
text: '检测报告'
}, {
text: '监理审批'
}, {
text: '结束'
}],
active: 100
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -43,50 +57,63 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectDetection/info', url: app.globalData.reqUrl + '/wechat/projectDetection/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active;
if (res.data.approveStatus == null) {
state = 2;
}else if (res.data.approveStatus == "1") {
state = 3;
} else if (res.data.approveStatus == "3") {
state = 2;
}
that.setData({
active: state
})
let imageUrls = []; let imageUrls = [];
let minImageUrls = []; let minImageUrls = [];
let fileUrls = []; let fileUrls = [];
let fileNames = []; let fileNames = [];
//判断附件 //判断附件
if(res.data.detectionFile){ if (res.data.detectionFile) {
res.data.detectionFile.split(',').forEach(element => { res.data.detectionFile.split(',').forEach(element => {
let _file = element.split('.'); let _file = element.split('.');
_file = _file[_file.length-1].toLocaleUpperCase(); _file = _file[_file.length - 1].toLocaleUpperCase();
//判断附件类型,如果是图片直接展示,非图片则显示附件 //判断附件类型,如果是图片直接展示,非图片则显示附件
if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){ if (_file == "PNG" || _file == "JPG" || _file == "JPEG") {
imageUrls.push(that.data.request+element); imageUrls.push(that.data.request + element);
minImageUrls.push(that.data.request+element+'.min.jpg'); minImageUrls.push(that.data.request + element + '.min.jpg');
}else{ } else {
let it = element.split('/'); let it = element.split('/');
fileNames.push(it[it.length-1]); fileNames.push(it[it.length - 1]);
fileUrls.push(element); fileUrls.push(element);
} }
}); });
} }
that.setData({ that.setData({
infoData:res.data, infoData: res.data,
detectionImageList:imageUrls, detectionImageList: imageUrls,
minDetectionFileImages:minImageUrls, minDetectionFileImages: minImageUrls,
detectionFiles:fileNames, detectionFiles: fileNames,
fileUrls, fileUrls,
loadShow:false loadShow: false
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){ if (res.data.createBy == that.data.loginName && res.data.approveStatus != "4") {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -97,20 +124,20 @@ Page({
/** /**
* 查询流程日志 * 查询流程日志
*/ */
getAuditinfo(){ getAuditinfo() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', url: app.globalData.reqUrl + '/wechat/projectAuditinfo/selectProjectAuditinfo',
method:"get", method: "get",
data:{ data: {
fromType:"1", fromType: "1",
fromId:this.data.id fromId: this.data.id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
flowRecordList:res.data flowRecordList: res.data
}) })
} }
} }
@ -124,7 +151,7 @@ Page({
}); });
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -140,18 +167,20 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectDetection/remove', url: app.globalData.reqUrl + '/wechat/projectDetection/remove',
header: { header: {
"Username": this.data.loginName, "Username": this.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功!") app.toast("删除成功!")
wx.redirectTo({ wx.redirectTo({
url: `../list/index`, url: `../list/index`,
@ -161,7 +190,7 @@ Page({
}, },
//跳转修改页面 //跳转修改页面
onUpdate:function(){ onUpdate: function () {
let id = this.data.id; let id = this.data.id;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}`, url: `../edit/index?id=${id}`,
@ -169,19 +198,19 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.detectionImageList, urls: that.data.detectionImageList,
current: that.data.detectionImageList[e.currentTarget.dataset.index] current: that.data.detectionImageList[e.currentTarget.dataset.index]
}) })
}, },
downFile:function(e){ downFile: function (e) {
let that = this; let that = this;
wx.downloadFile({ wx.downloadFile({
// 示例 url并非真实存在 // 示例 url并非真实存在
url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls[0], url: app.globalData.uploadUrl + '/common/download/resource?resource=' + that.data.fileUrls[0],
success: function (res) { success: function (res) {
const filePath = res.tempFilePath const filePath = res.tempFilePath
wx.openDocument({ wx.openDocument({
@ -189,7 +218,7 @@ Page({
success: function (res) { success: function (res) {
console.log('打开文档成功') console.log('打开文档成功')
}, },
fail:function(res) { fail: function (res) {
console.log(res) console.log(res)
} }
}) })

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;"> <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

View File

@ -44,7 +44,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -43,7 +43,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -31,7 +31,9 @@ Page({
dataTypeLvl1List:[], dataTypeLvl1List:[],
dataTypeLvl2List:[], dataTypeLvl2List:[],
dataTypeLvl2AllList:[], dataTypeLvl2AllList:[],
list:[{id:1,text:"合格"},{id:2,text:"不合格"}] list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info"> <view class="inspect_info">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -36,7 +36,9 @@ Page({
dataTypeLvl2List:[], dataTypeLvl2List:[],
dataTypeLvl2AllList:[], dataTypeLvl2AllList:[],
list:[{id:1,text:"合格"},{id:2,text:"不合格"}], list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 1
}, },
/** /**

View File

@ -2,6 +2,7 @@
"usingComponents": { "usingComponents": {
"van-overlay": "@vant/weapp/overlay/index", "van-overlay": "@vant/weapp/overlay/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_info"> <view class="inspect_info">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -34,7 +34,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -6,30 +6,42 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
imageList:[], imageList: [],
minImageList:[], minImageList: [],
loadShow:false, loadShow: false,
loginName:"", loginName: "",
showDel:false, showDel: false,
activeName:"", activeName: "",
flowRecordList:[], flowRecordList: [],
request:app.globalData.reqUrl request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交申请'
}, {
text: '监理审批'
}, {
text: '结束'
}],
active: 100
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -41,36 +53,47 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/info', url: app.globalData.reqUrl + '/wechat/projectchecking/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active;
if (res.data.approveStatus == "1") {
state = 2;
} else if (res.data.approveStatus == "3") {
state = 1;
}
that.setData({
active: state
})
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.imageUrls){ if (res.data.imageUrls) {
res.data.imageUrls.split(',').forEach(element => { res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
infoData:res.data, infoData: res.data,
imageList:urls, imageList: urls,
minImageList:minUrls, minImageList: minUrls,
loadShow:false loadShow: false
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){ if (res.data.createBy == that.data.loginName && res.data.approveStatus != "4") {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -78,7 +101,7 @@ Page({
}) })
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -94,18 +117,20 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/remove', url: app.globalData.reqUrl + '/wechat/projectchecking/remove',
header: { header: {
"Username": this.data.loginName, "Username": this.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功!") app.toast("删除成功!")
wx.navigateTo({ wx.navigateTo({
url: `../list/index`, url: `../list/index`,
@ -115,9 +140,9 @@ Page({
}, },
//跳转修改页面 //跳转修改页面
onUpdate:function(){ onUpdate: function () {
let id = this.data.id; let id = this.data.id;
let dataTypeLvl1= this.data.infoData.dataTypeLvl1; let dataTypeLvl1 = this.data.infoData.dataTypeLvl1;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}&dt1=${dataTypeLvl1}`, url: `../edit/index?id=${id}&dt1=${dataTypeLvl1}`,
}) })
@ -126,20 +151,20 @@ Page({
/** /**
* 查询流程日志 * 查询流程日志
*/ */
getAuditinfo(){ getAuditinfo() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', url: app.globalData.reqUrl + '/wechat/projectAuditinfo/selectProjectAuditinfo',
method:"get", method: "get",
data:{ data: {
fromType:"3", fromType: "3",
fromId:this.data.id fromId: this.data.id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
flowRecordList:res.data flowRecordList: res.data
}) })
} }
} }
@ -154,8 +179,8 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.imageList[e.currentTarget.dataset.index]

View File

@ -2,6 +2,7 @@
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -3,7 +3,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view> <view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col> </van-col>
<van-col span="15"> <van-col span="15">
<view class="header_name">举牌验收详情</view> <view class="header_name">举牌验收详情</view>
@ -12,6 +14,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;"> <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
@ -32,10 +35,18 @@
</view> </view>
</view> </view>
<view class="inspect_list_info gk_open_con"> <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.userName}}">
<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位:<text class="color_blue">{{item.deptName}}</text></view> <image src="/images/lw_3.png"></image>办理用户:<text>{{item.userName}}</text>
<view><image src="/images/s_6.png"></image>办理时间:<text>{{item.createTime}}</text></view> </view>
<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见:<text>{{item.comment}}</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>
</view> </view>
@ -135,4 +146,3 @@
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onUpdate">修改</view> <view class="problem_submit_to_btn problem_submit_to_save" bindtap="onUpdate">修改</view>
</view> </view>
</view> </view>

View File

@ -44,7 +44,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -50,7 +50,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -41,7 +41,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -46,7 +46,7 @@ Page({
let fileDepts = ""; let fileDepts = "";
if(res.data.minRoleId>3){ if(res.data.minRoleId>3){
if(res.data.minRoleId==4){ if(res.data.minRoleId==4){
fileDepts += app.globalData.projectInfoList[0].projectInfoList[0].deptId; fileDepts += app.globalData.projectInfoList[0].deptId;
}else{ }else{
app.globalData.projectInfoList.forEach(pro =>{ app.globalData.projectInfoList.forEach(pro =>{
fileDepts += pro.projectInfoList[0].deptId; fileDepts += pro.projectInfoList[0].deptId;

View File

@ -57,7 +57,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -39,7 +39,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -24,7 +24,9 @@ Page({
showBgd:false, showBgd:false,
rectifierData:[], rectifierData:[],
witnessUser:"", witnessUser:"",
witnessUserName:"" witnessUserName:"",
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -6,6 +6,7 @@
"van-picker": "@vant/weapp/picker/index", "van-picker": "@vant/weapp/picker/index",
"van-area": "@vant/weapp/area/index", "van-area": "@vant/weapp/area/index",
"mkl-multi-select": "/components/@mkl/multi-select/index", "mkl-multi-select": "/components/@mkl/multi-select/index",
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info"> <view class="inspect_info">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -28,7 +28,9 @@ Page({
activeName:"", activeName:"",
flowRecordList:[], flowRecordList:[],
infoData:{}, infoData:{},
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 1
}, },
/** /**

View File

@ -8,6 +8,7 @@
"mkl-multi-select": "/components/@mkl/multi-select/index", "mkl-multi-select": "/components/@mkl/multi-select/index",
"van-overlay": "@vant/weapp/overlay/index", "van-overlay": "@vant/weapp/overlay/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_info"> <view class="inspect_info">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -67,7 +67,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -6,38 +6,50 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
imageList:[], imageList: [],
minImageList:[], minImageList: [],
loadShow:false, loadShow: false,
loginName:"", loginName: "",
showDel:false, showDel: false,
signFileNames:[], signFileNames: [],
minSignFileImages:[], minSignFileImages: [],
signFileImages:[], signFileImages: [],
alterationFileNames:[], alterationFileNames: [],
minAlterationFileImages:[], minAlterationFileImages: [],
alterationFileImages:[], alterationFileImages: [],
fileUrls:[], fileUrls: [],
fileUrls2:[], fileUrls2: [],
activeName:"", activeName: "",
flowRecordList:[], flowRecordList: [],
request:app.globalData.reqUrl request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交申请'
}, {
text: '监理审批'
}, {
text: '结束'
}],
active: 100
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -49,24 +61,35 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMaterialSeal/info', url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active;
if (res.data.approveStatus == "1") {
state = 2;
} else if (res.data.approveStatus == "3") {
state = 1;
}
that.setData({
active: state
})
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.imageUrls){ if (res.data.imageUrls) {
res.data.imageUrls.split(',').forEach(element => { res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
let fileNames = []; let fileNames = [];
@ -74,17 +97,17 @@ Page({
let fileImages = []; let fileImages = [];
let fileUrls = []; let fileUrls = [];
//判断附件 //判断附件
if(res.data.signFiles){ if (res.data.signFiles) {
res.data.signFiles.split(',').forEach(element => { res.data.signFiles.split(',').forEach(element => {
let _file = element.split('.'); let _file = element.split('.');
_file = _file[_file.length-1].toLocaleUpperCase(); _file = _file[_file.length - 1].toLocaleUpperCase();
//判断附件类型,如果是图片直接展示,非图片则显示附件 //判断附件类型,如果是图片直接展示,非图片则显示附件
if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){ if (_file == "PNG" || _file == "JPG" || _file == "JPEG") {
fileImages.push(that.data.request+element); fileImages.push(that.data.request + element);
minFileImages.push(that.data.request+element+'.min.jpg'); minFileImages.push(that.data.request + element + '.min.jpg');
}else{ } else {
let it = element.split('/'); let it = element.split('/');
fileNames.push(it[it.length-1]); fileNames.push(it[it.length - 1]);
fileUrls.push(element); fileUrls.push(element);
} }
}); });
@ -94,17 +117,17 @@ Page({
let fileImages2 = []; let fileImages2 = [];
let fileUrls2 = []; let fileUrls2 = [];
//判断附件 //判断附件
if(res.data.alterationFiles){ if (res.data.alterationFiles) {
res.data.alterationFiles.split(',').forEach(element => { res.data.alterationFiles.split(',').forEach(element => {
let _file = element.split('.'); let _file = element.split('.');
_file = _file[_file.length-1].toLocaleUpperCase(); _file = _file[_file.length - 1].toLocaleUpperCase();
//判断附件类型,如果是图片直接展示,非图片则显示附件 //判断附件类型,如果是图片直接展示,非图片则显示附件
if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){ if (_file == "PNG" || _file == "JPG" || _file == "JPEG") {
fileImages2.push(that.data.request+element); fileImages2.push(that.data.request + element);
minFileImages2.push(that.data.request+element+'.min.jpg'); minFileImages2.push(that.data.request + element + '.min.jpg');
}else{ } else {
let it = element.split('/'); let it = element.split('/');
fileNames2.push(it[it.length-1]); fileNames2.push(it[it.length - 1]);
fileUrls2.push(element); fileUrls2.push(element);
} }
}); });
@ -112,21 +135,21 @@ Page({
that.setData({ that.setData({
fileUrls, fileUrls,
fileUrls2, fileUrls2,
signFileNames:fileNames, signFileNames: fileNames,
minSignFileImages:minFileImages, minSignFileImages: minFileImages,
signFileImages:fileImages, signFileImages: fileImages,
alterationFileNames:fileNames2, alterationFileNames: fileNames2,
minAlterationFileImages:minFileImages2, minAlterationFileImages: minFileImages2,
alterationFileImages:fileImages2, alterationFileImages: fileImages2,
infoData:res.data, infoData: res.data,
imageList:urls, imageList: urls,
minImageList:minUrls, minImageList: minUrls,
loadShow:false loadShow: false
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){ if (res.data.createBy == that.data.loginName && res.data.approveStatus != "4") {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -134,7 +157,7 @@ Page({
}) })
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -150,19 +173,21 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
let that = this; let that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+"/wechat/projectMaterialSeal/remove", url: app.globalData.reqUrl + "/wechat/projectMaterialSeal/remove",
header: { header: {
"Username": this.data.loginName, "Username": this.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功!") app.toast("删除成功!")
wx.redirectTo({ wx.redirectTo({
url: `../list/index` url: `../list/index`
@ -172,7 +197,7 @@ Page({
}, },
//跳转修改页面 //跳转修改页面
onUpdate:function(){ onUpdate: function () {
let id = this.data.id; let id = this.data.id;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}`, url: `../edit/index?id=${id}`,
@ -182,20 +207,20 @@ Page({
/** /**
* 查询流程日志 * 查询流程日志
*/ */
getAuditinfo(){ getAuditinfo() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', url: app.globalData.reqUrl + '/wechat/projectAuditinfo/selectProjectAuditinfo',
method:"get", method: "get",
data:{ data: {
fromType:"4", fromType: "4",
fromId:this.data.id fromId: this.data.id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
flowRecordList:res.data flowRecordList: res.data
}) })
} }
} }
@ -210,8 +235,8 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.imageList[e.currentTarget.dataset.index]
@ -219,8 +244,8 @@ Page({
}, },
//展示图片 //展示图片
showSignFileImg:function(e){ showSignFileImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.signFileImages, urls: that.data.signFileImages,
current: that.data.signFileImages[e.currentTarget.dataset.index] current: that.data.signFileImages[e.currentTarget.dataset.index]
@ -228,20 +253,20 @@ Page({
}, },
//展示图片 //展示图片
showAlterationFileImg:function(e){ showAlterationFileImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.alterationFileImages, urls: that.data.alterationFileImages,
current: that.data.alterationFileImages[e.currentTarget.dataset.index] current: that.data.alterationFileImages[e.currentTarget.dataset.index]
}) })
}, },
downFile:function(e){ downFile: function (e) {
let idx = e.currentTarget.dataset['index']; let idx = e.currentTarget.dataset['index'];
let that = this; let that = this;
wx.downloadFile({ wx.downloadFile({
// 示例 url并非真实存在 // 示例 url并非真实存在
url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls[idx], url: app.globalData.uploadUrl + '/common/download/resource?resource=' + that.data.fileUrls[idx],
success: function (res) { success: function (res) {
const filePath = res.tempFilePath const filePath = res.tempFilePath
wx.openDocument({ wx.openDocument({
@ -249,7 +274,7 @@ Page({
success: function (res) { success: function (res) {
console.log('打开文档成功') console.log('打开文档成功')
}, },
fail:function(res) { fail: function (res) {
console.log(res) console.log(res)
} }
}) })
@ -258,12 +283,12 @@ Page({
//app.toast("暂不支持下载!如需下载请前往后台管理系统!!") //app.toast("暂不支持下载!如需下载请前往后台管理系统!!")
}, },
downFile2:function(e){ downFile2: function (e) {
let idx = e.currentTarget.dataset['index']; let idx = e.currentTarget.dataset['index'];
let that = this; let that = this;
wx.downloadFile({ wx.downloadFile({
// 示例 url并非真实存在 // 示例 url并非真实存在
url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls2[idx], url: app.globalData.uploadUrl + '/common/download/resource?resource=' + that.data.fileUrls2[idx],
success: function (res) { success: function (res) {
const filePath = res.tempFilePath const filePath = res.tempFilePath
wx.openDocument({ wx.openDocument({
@ -271,7 +296,7 @@ Page({
success: function (res) { success: function (res) {
console.log('打开文档成功') console.log('打开文档成功')
}, },
fail:function(res) { fail: function (res) {
console.log(res) console.log(res)
} }
}) })

View File

@ -2,6 +2,7 @@
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;"> <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

View File

@ -44,7 +44,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -46,7 +46,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -39,7 +39,9 @@ Page({
id: 2, id: 2,
text: "不合格" text: "不合格"
}], }],
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"] fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"],
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -27,6 +27,8 @@ Page({
type: "", type: "",
info: "", info: "",
filesData: [], filesData: [],
flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
active: 1
}, },
/** /**

View File

@ -2,6 +2,7 @@
"usingComponents": { "usingComponents": {
"van-overlay": "@vant/weapp/overlay/index", "van-overlay": "@vant/weapp/overlay/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -28,7 +28,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -6,30 +6,42 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
loadShow:false, loadShow: false,
loginName:"", loginName: "",
showDel:false, showDel: false,
imageList:[], imageList: [],
minImageList:[], minImageList: [],
activeName:"", activeName: "",
flowRecordList:[], flowRecordList: [],
request:app.globalData.reqUrl request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交申请'
}, {
text: '监理审批'
}, {
text: '结束'
}],
active: 100
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -42,36 +54,47 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/info', url: app.globalData.reqUrl + '/wechat/projectMeasure/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active;
if (res.data.approveStatus == "1") {
state = 2;
} else if (res.data.approveStatus == "3") {
state = 1;
}
that.setData({
active: state
})
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.imageUrls){ if (res.data.imageUrls) {
res.data.imageUrls.split(',').forEach(element => { res.data.imageUrls.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
infoData:res.data, infoData: res.data,
imageList:urls, imageList: urls,
minImageList:minUrls, minImageList: minUrls,
loadShow:false loadShow: false
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){ if (res.data.createBy == that.data.loginName && res.data.approveStatus != "4") {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -79,7 +102,7 @@ Page({
}) })
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -95,19 +118,21 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
let that = this; let that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/remove', url: app.globalData.reqUrl + '/wechat/projectMeasure/remove',
header: { header: {
"Username": that.data.loginName, "Username": that.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功!") app.toast("删除成功!")
wx.redirectTo({ wx.redirectTo({
url: `../list/index`, url: `../list/index`,
@ -119,20 +144,20 @@ Page({
/** /**
* 查询流程日志 * 查询流程日志
*/ */
getAuditinfo(){ getAuditinfo() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', url: app.globalData.reqUrl + '/wechat/projectAuditinfo/selectProjectAuditinfo',
method:"get", method: "get",
data:{ data: {
fromType:"2", fromType: "2",
fromId:this.data.id fromId: this.data.id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
flowRecordList:res.data flowRecordList: res.data
}) })
} }
} }
@ -147,7 +172,7 @@ Page({
}, },
//跳转修改页面 //跳转修改页面
onUpdate:function(){ onUpdate: function () {
let id = this.data.id; let id = this.data.id;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}&measureType=${this.data.infoData.measureType}&measureInfo=${this.data.infoData.measureInfo}`, url: `../edit/index?id=${id}&measureType=${this.data.infoData.measureType}&measureInfo=${this.data.infoData.measureInfo}`,
@ -155,8 +180,8 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.imageList[e.currentTarget.dataset.index]

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-collapse": "@vant/weapp/collapse", "van-collapse": "@vant/weapp/collapse",
"van-collapse-item": "@vant/weapp/collapse-item" "van-collapse-item": "@vant/weapp/collapse-item"
}, },

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;"> <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

View File

@ -44,7 +44,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -46,7 +46,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -6,52 +6,63 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
maxDate:new Date(2088,1,1).getTime(), maxDate: new Date(2088, 1, 1).getTime(),
minDate:new Date().getTime()+(3600*48*1000), minDate: new Date().getTime() + (3600 * 48 * 1000),
projectId:"", projectId: "",
projectName:"", projectName: "",
loginName:"", loginName: "",
userName:"", userName: "",
rectifierData:[], rectifierData: [],
rectifierData2:[], rectifierData2: [],
rectifierData3:[], rectifierData3: [],
imageInfoData:[], imageInfoData: [],
//验收时间 //验收时间
nickedTime:'', nickedTime: '',
loadShow:false, loadShow: false,
lordSent:"", lordSent: "",
lordSentUser:"", lordSentUser: "",
copySend:"", copySend: "",
copySendUser:"", copySendUser: "",
recheckSend:"", recheckSend: "",
recheckSendUser:"", recheckSendUser: "",
workParts:"", workParts: "",
changeInfo:"", changeInfo: "",
dangerType:"1", dangerType: "1",
dangerTypeList:[], dangerTypeList: [],
selectValue:"", selectValue: "",
selectIndex:"", selectIndex: "",
problemType:"1", problemType: "1",
showHis:false, showHis: false,
problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}] problemTypeList: [{
id: "1",
text: "常规检查"
}, {
id: "2",
text: "专项检查"
}],
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 0
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {projectId,projectName} = options let {
projectId,
projectName
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
projectId:app.globalData.projectId, projectId: app.globalData.projectId,
projectName:app.globalData.projectName, projectName: app.globalData.projectName,
loginName:res.data.loginName, loginName: res.data.loginName,
userName:res.data.nickName, userName: res.data.nickName,
recheckSend:res.data.nickName, recheckSend: res.data.nickName,
recheckSendUser:res.data.loginName recheckSendUser: res.data.loginName
}) })
this.getAllProjectUserData(); this.getAllProjectUserData();
this.getDangerTypeList(); this.getDangerTypeList();
@ -61,102 +72,118 @@ Page({
}, },
//查询项目人员数据 //查询项目人员数据
getAllProjectUserData(){ getAllProjectUserData() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams', url: app.globalData.reqUrl + '/wechat/projectuserinfo/queryAllProjectUserByParams',
method:"get", method: "get",
data:{ data: {
projectId:that.data.projectId, projectId: that.data.projectId,
loginName:that.data.loginName loginName: that.data.loginName
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
rectifierData:res.data, rectifierData: res.data,
rectifierData3:res.data, rectifierData3: res.data,
}) })
} }
} }
}) })
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams', url: app.globalData.reqUrl + '/wechat/projectuserinfo/queryAllProjectUserByParams',
method:"get", method: "get",
data:{ data: {
projectId:that.data.projectId, projectId: that.data.projectId,
loginName:that.data.loginName, loginName: that.data.loginName,
selectMy:'Y' selectMy: 'Y'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data;
if(res.code == 200){ if (res.code == 200) {
let findMy = false;
res.data.forEach(it => {
if (it.userinfoList.length > 0) {
it.userinfoList.forEach(u => {
if (that.data.loginName == u.phonenumber) {
findMy = true;
}
});
}
});
if(!findMy){
res.data[0].userinfoList.push({state:false,nickName:that.data.userName,jobTypeName:'集团公司',phonenumber:that.data.loginName});
}
that.setData({ that.setData({
rectifierData2:res.data, rectifierData2: res.data,
}) })
} }
} }
}) })
}, },
getHisInfo(){ getHisInfo() {
//这里查询当前登录人上次提交隐患,自动填充整改人,复检人,抄送人 //这里查询当前登录人上次提交隐患,自动填充整改人,复检人,抄送人
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findLastDataByParams', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/findLastDataByParams',
method:"get", method: "get",
data:{ data: {
projectId:that.data.projectId, projectId: that.data.projectId,
createUser:that.data.loginName, createUser: that.data.loginName,
infoType:1 infoType: 1
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200 && res.data){ if (res.code == 200 && res.data) {
that.setData({ that.setData({
showHis:true, showHis: true,
lordSent:res.data.lordSent, lordSent: res.data.lordSent,
lordSentUser:res.data.lordSentUser, lordSentUser: res.data.lordSentUser,
recheckSend:res.data.recheckSend, recheckSend: res.data.recheckSend,
recheckSendUser:res.data.recheckSendUser, recheckSendUser: res.data.recheckSendUser,
copySend:res.data.copySend, copySend: res.data.copySend,
copySendUser:res.data.copySendUser copySendUser: res.data.copySendUser
}) })
} }
} }
}) })
}, },
getDangerTypeList(){ getDangerTypeList() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryDangerType', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryDangerType',
method:"get", method: "get",
data:{ data: {
type:'ssp_zlyhlx' type: 'ssp_zlyhlx'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let list=[]; let list = [];
res.data.forEach(it =>{ res.data.forEach(it => {
list.push({"id":it.dictValue,"text":it.dictLabel}); list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}) })
that.setData({ that.setData({
dangerTypeList:list dangerTypeList: list
}) })
} }
} }
@ -164,7 +191,7 @@ Page({
}, },
//隐患描述 //隐患描述
onInputWorkParts(e){ onInputWorkParts(e) {
let workParts = e.detail.value let workParts = e.detail.value
this.setData({ this.setData({
workParts workParts
@ -172,7 +199,7 @@ Page({
}, },
//整改要求 //整改要求
onInputChangeInfoValue(e){ onInputChangeInfoValue(e) {
let changeInfo = e.detail.value let changeInfo = e.detail.value
this.setData({ this.setData({
changeInfo changeInfo
@ -180,7 +207,7 @@ Page({
}, },
//验收时间 //验收时间
onInputTime(e){ onInputTime(e) {
let nickedTime = e.detail let nickedTime = e.detail
this.setData({ this.setData({
nickedTime nickedTime
@ -188,161 +215,178 @@ Page({
}, },
// list 上传图片 // list 上传图片
onImagesArr(e){ onImagesArr(e) {
var data = this.data.imageInfoData var data = this.data.imageInfoData
data = e.detail data = e.detail
this.setData({ this.setData({
imageInfoData:data imageInfoData: data
}) })
}, },
//添加整改人 //添加整改人
onAddLordSent(e){ onAddLordSent(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
lordSent:e.detail[0].userName, lordSent: e.detail[0].userName,
lordSentUser:e.detail[0].phoneNumber lordSentUser: e.detail[0].phoneNumber
}) })
} }
}, },
//添加抄送人 //添加抄送人
onAddCopySend(e){ onAddCopySend(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
let phoneNumbers=""; let phoneNumbers = "";
let userNames=""; let userNames = "";
e.detail.forEach(it =>{ e.detail.forEach(it => {
phoneNumbers+=","+it.phoneNumber; phoneNumbers += "," + it.phoneNumber;
userNames+=","+it.userName; userNames += "," + it.userName;
}); });
this.setData({ this.setData({
copySend:userNames.substring(1), copySend: userNames.substring(1),
copySendUser:phoneNumbers.substring(1) copySendUser: phoneNumbers.substring(1)
}) })
}else{ } else {
this.setData({ this.setData({
copySend:"", copySend: "",
copySendUser:"" copySendUser: ""
}) })
} }
}, },
//添加复检人 //添加复检人
onAddRecheckSend(e){ onAddRecheckSend(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
recheckSend:e.detail[0].userName, recheckSend: e.detail[0].userName,
recheckSendUser:e.detail[0].phoneNumber recheckSendUser: e.detail[0].phoneNumber
}) })
} }
}, },
//取消页面 //取消页面
cancelSaveView(){ cancelSaveView() {
this.returnToPage() this.returnToPage()
}, },
//保存 //保存
onProblemSubmitSave(){ onProblemSubmitSave() {
this.setData({ this.setData({
loadShow:true loadShow: true
}) })
let that = this let that = this
let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,problemType,userName} = that.data; let {
projectId,
projectName,
dangerType,
lordSent,
lordSentUser,
copySend,
copySendUser,
workParts,
changeInfo,
nickedTime,
recheckSend,
recheckSendUser,
imageInfoData,
loginName,
problemType,
userName
} = that.data;
//数据效验 //数据效验
if(projectId==""||loginName==""){ if (projectId == "" || loginName == "") {
app.toast("数据异常,请刷新页面重试!") app.toast("数据异常,请刷新页面重试!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(imageInfoData.length==0){ if (imageInfoData.length == 0) {
app.toast("请上传隐患现场图片!") app.toast("请上传隐患现场图片!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(problemType==""){ if (problemType == "") {
app.toast("请选择检查类型!") app.toast("请选择检查类型!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(dangerType==""){ if (dangerType == "") {
app.toast("请选择隐患类型!") app.toast("请选择隐患类型!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(workParts==""){ if (workParts == "") {
app.toast("请填写隐患描述!") app.toast("请填写隐患描述!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(changeInfo==""){ if (changeInfo == "") {
app.toast("请填写隐患整改要求!") app.toast("请填写隐患整改要求!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(nickedTime==""){ if (nickedTime == "") {
app.toast("请选择整改截至时间!") app.toast("请选择整改截至时间!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(lordSent==""||lordSentUser==""){ if (lordSent == "" || lordSentUser == "") {
app.toast("请选择整改人!") app.toast("请选择整改人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(recheckSend==""||recheckSendUser==""){ if (recheckSend == "" || recheckSendUser == "") {
app.toast("请选择复检人!") app.toast("请选择复检人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(copySend==""||copySendUser==""){ if (copySend == "" || copySendUser == "") {
app.toast("请选择抄送人!") app.toast("请选择抄送人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
let pos = copySend.split(","); let pos = copySend.split(",");
pos.forEach(it =>{ pos.forEach(it => {
if(it==lordSent){ if (it == lordSent) {
app.toast("抄送人中不能包含整改人!") app.toast("抄送人中不能包含整改人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
}); });
let fileUrls = []; let fileUrls = [];
imageInfoData.forEach(async (item)=>{ imageInfoData.forEach(async (item) => {
let uploadUrl = app.globalData.uploadUrl+'/common/upload' let uploadUrl = app.globalData.uploadUrl + '/common/upload'
let name = "file" let name = "file"
//这里复杂的图片上传,改为同步上传,因为小程序只能上传一张图片 //这里复杂的图片上传,改为同步上传,因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name); let obj = await that.syncUploadImage(uploadUrl, item, name);
fileUrls.push(obj.data.fileName); fileUrls.push(obj.data.fileName);
//验证图片上传完毕 //验证图片上传完毕
if(fileUrls.length == imageInfoData.length){ if (fileUrls.length == imageInfoData.length) {
let params = { let params = {
projectId, projectId,
infoType:"1", infoType: "1",
problemArea:projectName, problemArea: projectName,
problemType, problemType,
workParts, workParts,
changeInfo, changeInfo,
@ -350,34 +394,34 @@ Page({
lordSentUser, lordSentUser,
copySend, copySend,
copySendUser, copySendUser,
checkState:0, checkState: 0,
nickedTime:nickedTime+" 23:59:59", nickedTime: nickedTime + " 23:59:59",
smarkUrl:fileUrls.toString(), smarkUrl: fileUrls.toString(),
createUser:loginName, createUser: loginName,
dangerType, dangerType,
recheckSend, recheckSend,
recheckSendUser recheckSendUser
} }
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQuality', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQuality',
method:"POST", method: "POST",
data:params, data: params,
header: { header: {
"Username": loginName, "Username": loginName,
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
success(res){ success(res) {
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
res =res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
app.toast("添加成功!") app.toast("添加成功!")
setTimeout(()=>{ setTimeout(() => {
wx.redirectTo({ wx.redirectTo({
url: '../list/index', url: '../list/index',
}) })
},200) }, 200)
} }
} }
}) })
@ -388,7 +432,7 @@ Page({
/** /**
* 这里考虑上传图片异步问题封装为同步 * 这里考虑上传图片异步问题封装为同步
*/ */
syncUploadImage(url,uploadFile,name) { syncUploadImage(url, uploadFile, name) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
wx.uploadFile({ wx.uploadFile({
url, // 上传的服务器接口地址 url, // 上传的服务器接口地址
@ -397,7 +441,9 @@ Page({
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
}, },
name, //上传的所需字段,后端提供 name, //上传的所需字段,后端提供
formData: { user: 'test' }, formData: {
user: 'test'
},
success: (res) => { success: (res) => {
// 上传完成操作 // 上传完成操作
const data = JSON.parse(res.data) const data = JSON.parse(res.data)
@ -420,16 +466,16 @@ Page({
}, },
//选择检查类型 //选择检查类型
onSelectProblemType(e){ onSelectProblemType(e) {
this.setData({ this.setData({
problemType:e.detail.id problemType: e.detail.id
}) })
}, },
//选择隐患类型 //选择隐患类型
onSelectDangerType(e){ onSelectDangerType(e) {
this.setData({ this.setData({
dangerType:e.detail.id dangerType: e.detail.id
}) })
}, },

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -18,7 +18,9 @@ Page({
minImageList:[], minImageList:[],
auditImageList:[], auditImageList:[],
auditMinImageList:[], auditMinImageList:[],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 3
}, },
/** /**

View File

@ -1,6 +1,9 @@
{ {
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -3,7 +3,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view> <view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col> </van-col>
<van-col span="15"> <van-col span="15">
<view class="header_name">质量隐患复检</view> <view class="header_name">质量隐患复检</view>
@ -12,13 +14,66 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view> <view>{{infoData.problemArea}}</view>
</view> </view>
<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
<van-collapse value="{{activeName}}" bind:change="onChange">
<!-- <van-collapse-item title="申请流程" name="1">
<view class="left_manage2" wx:for="{{flowNodes}}" wx:key="index">
<text class="safety_issue_number {{item.state}}">{{item.name}}</text>
</view>
</van-collapse-item> -->
<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">{{item.taskName}}{{item.commentResult}}
<text wx:if="{{item.commentResult=='通过'}}" class="timeline_for_state_1 color_green">{{item.commentResult}}</text>
<text wx:if="{{item.commentResult=='驳回'}}" class="timeline_for_state_2 color_purple">{{item.commentResult}}</text>
<text wx:if="{{item.commentResult=='退回'}}" class="timeline_for_state_2 color_purple">{{item.commentResult}}</text>
</view>
</view>
</view>
<view class="inspect_list_info gk_open_con">
<view wx:if="{{item.assigneeName}}">
<image src="/images/lw_3.png"></image>办理用户:<text>{{item.assigneeName}}</text>
</view>
<view wx:if="{{item.assigneeName}}">
<image src="/images/s_1.png"></image>办理单位:<text class="color_blue">{{item.deptName}}</text>
</view>
<view wx:if="{{item.candidate}}">
<image src="/images/s_2.png"></image>候选办理:<text>{{item.candidate}}</text>
</view>
<view wx:if="{{item.deleteReason}}">
<image src="/images/s_18.png"></image>驳回节点:<text>{{item.deleteReason}}</text>
</view>
<view>
<image src="/images/s_6.png"></image>接收时间:<text>{{item.startTime}}</text>
</view>
<view wx:if="{{item.endTime}}">
<image src="/images/lw_8.png"></image>处理时间:<text>{{item.endTime}}</text>
</view>
<view wx:if="{{item.duration}}">
<image src="/images/img_11.png"></image>处理耗时:<text>{{item.duration}}</text>
</view>
<view wx:if="{{item.message}}">
<image src="/images/s_7.png"></image>处理意见:<text>{{item.message}}</text>
</view>
</view>
</view>
</view>
</view>
</van-collapse-item>
</van-collapse>
</view>
<view class="inspect_overview_list_max"> <view class="inspect_overview_list_max">
<view class="inspect_overview_list"> <view class="inspect_overview_list">
<van-row> <van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col> <van-col span="6"><text class="color_purple">隐患图片</text></van-col>
@ -136,10 +191,9 @@
<view>整改复检意见</view> <view>整改复检意见</view>
</view> </view>
<view class="inspect_overview_list_max"> <view class="inspect_overview_list_max">
<view class="inspect_info_list" > <view class="inspect_info_list">
<view class="inspect_info_content"> <view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写整改复检意见" <textarea class="add_textarea" placeholder="请填写整改复检意见" placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200" />
placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
</view> </view>
</view> </view>
</view> </view>
@ -150,9 +204,9 @@
</view> </view>
</view> </view>
<van-overlay show="{{loadShow}}"> <van-overlay show="{{loadShow}}">
<view class="gif"> <view class="gif">
<image src="/../images/loding2.gif"></image> <image src="/../images/loding2.gif"></image>
<view>数据加载中!请稍后...</view> <view>数据加载中!请稍后...</view>
</view> </view>
</van-overlay> </van-overlay>

View File

@ -22,6 +22,8 @@ Page({
], ],
lordSent:"", lordSent:"",
lordSentUser:"", lordSentUser:"",
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title_2 module_title_flex"> <view class="module_title_2 module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>
@ -47,7 +48,7 @@
</view> </view>
<view class="problem_submit_to"> <view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view> <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view> <view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">保存草稿</view>
</view> </view>
</view> </view>

View File

@ -6,31 +6,45 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
loadShow:false, loadShow: false,
auditInfo:{}, auditInfo: {},
loginName:"", loginName: "",
showDel:false, showDel: false,
imageList:[], imageList: [],
minImageList:[], minImageList: [],
auditImageList:[], auditImageList: [],
auditMinImageList:[], auditMinImageList: [],
request:app.globalData.reqUrl request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交隐患'
}, {
text: '隐患整改'
}, {
text: '隐患复检'
}, {
text: '结束'
}],
active: 100
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -43,36 +57,49 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active;
if (res.data.checkState == "0") {
state = 2;
} else if (res.data.checkState == "1") {
state = 3;
} else if (res.data.checkState == "3") {
state = 1;
}
that.setData({
active: state
})
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.smarkUrl){ if (res.data.smarkUrl) {
res.data.smarkUrl.split(',').forEach(element => { res.data.smarkUrl.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
infoData:res.data, infoData: res.data,
imageList:urls, imageList: urls,
minImageList:minUrls, minImageList: minUrls,
loadShow:false loadShow: false
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){ if (res.data.checkState != 4 && res.data.createUser == that.data.loginName) {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -80,37 +107,39 @@ Page({
}) })
}, },
getAuditinfo(){ getAuditinfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200 && res.data){ if (res.code == 200 && res.data) {
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.fileUrls){ if (res.data.fileUrls) {
res.data.fileUrls.split(',').forEach(element => { res.data.fileUrls.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
auditInfo:res.data, auditInfo: res.data,
auditImageList:urls, auditImageList: urls,
auditMinImageList:minUrls auditMinImageList: minUrls
}) })
} }
} }
}) })
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -126,18 +155,20 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeQuality', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeQuality',
header: { header: {
"Username": this.data.loginName, "Username": this.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功!") app.toast("删除成功!")
wx.redirectTo({ wx.redirectTo({
url: `../list/index`, url: `../list/index`,
@ -147,8 +178,8 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.imageList[e.currentTarget.dataset.index]
@ -156,8 +187,8 @@ Page({
}, },
//展示图片 //展示图片
showAuditinfoImg:function(e){ showAuditinfoImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.auditImageList, urls: that.data.auditImageList,
current: that.data.auditImageList[e.currentTarget.dataset.index] current: that.data.auditImageList[e.currentTarget.dataset.index]

View File

@ -1,5 +1,9 @@
{ {
"usingComponents": {}, "usingComponents": {
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom", "navigationStyle":"custom",
"navigationBarTitleText": "质量隐患详情" "navigationBarTitleText": "质量隐患详情"
} }

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -64,6 +64,76 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕,从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时,重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',

View File

@ -57,19 +57,19 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="../https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="../https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>
<view class="inspect_add_to_darft" bindtap="skipAddDarft"> <view class="inspect_add_to_darft" bindtap="skipAddDarft">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/../images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>草稿</view> <view>草稿</view>
</view> </view>
</view> </view>
<view class="inspect_add_to" bindtap="skipAdd"> <view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/../images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view> </view>

View File

@ -17,7 +17,9 @@ Page({
status:"0", status:"0",
imageList:[], imageList:[],
minImageList:[], minImageList:[],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 2
}, },
/** /**

View File

@ -1,6 +1,9 @@
{ {
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -34,7 +34,9 @@ Page({
selectIndex:"", selectIndex:"",
problemType:"1", problemType:"1",
showHis:false, showHis:false,
problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}] problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}],
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 0
}, },
/** /**
@ -100,6 +102,19 @@ Page({
success(res){ success(res){
res = res.data res = res.data
if(res.code == 200){ if(res.code == 200){
let findMy = false;
res.data.forEach(it => {
if (it.userinfoList.length > 0) {
it.userinfoList.forEach(u => {
if (that.data.loginName == u.phonenumber) {
findMy = true;
}
});
}
});
if(!findMy){
res.data[0].userinfoList.push({state:false,nickName:that.data.userName,jobTypeName:'集团公司',phonenumber:that.data.loginName});
}
that.setData({ that.setData({
rectifierData2:res.data, rectifierData2:res.data,
}); });

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info"> <view class="inspect_info">
<view class="module_title module_title_flex"> <view class="module_title module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>

View File

@ -18,7 +18,9 @@ Page({
minImageList:[], minImageList:[],
auditImageList:[], auditImageList:[],
auditMinImageList:[], auditMinImageList:[],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 3
}, },
/** /**

View File

@ -1,6 +1,9 @@
{ {
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -22,6 +22,8 @@ Page({
], ],
lordSent:"", lordSent:"",
lordSentUser:"", lordSentUser:"",
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 0
}, },
/** /**

View File

@ -1,5 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"van-steps": "@vant/weapp/steps/index",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" />
<view class="inspect_info "> <view class="inspect_info ">
<view class="module_title_2 module_title_flex"> <view class="module_title_2 module_title_flex">
<view>{{projectName}}</view> <view>{{projectName}}</view>
@ -47,7 +48,7 @@
</view> </view>
<view class="problem_submit_to"> <view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view> <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view> <view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">保存草稿</view>
</view> </view>
</view> </view>

View File

@ -15,7 +15,9 @@ Page({
minImageList:[], minImageList:[],
auditImageList:[], auditImageList:[],
auditMinImageList:[], auditMinImageList:[],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 100
}, },
/** /**
@ -54,6 +56,17 @@ Page({
success(res){ success(res){
res = res.data res = res.data
if(res.code == 200){ if(res.code == 200){
let state = that.data.active;
if (res.data.checkState == "0") {
state = 2;
} else if (res.data.checkState == "1") {
state = 3;
} else if (res.data.checkState == "3") {
state = 1;
}
that.setData({
active: state
})
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.smarkUrl){ if(res.data.smarkUrl){

View File

@ -1,5 +1,9 @@
{ {
"usingComponents": {}, "usingComponents": {
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item"
},
"navigationStyle":"custom", "navigationStyle":"custom",
"navigationBarTitleText": "安全隐患详情" "navigationBarTitleText": "安全隐患详情"
} }

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -57,6 +57,76 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕,从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时,重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',

View File

@ -56,19 +56,19 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="../https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="../https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>
<view class="inspect_add_to_darft" bindtap="skipAddDarft"> <view class="inspect_add_to_darft" bindtap="skipAddDarft">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/../images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>草稿</view> <view>草稿</view>
</view> </view>
</view> </view>
<view class="inspect_add_to" bindtap="skipAdd"> <view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/../images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view> </view>

View File

@ -17,7 +17,9 @@ Page({
status:"0", status:"0",
imageList:[], imageList:[],
minImageList:[], minImageList:[],
request:app.globalData.reqUrl request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 2
}, },
/** /**

View File

@ -1,6 +1,9 @@
{ {
"usingComponents": { "usingComponents": {
"van-popup": "@vant/weapp/popup/index", "van-popup": "@vant/weapp/popup/index",
"van-collapse": "@vant/weapp/collapse",
"van-steps": "@vant/weapp/steps/index",
"van-collapse-item": "@vant/weapp/collapse-item",
"van-overlay": "@vant/weapp/overlay/index" "van-overlay": "@vant/weapp/overlay/index"
}, },
"navigationStyle":"custom", "navigationStyle":"custom",

View File

@ -12,6 +12,7 @@
</view> </view>
</view> </view>
<view class="max_content"> <view class="max_content">
<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
<view class="inspect_overview_max"> <view class="inspect_overview_max">
<view class="inspect_overview"> <view class="inspect_overview">
<view class="module_title module_title_padding"> <view class="module_title module_title_padding">

View File

@ -39,7 +39,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -40,7 +40,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -44,7 +44,8 @@
} }
.van-cell.van-cell--clickable{ .van-cell.van-cell--clickable{
background-color: #2b345b; background-color: #2b345b;
margin-top: 30rpx; margin-top: 5rpx;
margin-bottom: 5rpx;
color: #fff; color: #fff;
border-radius: 15rpx; border-radius: 15rpx;

View File

@ -43,7 +43,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

View File

@ -41,7 +41,7 @@
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>

Some files were not shown because too many files have changed in this diff Show More