guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

所有节点： 

主要安全措施页面样式修改
接收交底人，安全交底人选多个时逻辑修改
动火申请页面动火操作人图片不能删除逻辑修改
动火申请暂存页面图片不能删除，不能上传逻辑修改
接收交底人，完工审核添加多张签字图片逻辑修改
bug优化0603
WenShiJun 2024-06-19 17:21:42 +08:00
parent d4066b46fe
commit 09705fa5c4
19 changed files with 788 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
View File

@ -187,6 +187,11 @@
<!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea>--> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -260,15 +265,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -596,9 +601,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -682,7 +692,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -799,8 +810,22 @@
success: (res) => { success: (res) => {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
console.log(res.data.pd,'1111111111111111111111111')
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
} }
@ -815,6 +840,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

20
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
View File

@ -159,6 +159,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -243,15 +248,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -473,7 +478,8 @@ export default {
FIRE_COMPLETED: '0', FIRE_COMPLETED: '0',
SITE_CLEANED: '0', SITE_CLEANED: '0',
NO_REMAINING_EMBERS: '0', NO_REMAINING_EMBERS: '0',
OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
}, },
measuresList: [], measuresList: [],
gasList: [], gasList: [],
@ -595,6 +601,10 @@ export default {
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

217
pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
View File

@ -179,8 +179,8 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.confessList && pd.confessList.length > 0">
<view v-for="(item,index) in pd.confessList" > <view v-for="(item,index) in pd.confessList" v-if="item.APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
@ -193,16 +193,16 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" v-if="item.APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -322,9 +322,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
@ -500,7 +505,7 @@
onLoad(event){ onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID; this.pd.HOTWORK_ID = event.HOTWORK_ID;
if(this.pd.HOTWORK_ID){ if(this.pd.HOTWORK_ID){
this.msg="edit"; this.msg="edit";
this.getData(); this.getData();
}else { }else {
@ -515,7 +520,6 @@
this.getDept(); this.getDept();
this.getLimitSpace(); this.getLimitSpace();
loginSession(); loginSession();
}, },
methods: { methods: {
//跳转事件 //跳转事件
@ -544,6 +548,17 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
@ -557,6 +572,11 @@
_this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH; _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH;
_this.pd.ACCEPT_CONFESS_USER_NAME = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_NAME; _this.pd.ACCEPT_CONFESS_USER_NAME = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_NAME;
_this.pd.ACCEPT_CONFESS_USER_SIGNER_TIME = _this.pd.acceptConfessList[i].CREATE_TIME; _this.pd.ACCEPT_CONFESS_USER_SIGNER_TIME = _this.pd.acceptConfessList[i].CREATE_TIME;
// 将ACCEPT_CONFESS_USER_SIGNER_PATH转换为数组并赋值给imgList
// _this.imgList = _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';').map(path => ({
// filePath: _this.baseImgPath + path.trim()
// }));
break; break;
} }
} }
@ -589,9 +609,8 @@
current: 0 current: 0
}); });
}, },
goSubmit(){ goSubmit() {
var _this = this; var _this = this;
let required = true
if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) { if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -600,54 +619,128 @@
}); });
return; return;
} }
uni.showLoading({
title: '请稍候'
})
if (_this.imgList.length <= 0) { if (_this.imgList.length <= 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请签字', title: '请签字',
duration: 1500 duration: 1500
}); });
return; return;
} }
// var fileList = [];
// var signtime = []; uni.showLoading({
const formData={} title: '请稍候'
Object.keys(this.pd).map(key => { });
formData[key]=this.pd[key]
}) const formData = {};
// this.uploadImgFaults(fileList,signtime) Object.keys(this.pd).map(key => {
// formData.SIGNTIME = signtime.join(",") formData[key] = this.pd[key];
formData.CREATOR=loginUser.USER_ID });
formData.OPERATOR=loginUser.USER_ID formData.CREATOR = loginUser.USER_ID;
formData.ACTION_USER=loginUser.NAME formData.OPERATOR = loginUser.USER_ID;
formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.ACTION_USER = loginUser.NAME;
formData.USER_ID = loginUser.USER_ID formData.CORPINFO_ID = loginUser.CORPINFO_ID;
uni.uploadFile({ formData.USER_ID = loginUser.USER_ID;
url: basePath+'/app/hotwork/cfd/editAcceptconfess',
// files: fileList, const files = _this.imgList.map((img, index) => {
filePath: _this.imgList[0].filePath, return {
name: 'FFILE', name: 'FFILE',
formData: formData, uri: img.filePath
success: (res) => { };
uni.showToast({ });
icon:'none',
title: '保存成功', uni.uploadFile({
duration: 2000 url: basePath + '/app/hotwork/cfd/editAcceptconfess',
}); files: files,
_this.goback() formData: formData,
}, success: (uploadFileRes) => {
fail: (err) => { const responseData = JSON.parse(uploadFileRes.data);
uni.hideLoading(); if (responseData.result === 'success') {
uni.showModal({ uni.hideLoading();
content: err.errMsg, uni.showToast({
showCancel: false icon: 'none',
}); title: '保存成功',
} duration: 2000
}) });
}, _this.imgList = [];
_this.goback();
} else {
uni.hideLoading();
uni.showModal({
content: responseData.message,
showCancel: false
});
}
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
},
// goSubmit(){
// var _this = this;
// let required = true
// if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
// uni.showToast({
// icon: 'none',
// title: '未进行安全措施确认，不能签字',
// duration: 2000
// });
// return;
// }
// uni.showLoading({
// title: '请稍候'
// })
//
// if (_this.imgList.length <= 0) {
// uni.showToast({
// icon: 'none',
// title: '请签字',
// duration: 1500
// });
// return;
// }
// // var fileList = [];
// // var signtime = [];
// const formData={}
// Object.keys(this.pd).map(key => {
// formData[key]=this.pd[key]
// })
// // this.uploadImgFaults(fileList,signtime)
// // formData.SIGNTIME = signtime.join(",")
// formData.CREATOR=loginUser.USER_ID
// formData.OPERATOR=loginUser.USER_ID
// formData.ACTION_USER=loginUser.NAME
// formData.CORPINFO_ID = loginUser.CORPINFO_ID
// formData.USER_ID = loginUser.USER_ID
// uni.uploadFile({
// url: basePath+'/app/hotwork/cfd/editAcceptconfess',
// // files: fileList,
// filePath: _this.imgList[0].filePath,
// name: 'FFILE',
// formData: formData,
// success: (res) => {
// uni.showToast({
// icon:'none',
// title: '保存成功',
// duration: 2000
// });
// _this.goback()
// },
// fail: (err) => {
// uni.hideLoading();
// uni.showModal({
// content: err.errMsg,
// showCancel: false
// });
// }
// })
// },
// uploadImgFaults(fileList,signtime) { // uploadImgFaults(fileList,signtime) {
// this.imgList.map(item => { // this.imgList.map(item => {
// var img = {} // var img = {}

185
pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
View File

@ -117,9 +117,9 @@
<view class="cu-form-group" style="padding-top:20upx"> <view class="cu-form-group" style="padding-top:20upx">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage" <view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
:data-url="pd.dongHuoCaoZuoRenPic[index]"> :data-url="pd.dongHuoCaoZuoRenPic[index].FILEPATH">
<image :src="pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image> <image :src="pd.dongHuoCaoZuoRenPic[index].FILEPATH" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg1" :data-index="index" v-if="!forbidEdit"> <view class="cu-tag bg-red" @tap.stop="DelImg1(index)" :data-index="index" v-if="!forbidEdit">
<text class='cuIcon-close'></text> <text class='cuIcon-close'></text>
</view> </view>
</view> </view>
@ -838,7 +838,7 @@ export default {
WORK_LONGITUDE: '', WORK_LONGITUDE: '',
WORK_LATITUDE: '', WORK_LATITUDE: '',
ACCEPT_CONFESS_USER_ID: '', ACCEPT_CONFESS_USER_ID: '',
dongHuoCaoZuoRenPic: [] dongHuoCaoZuoRenPic: [],
},// 数据 },// 数据
measuresList: [], measuresList: [],
rules: [ rules: [
@ -992,6 +992,7 @@ export default {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
_this.pd.dongHuoCaoZuoRenPic = _this.pd.dongHuoCaoZuoRenPic || [];
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
@ -1012,7 +1013,10 @@ export default {
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {
_this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH) _this.pd.dongHuoCaoZuoRenPic.push({
...dongHuoCaoZuoRenPic[i],
FILEPATH:baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH,
})
} }
} }
if (_this.pd.APPLY_STATUS <= 0) { if (_this.pd.APPLY_STATUS <= 0) {
@ -1069,21 +1073,21 @@ export default {
}, },
goSubmit(STATUS) { goSubmit(STATUS) {
var _this = this; var _this = this;
let required = true let required = true;
uni.showLoading({ uni.showLoading({
title: '请稍候' title: '请稍候'
}) });
if (STATUS === '1') { if (STATUS === '1') {
this.rules.map(({name, message}) => { this.rules.map(({ name, message }) => {
if (!this.pd[name]) { if (!this.pd[name]) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: message, title: message,
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
}) });
if (this.pd.WORK_LEVEL != '二级') { if (this.pd.WORK_LEVEL != '二级') {
if (!this.pd.AUDIT_USER_ID) { if (!this.pd.AUDIT_USER_ID) {
uni.showToast({ uni.showToast({
@ -1091,7 +1095,7 @@ export default {
title: '请选择安全管理部门负责人', title: '请选择安全管理部门负责人',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
if (this.pd.WORK_LEVEL != '二级' && this.pd.WORK_LEVEL != '一级') { if (this.pd.WORK_LEVEL != '二级' && this.pd.WORK_LEVEL != '一级') {
@ -1101,7 +1105,7 @@ export default {
title: '请选择动火审批负责人', title: '请选择动火审批负责人',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
if (this.pd.WORK_LEVEL == '特级' || this.pd.WORK_LEVEL == '一级') { if (this.pd.WORK_LEVEL == '特级' || this.pd.WORK_LEVEL == '一级') {
@ -1111,7 +1115,7 @@ export default {
title: '动火级别为特级或一级时，动火作业开始时间与结束时间应不超过8小时，请重新选择', title: '动火级别为特级或一级时，动火作业开始时间与结束时间应不超过8小时，请重新选择',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() <= 0) { if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() <= 0) {
@ -1120,7 +1124,7 @@ export default {
title: '作业开始时间不能晚于或等于结束时间，请重新选择', title: '作业开始时间不能晚于或等于结束时间，请重新选择',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
if (this.pd.WORK_LEVEL == '二级') { if (this.pd.WORK_LEVEL == '二级') {
if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() >= 259200000) { if (new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() >= 259200000) {
@ -1129,7 +1133,7 @@ export default {
title: '动火级别为二级时，动火作业开始时间与结束时间应不超过72小时，请重新选择', title: '动火级别为二级时，动火作业开始时间与结束时间应不超过72小时，请重新选择',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
for (let i = 0; i < this.confessList.length; i++) { for (let i = 0; i < this.confessList.length; i++) {
@ -1139,7 +1143,7 @@ export default {
title: '请选择安全交底人', title: '请选择安全交底人',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
for (let i = 0; i < this.acceptconfessList.length; i++) { for (let i = 0; i < this.acceptconfessList.length; i++) {
@ -1149,7 +1153,7 @@ export default {
title: '请选择接受交底人', title: '请选择接受交底人',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
} }
if (this.pd.dongHuoCaoZuoRenPic.length <= 0) { if (this.pd.dongHuoCaoZuoRenPic.length <= 0) {
@ -1158,36 +1162,35 @@ export default {
title: '请上传动火操作人图片', title: '请上传动火操作人图片',
duration: 1500 duration: 1500
}); });
required = false required = false;
} }
if (!required) { if (!required) {
return return;
} }
// 清空非必要信息 // 清空非必要信息
for (let i = 0; i < this.confessList.length; i++) { for (let i = 0; i < this.confessList.length; i++) {
this.confessList[i].confessUserList = [] this.confessList[i].confessUserList = [];
} }
for (let i = 0; i < this.acceptconfessList.length; i++) { for (let i = 0; i < this.acceptconfessList.length; i++) {
this.acceptconfessList[i].acceptconfessUserList = [] this.acceptconfessList[i].acceptconfessUserList = [];
} }
} }
const formData = {} const formData = {};
Object.keys(this.pd).map(key => { Object.keys(this.pd).map(key => {
formData[key] = this.pd[key] formData[key] = this.pd[key];
}) });
formData.CORPINFO_ID = corpinfoId formData.CORPINFO_ID = corpinfoId;
formData.CREATOR = loginUser.USER_ID formData.CREATOR = loginUser.USER_ID;
formData.OPERATOR = loginUser.USER_ID formData.OPERATOR = loginUser.USER_ID;
formData.ACTION_USER = loginUser.NAME formData.ACTION_USER = loginUser.NAME;
formData.APPLY_STATUS = STATUS formData.APPLY_STATUS = STATUS;
formData.WORK_LONGITUDE = this.pd.WORK_LONGITUDE formData.WORK_LONGITUDE = this.pd.WORK_LONGITUDE;
formData.WORK_LATITUDE = this.pd.WORK_LATITUDE formData.WORK_LATITUDE = this.pd.WORK_LATITUDE;
formData.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID;
formData.USER_ID = loginUser.USER_ID formData.confessList = JSON.stringify(this.confessList);
formData.confessList = JSON.stringify(this.confessList) formData.acceptconfessList = JSON.stringify(this.acceptconfessList);
formData.acceptconfessList = JSON.stringify(this.acceptconfessList) this.buttonloading = true;
this.buttonloading = true
uni.request({ uni.request({
url: basePath + "/app/hotwork/cfd/" + _this.msg, url: basePath + "/app/hotwork/cfd/" + _this.msg,
method: 'POST', method: 'POST',
@ -1203,9 +1206,12 @@ export default {
success: (res) => { success: (res) => {
if (res.data.result == 'success') { if (res.data.result == 'success') {
for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) { for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) {
const filePath = this.pd.dongHuoCaoZuoRenPic[i].IMGFILES_ID
? this.pd.dongHuoCaoZuoRenPic[i].FILEPATH
: this.pd.dongHuoCaoZuoRenPic[i];
uni.uploadFile({ uni.uploadFile({
url: basePath + "/app/hotwork/cfd/uploadImg", url: basePath + "/app/hotwork/cfd/uploadImg",
filePath: this.pd.dongHuoCaoZuoRenPic[i], filePath: filePath,
name: 'FFILE', name: 'FFILE',
formData: { formData: {
HOTWORK_ID: res.data.HOTWORK_ID HOTWORK_ID: res.data.HOTWORK_ID
@ -1217,8 +1223,8 @@ export default {
title: '提交成功', title: '提交成功',
duration: 1500 duration: 1500
}); });
_this.goback() _this.goback();
this.buttonloading = false this.buttonloading = false;
} }
}, },
fail: (err) => { fail: (err) => {
@ -1228,15 +1234,15 @@ export default {
showCancel: false showCancel: false
}); });
} }
}) });
} }
}else{ } else {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
duration: 1500 duration: 1500
}); });
this.buttonloading = false this.buttonloading = false;
} }
}, },
fail: (err) => { fail: (err) => {
@ -1246,7 +1252,7 @@ export default {
showCancel: false showCancel: false
}); });
} }
}) });
}, },
// 获取动火列表 // 获取动火列表
getLimitSpace() { getLimitSpace() {
@ -1889,25 +1895,36 @@ export default {
ChooseImage() { ChooseImage() {
var _this = this; var _this = this;
uni.chooseImage({ uni.chooseImage({
count: 4, //默认9 count: 4, // 最大可选数量
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图
sourceType: ['camera', 'album'], //从相册选择 sourceType: ['camera', 'album'], // 从相册或相机选择
success: (res) => { success: (res) => {
if (this.pd.dongHuoCaoZuoRenPic.length !== 0) { const tempFilePaths = res.tempFilePaths;
this.pd.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic.concat(res.tempFilePaths) // 合并选择的图片与已有的图片
} else { _this.pd.dongHuoCaoZuoRenPic = _this.pd.dongHuoCaoZuoRenPic.concat(tempFilePaths);
this.pd.dongHuoCaoZuoRenPic = res.tempFilePaths console.log("选择图片路径：", tempFilePaths)
} console.log("3333333333333333：", _this.pd.dongHuoCaoZuoRenPic)
// 触发视图更新
_this.$forceUpdate();
},
fail: (err) => {
console.error("图片选择失败：", err);
} }
}); });
}, },
ViewImage(e) { ViewImage(e) {
const urls = []
console.log("图片路径：", this.pd.dongHuoCaoZuoRenPic)
for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) {
urls.push(this.pd.dongHuoCaoZuoRenPic[i].FILEPATH)
}
uni.previewImage({ uni.previewImage({
urls: this.pd.dongHuoCaoZuoRenPic, urls,
current: e.currentTarget.dataset.url current: e.currentTarget.dataset.url
}); });
}, },
DelImg1(e) { DelImg1(index) {
var _this = this;
uni.showModal({ uni.showModal({
title: '双控平台', title: '双控平台',
content: '确定要删除这张图片吗？', content: '确定要删除这张图片吗？',
@ -1916,10 +1933,66 @@ export default {
confirmText: '确定', confirmText: '确定',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.form.imgList.splice(e.currentTarget.dataset.index, 1) if (_this.pd.dongHuoCaoZuoRenPic && _this.pd.dongHuoCaoZuoRenPic[index]) {
// 获取需要删除的图片信息
let imgInfo = _this.pd.dongHuoCaoZuoRenPic[index];
// 如果图片有IMGFILES_ID，说明是已经上传到服务器的图片，需要调用删除接口
if (imgInfo.IMGFILES_ID) {
uni.showLoading({
title: '处理中'
});
uni.request({
url: basePath + '/app/hotwork/cfd/delImg',
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
IMGFILES_ID: imgInfo.IMGFILES_ID,
FILEPATH: imgInfo.FILEPATH
},
success: (res) => {
uni.hideLoading();
if (res.data.result === 'success') {
uni.showToast({
icon: 'none',
title: '删除成功',
duration: 1500
});
_this.pd.dongHuoCaoZuoRenPic.splice(index, 1);
_this.$forceUpdate(); // 强制视图更新
} else {
uni.showToast({
icon: 'none',
title: res.data.message,
duration: 2000
});
}
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
} else {
// 如果图片没有IMGFILES_ID，说明是本地图片，直接删除
_this.pd.dongHuoCaoZuoRenPic.splice(index, 1);
uni.showToast({
icon: 'none',
title: '删除成功',
duration: 1500
});
_this.$forceUpdate(); // 强制视图更新
}
}
} }
} }
}) });
}, },
// 2024-01-31 created by liu jun description: 安全交底人多选 // 2024-01-31 created by liu jun description: 安全交底人多选
addConfessUser(){ addConfessUser(){

60
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
View File

@ -181,11 +181,16 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea>-->
</view> <!-- </view>-->
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -222,6 +227,11 @@
<!-- 审批人：</text>--> <!-- 审批人：</text>-->
<!-- <text>{{ pd.APPROVE_USER_MEASURES}}</text>--> <!-- <text>{{ pd.APPROVE_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
动火前验票：</text> 动火前验票：</text>
@ -261,15 +271,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -597,9 +607,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -683,7 +698,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -801,6 +817,21 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
} }
@ -815,6 +846,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

34
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
View File

@ -167,6 +167,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -250,15 +255,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -292,17 +297,18 @@
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
<view> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-title">项目主管部门负责意见</view>
<view class="cu-form-title">项目主管部门负责意见</view> <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">项目主管部门负责人</view> <view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
</view>
</view> </view>
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view> <view class="cu-form-title">属地监管单位意见</view>
@ -418,7 +424,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -524,6 +531,11 @@
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

60
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
View File

@ -181,11 +181,16 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.LEADER_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.LEADER_USER_MEASURES"></textarea>-->
</view> <!-- </view>-->
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -202,6 +207,11 @@
属地监管单位：</text> 属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
@ -255,15 +265,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -591,9 +601,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -677,7 +692,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -795,6 +811,21 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
} }
@ -809,6 +840,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

33
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
View File

@ -190,6 +190,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -274,15 +279,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -341,17 +346,18 @@
<!-- <view class="title">监护人</view>--> <!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}--> <!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>--> <!-- </view>-->
<view> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-title">项目主管部门负责意见</view>
<view class="cu-form-title">项目主管部门负责意见</view> <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">项目主管部门负责人</view> <view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
</view>
</view> </view>
<view> <view>
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
@ -456,7 +462,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -561,6 +568,10 @@
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

39
pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
View File

@ -222,8 +222,8 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.confessList && pd.confessList.length > 0">
<view v-for="(item,index) in pd.confessList" > <view v-for="(item,index) in pd.confessList" v-if="item.APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
@ -236,16 +236,16 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" v-if="item.APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -388,9 +388,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
@ -608,8 +613,19 @@
success: (res) => { success: (res) => {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
console.log(res.data.pd,'11111111111111') console.log(res.data.pd,'111111111111111111111111')
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
@ -617,6 +633,7 @@
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.files = res.data.imgList; _this.files = res.data.imgList;
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.confessList && _this.pd.confessList.length > 0) { if (_this.pd.confessList && _this.pd.confessList.length > 0) {
for (let i = 0; i < _this.pd.confessList.length; i++) { for (let i = 0; i < _this.pd.confessList.length; i++) {
if (_this.pd.confessList[i].APPROVAL_SIGNATURE) { if (_this.pd.confessList[i].APPROVAL_SIGNATURE) {

65
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
View File

@ -181,17 +181,22 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.CONFIRM_OTHER_CONTENT"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.CONFIRM_OTHER_CONTENT"></textarea>-->
</view> <!-- </view>-->
</view>
<!-- <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">-->
<!-- <text class="title">-->
<!-- 作业负责人：</text>-->
<!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group"> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
项目责任负责人：</text> 项目责任负责人：</text>
@ -250,15 +255,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -582,9 +587,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -668,7 +678,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -785,6 +796,21 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
} }
@ -799,6 +825,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

21
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
View File

@ -162,6 +162,11 @@
<!-- 作业负责人：</text>--> <!-- 作业负责人：</text>-->
<!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>--> <!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group"> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
项目责任负责人：</text> 项目责任负责人：</text>
@ -240,15 +245,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -353,7 +358,9 @@
monitorindex:-1, monitorindex:-1,
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{},// 数据 pd:{
safetyApprovalContent: '',
},// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
{name:'CHECK_NO',message:'请输入编号'}, {name:'CHECK_NO',message:'请输入编号'},
@ -439,6 +446,10 @@
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

31
pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
View File

@ -213,15 +213,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -341,9 +341,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
@ -549,6 +554,17 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0] "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
@ -556,6 +572,7 @@
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.files = res.data.imgList; _this.files = res.data.imgList;
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

60
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
View File

@ -181,11 +181,16 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.GUARDIAN_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.GUARDIAN_USER_MEASURES"></textarea>-->
</view> <!-- </view>-->
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -202,6 +207,11 @@
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
@ -250,15 +260,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -586,9 +596,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -672,7 +687,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -790,6 +806,21 @@
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
@ -801,6 +832,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

20
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
View File

@ -161,6 +161,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -255,15 +260,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -397,7 +402,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -498,6 +504,10 @@
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

39
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
View File

@ -181,11 +181,16 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea>-->
</view> <!-- </view>-->
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -216,6 +221,11 @@
<text class="title"> <text class="title">
动火审批人：</text> 动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -250,15 +260,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -672,7 +682,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -802,8 +813,16 @@
"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4], "APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5] "MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
}) })
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

34
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
View File

@ -166,6 +166,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -250,15 +255,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -293,18 +298,18 @@
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE"> <view class="cu-form-textarea" style="border: none;">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view class="cu-form-title">项目主管部门负责意见</view>
<view class="cu-form-textarea" style="border: none;"> <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">项目主管部门负责人</view> <view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
</view>
</view> </view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH"> <view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
@ -437,7 +442,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -548,6 +554,10 @@
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []

29
pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
View File

@ -215,15 +215,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -355,8 +355,13 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
<!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -584,6 +589,17 @@ export default {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
if (res.data.measuresList && res.data.measuresList.length > 0) { if (res.data.measuresList && res.data.measuresList.length > 0) {
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
}else { }else {
@ -596,6 +612,7 @@ export default {
// _this.updateForbidEdit(); // _this.updateForbidEdit();
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
console.log(dongHuoCaoZuoRenPic,'11111111111111111111111111111')
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {

65
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
View File

@ -181,22 +181,27 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.BELONGING_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.BELONGING_USER_MEASURES"></textarea>-->
</view> <!-- </view>-->
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<!-- <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">--> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<!-- <text class="title">--> <text class="title">
<!-- 项目责任负责人：</text>--> 项目责任负责人：</text>
<!-- <text>{{ pd.BELONGING_USER_MEASURES}}</text>--> <text>{{ pd.BELONGING_USER_MEASURES}}</text>
<!-- </view>--> </view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
@ -255,15 +260,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -591,9 +596,14 @@
<view class="title">验收部门负责人</view> <view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image> <!-- <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="ViewShowImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
</view> <!-- </view>-->
<view class="wui-form-list" v-if="pd.ACCEPT_USER_SIGNER_PATH_ARRAY && pd.ACCEPT_USER_SIGNER_PATH_ARRAY.length > 0">
<view v-for="(path, index) in pd.ACCEPT_USER_SIGNER_PATH_ARRAY" :key="index" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + path" mode="aspectFill" @click="ViewShowImage(baseImgPath + path)" style="height: 100%;"></image>
</view>
</view>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group"> <view class="cu-form-group">
@ -677,7 +687,8 @@
acceptUserList:[], acceptUserList:[],
acceptindex:-1, acceptindex:-1,
pd:{ pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList:[], measuresList:[],
rules:[ rules:[
@ -798,6 +809,21 @@
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = _this.pd.ACCEPT_USER_SIGNER_PATH.split(',').map(item => item.trim());
} else {
_this.pd.ACCEPT_USER_SIGNER_PATH_ARRAY = [];
}
if (_this.pd.ACCEPT_USER_SIGNER_TIME) {
_this.pd.ACCEPT_USER_SIGNER_TIME = _this.pd.ACCEPT_USER_SIGNER_TIME.split(',')[0];
}
_this.pd = Object.assign(_this.pd, _this.pd = Object.assign(_this.pd,
{ {
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
@ -809,6 +835,9 @@
}) })
_this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.measuresList = res.data.measuresList _this.measuresList = res.data.measuresList
if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
_this.pd.APPROVAL_CONTENT = _this.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
if(_this.pd.APPLY_STATUS < 1){ if(_this.pd.APPLY_STATUS < 1){
_this.forbidEdit = false; _this.forbidEdit = false;
} }

20
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
View File

@ -163,6 +163,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业负责人：</text> 作业负责人：</text>
@ -255,15 +260,15 @@
</view> </view>
</view> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length"> <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" > <view v-for="(item, index) in pd.acceptConfessList" :key="index">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> <view v-for="(path, pathIndex) in item.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';')" :key="pathIndex" style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" <image :src="baseImgPath + path.trim()" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> @click="ViewShowImage(baseImgPath + path.trim())" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -389,7 +394,8 @@ export default {
acceptUserList: [], acceptUserList: [],
acceptindex: -1, acceptindex: -1,
pd: { pd: {
OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;' OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据 },// 数据
measuresList: [], measuresList: [],
rules: [ rules: [
@ -487,6 +493,10 @@ export default {
_this.forbidEdit = false; _this.forbidEdit = false;
} }
if (res.data.pd.safetyList && res.data.pd.safetyList.length > 0) {
_this.pd.safetyApprovalContent = res.data.pd.safetyList.map(item => item.APPROVAL_CONTENT).join(', ');
}
let dongHuoCaoZuoRenPic = res.data.imgList2 let dongHuoCaoZuoRenPic = res.data.imgList2
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = [] _this.pd.dongHuoCaoZuoRenPic = []