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

动火申请页面动火操作人图片无法删除修复 

缓存页面冻货操作人图片不反显，不能删除，不能上传修改
所有节点页面安全确认人标题修改
项目主管部门打回时报错修复
页面所有节点打回逻辑修改，新增保存打回签字图片和意见逻辑，打回签字图片和意见修改为必填项，新增打回二次确认逻辑
bug优化0603
WenShiJun 2024-06-21 17:37:43 +08:00
parent 7b6d4d1085
commit 8e7367cdd3
27 changed files with 889 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
@ -843,9 +843,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -161,7 +161,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
@ -418,9 +418,18 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-8')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-8')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'8')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-8')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -444,6 +453,7 @@ export default {
},
data() {
return {
showRejectionConfirm: false,
baseImgPath: baseImgPath,
buttonloading: false,
isUps: false,
@ -629,6 +639,17 @@ export default {
current: 0
});
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
async goSubmit(STATUS) {
var _this = this;
let required = true;
@ -743,15 +764,15 @@ export default {
}
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.request({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: formData,
uni.uploadFile({
url: basePath + "/app/hotwork/cfd/editAcceptStatus",
files: fileList,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',

4
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -135,12 +135,12 @@
</uni-table>
</view>
<view>
<view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<!-- <view class="cu-form-textarea">-->
<!-- <view class="cu-form-title">其他安全措施：</view>-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>-->
<!-- </view>-->
<!-- </view>-->
<!-- <view v-if="pd.safetyList" class="ty-group">-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <text class="title">-->
@ -148,11 +148,46 @@
<!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</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">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</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">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</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">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
@ -446,7 +481,8 @@
acceptUserList:[],
acceptindex:-1,
pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;'
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据
measuresList:[],
rules:[
@ -556,14 +592,23 @@
_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,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
})
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
})
_this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.files = res.data.imgList;
_this.measuresList = res.data.measuresList
@ -629,7 +674,7 @@
});
const formData = {};
Object.keys(this.pd).map(key => {
Object.keys(this.pd).forEach(key => {
formData[key] = this.pd[key];
});
formData.CREATOR = loginUser.USER_ID;
@ -638,20 +683,10 @@
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
const files = _this.imgList.map((img, index) => {
return {
name: 'FFILE',
uri: img.filePath
};
});
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editAcceptconfess',
files: files,
formData: formData,
success: (uploadFileRes) => {
const responseData = JSON.parse(uploadFileRes.data);
if (responseData.result === 'success') {
let uploadFailed = false;
const uploadNext = (index) => {
if (index >= _this.imgList.length || uploadFailed) {
if (!uploadFailed) {
uni.hideLoading();
uni.showToast({
icon: 'none',
@ -660,23 +695,114 @@
});
_this.imgList = [];
_this.goback();
} else {
}
return;
}
const img = _this.imgList[index];
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editAcceptconfess',
filePath: img.filePath,
name: 'FFILE',
formData: formData,
success: (uploadFileRes) => {
const responseData = JSON.parse(uploadFileRes.data);
if (responseData.result === 'success') {
uploadNext(index + 1); // 上传下一张图片
} else {
uploadFailed = true;
uni.hideLoading();
uni.showModal({
content: responseData.message,
showCancel: false
});
}
},
fail: (err) => {
uploadFailed = true;
uni.hideLoading();
uni.showModal({
content: responseData.message,
content: err.errMsg,
showCancel: false
});
}
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
});
};
uploadNext(0); // 开始上传第一张图片
},
// goSubmit() {
// var _this = this;
// if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
// uni.showToast({
// icon: 'none',
// title: '未进行安全措施确认，不能签字',
// duration: 2000
// });
// return;
// }
//
// if (_this.imgList.length <= 0) {
// uni.showToast({
// icon: 'none',
// title: '请签字',
// duration: 1500
// });
// return;
// }
//
// uni.showLoading({
// title: '请稍候'
// });
//
// const formData = {};
// Object.keys(this.pd).map(key => {
// formData[key] = this.pd[key];
// });
// 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;
//
// const files = _this.imgList.map((img, index) => {
// return {
// name: 'FFILE',
// uri: img.filePath
// };
// });
// uni.uploadFile({
// url: basePath + '/app/hotwork/cfd/editAcceptconfess',
// files: files,
// formData: formData,
// success: (uploadFileRes) => {
// const responseData = JSON.parse(uploadFileRes.data);
// if (responseData.result === 'success') {
// uni.hideLoading();
// uni.showToast({
// 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

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

@ -117,8 +117,8 @@
<view class="cu-form-group" style="padding-top:20upx">
<view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in pd.dongHuoCaoZuoRenPic" :key="index" @tap="ViewImage"
:data-url="pd.dongHuoCaoZuoRenPic[index].FILEPATH">
<image :src="pd.dongHuoCaoZuoRenPic[index].FILEPATH" mode="aspectFill"></image>
:data-url="pd.dongHuoCaoZuoRenPic[index].FILEPATH || pd.dongHuoCaoZuoRenPic[index]">
<image :src="pd.dongHuoCaoZuoRenPic[index].FILEPATH || pd.dongHuoCaoZuoRenPic[index]" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg1(index)" :data-index="index" v-if="!forbidEdit">
<text class='cuIcon-close'></text>
</view>
@ -1077,6 +1077,8 @@ export default {
uni.showLoading({
title: '请稍候'
});
// 提交操作时进行规则验证
if (STATUS === '1') {
this.rules.map(({ name, message }) => {
if (!this.pd[name]) {
@ -1165,16 +1167,19 @@ export default {
required = false;
}
if (!required) {
uni.hideLoading();
return;
}
// 清空非必要信息
for (let i = 0; i < this.confessList.length; i++) {
this.confessList[i].confessUserList = [];
}
for (let i = 0; i < this.acceptconfessList.length; i++) {
this.acceptconfessList[i].acceptconfessUserList = [];
}
}
// 清空非必要信息
for (let i = 0; i < this.confessList.length; i++) {
this.confessList[i].confessUserList = [];
}
for (let i = 0; i < this.acceptconfessList.length; i++) {
this.acceptconfessList[i].acceptconfessUserList = [];
}
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key];
@ -1191,6 +1196,7 @@ export default {
formData.confessList = JSON.stringify(this.confessList);
formData.acceptconfessList = JSON.stringify(this.acceptconfessList);
this.buttonloading = true;
uni.request({
url: basePath + "/app/hotwork/cfd/" + _this.msg,
method: 'POST',
@ -1205,6 +1211,19 @@ export default {
},
success: (res) => {
if (res.data.result == 'success') {
// 暂存操作直接跳转
if (STATUS === '0') {
uni.hideLoading();
uni.showToast({
title: '暂存成功',
duration: 1500
});
_this.goback();
this.buttonloading = false;
return;
}
// 上传图片的逻辑
for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) {
const filePath = this.pd.dongHuoCaoZuoRenPic[i].IMGFILES_ID
? this.pd.dongHuoCaoZuoRenPic[i].FILEPATH
@ -1902,8 +1921,7 @@ export default {
const tempFilePaths = res.tempFilePaths;
// 合并选择的图片与已有的图片
_this.pd.dongHuoCaoZuoRenPic = _this.pd.dongHuoCaoZuoRenPic.concat(tempFilePaths);
console.log("选择图片路径：", tempFilePaths)
console.log("3333333333333333：", _this.pd.dongHuoCaoZuoRenPic)
console.log(_this.pd.dongHuoCaoZuoRenPic,'1111111111111111111111')
// 触发视图更新
_this.$forceUpdate();
},

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -849,9 +849,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -169,7 +169,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -366,9 +366,18 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-6')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-6')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'6')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-6')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -392,6 +401,7 @@
},
data() {
return {
showRejectionConfirm: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -565,6 +575,17 @@
return true
return false
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS){
var _this = this;
let required = true
@ -618,15 +639,16 @@
}
})
}else{
formData.STATUS=STATUS
uni.request({
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: formData,
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon:'none',

4
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -843,9 +843,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -192,7 +192,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -405,9 +405,18 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-5')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-5')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'5')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-5')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -431,6 +440,7 @@
},
data() {
return {
showRejectionConfirm: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -601,6 +611,17 @@
return true
return false
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS){
var _this = this;
let required = true
@ -660,20 +681,16 @@
}
})
}else{
formData.STATUS=STATUS
this.buttonloading = true
uni.request({
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
...formData,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon:'none',

4
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -178,12 +178,12 @@
</uni-table>
</view>
<view>
<view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<!-- <view class="cu-form-textarea">-->
<!-- <view class="cu-form-title">其他安全措施：</view>-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>-->
<!-- </view>-->
<!-- </view>-->
<!-- <view v-if="pd.safetyList" class="ty-group">-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <text class="title">-->
@ -191,11 +191,51 @@
<!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">-->
<!-- 作业单位：</text>-->
<!-- <text>{{ pd.CONFIRM_USER_MEASURES}}</text>-->
<!-- </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">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</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">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</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">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
@ -511,7 +551,8 @@
acceptUserList:[],
acceptindex:-1,
pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;'
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据
measuresList:[],
rules:[
@ -622,14 +663,23 @@
_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,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
})
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
})
_this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.files = res.data.imgList;
_this.measuresList = res.data.measuresList
@ -645,7 +695,7 @@
if (_this.pd.confessList && _this.pd.confessList.length > 0) {
const currentUserId = getLoginUserId();
for (let i = 0; i < _this.pd.confessList.length; i++) {
if (_this.pd.confessList[i].CONFESS_USER_ID === currentUserId && _this.pd.confessList[i].CONFESS_USER_ID) {
if (_this.pd.confessList[i].CONFESS_USER_ID === currentUserId && _this.pd.confessList[i].APPROVAL_SIGNATURE) {
_this.isAlreadySigned = true; // 更新标记
break;
}

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -828,9 +828,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -164,7 +164,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
@ -301,9 +301,18 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-1.5')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-1.5')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1.5')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-1.5')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -327,6 +336,7 @@
},
data() {
return {
showRejectionConfirm: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -474,12 +484,23 @@
current: 0
});
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS) {
var _this = this;
let required = true
uni.showLoading({
title: '请稍候'
})
});
if (STATUS === '1.5') {
if (_this.imgList.length <= 0) {
uni.showToast({
@ -490,15 +511,17 @@
return;
}
}
const formData = {}
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key]
})
formData.CORPINFO_ID = corpinfoId
formData.CREATOR = loginUser.USER_ID
formData.OPERATOR = loginUser.USER_ID
formData.ACTION_USER = loginUser.NAME
formData.APPLY_STATUS = STATUS
formData[key] = this.pd[key];
});
formData.CORPINFO_ID = corpinfoId;
formData.CREATOR = loginUser.USER_ID;
formData.OPERATOR = loginUser.USER_ID;
formData.ACTION_USER = loginUser.NAME;
formData.APPLY_STATUS = STATUS;
if (STATUS === '1.5') {
uni.request({
url: basePath + '/app/hotwork/cfd/check',
@ -510,7 +533,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID
},
success: (res) => {
if ("success" === res.data.result) {
if (res.data.result === 'success') {
uni.hideLoading();
if (res.data.passFlag === '0') {
uni.showModal({
@ -520,15 +543,15 @@
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false
this.buttonloading = false;
}
})
});
} else {
formData.STATUS = STATUS
formData.measuresList = JSON.stringify(this.measuresList)
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
this.buttonloading = true
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
@ -540,8 +563,8 @@
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
@ -550,9 +573,9 @@
showCancel: false
});
}
})
});
}
} else if ("exception" === data.result) {
} else if (res.data.result === 'exception') {
uni.showToast({
title: '错误',
duration: 2000
@ -561,28 +584,24 @@
}
});
} else {
formData.STATUS = STATUS
_this.buttonloading = true
uni.request({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
...formData,
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
@ -591,9 +610,9 @@
showCancel: false
});
}
})
});
}
},
},
// 获取动火列表
getLimitSpace(){
var _this = this;

4
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue
View File

@ -73,8 +73,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -154,12 +154,12 @@
</uni-table>
</view>
<view>
<view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<!-- <view class="cu-form-textarea">-->
<!-- <view class="cu-form-title">其他安全措施：</view>-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>-->
<!-- </view>-->
<!-- </view>-->
<!-- <view v-if="pd.safetyList" class="ty-group">-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <text class="title">-->
@ -167,6 +167,46 @@
<!-- <text>{{ item.USER_NAME }}</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">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</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">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</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">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
@ -448,7 +488,8 @@
acceptUserList:[],
acceptindex:-1,
pd:{
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;'
OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;',
safetyApprovalContent: '',
},// 数据
measuresList:[],
rules:[
@ -556,14 +597,23 @@
_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,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0]
})
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
})
_this.pd.OTHER_PROTECTIVE_MEASURES = ''
_this.files = res.data.imgList;
_this.measuresList = res.data.measuresList

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -835,9 +835,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -163,7 +163,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -344,9 +344,18 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-4')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-4')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'4')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-4')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -370,6 +379,7 @@
},
data() {
return {
showRejectionConfirm: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -537,101 +547,135 @@
return true
return false
},
goSubmit(STATUS){
var _this = this;
let required = true
uni.showLoading({
title: '请稍候'
})
if(STATUS==4) {
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS) {
var _this = this;
uni.showLoading({
title: '请稍候'
});
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
}
const formData={}
Object.keys(this.pd).map(key => {
formData[key]=this.pd[key]
})
formData.CREATOR=loginUser.USER_ID
formData.OPERATOR=loginUser.USER_ID
formData.ACTION_USER=loginUser.NAME
formData.APPLY_STATUS=STATUS
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES;
if(STATUS==4){
formData.STATUS = STATUS
if (STATUS === '4') {
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
}
if (!_this.validStr(this.pd.AUDIT_USER_ID) && !_this.validStr(this.pd.APPROVE_USER_ID)) {
formData.APPLY_STATUS = 6
}else if(!_this.validStr(this.pd.AUDIT_USER_ID)){
formData.APPLY_STATUS = 5
}else {
formData.APPLY_STATUS = 4
}
this.buttonloading = true
uni.uploadFile({
url: basePath+'/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
}else{
formData.STATUS=STATUS
this.buttonloading = true
uni.request({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
...formData,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
}
},
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key];
});
formData.CORPINFO_ID = corpinfoId;
formData.CREATOR = loginUser.USER_ID;
formData.OPERATOR = loginUser.USER_ID;
formData.ACTION_USER = loginUser.NAME;
formData.APPLY_STATUS = STATUS;
if (STATUS === '4') {
uni.request({
url: basePath + '/app/hotwork/cfd/check',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID: _this.pd.HOTWORK_ID
},
success: (res) => {
if (res.data.result === 'success') {
uni.hideLoading();
if (res.data.passFlag === '0') {
uni.showModal({
title: '',
content: res.data.message,
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false;
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
}
} else if (res.data.result === 'exception') {
uni.showToast({
title: '错误',
duration: 2000
});
}
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
}
},
// 获取动火列表
getLimitSpace(){
var _this = this;

4
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -596,9 +596,14 @@
<view class="title">验收部门负责人</view>
{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
</view>
<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>
</view>
<!-- <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>-->
<!-- </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 style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
<view class="cu-form-group">
@ -818,14 +823,24 @@
_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.OTHER_PROTECTIVE_MEASURES = ''
_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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -168,7 +168,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -384,9 +384,18 @@
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-7')">打 回</button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-7')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'7')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-7')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -410,6 +419,7 @@
},
data() {
return {
showRejectionConfirm: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -582,6 +592,17 @@
current: 0
});
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS) {
var _this = this;
let required = true
@ -657,20 +678,16 @@
}
}else{
formData.STATUS=STATUS
this.buttonloading = true
uni.request({
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + "/app/hotwork/cfd/editStatus",
method: 'POST',
dataType: 'json',
header:{
'Content-type':'application/x-www-form-urlencoded'
},
data: {
...formData,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon:'none',

4
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

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

@ -157,17 +157,57 @@
<!-- </view>-->
<!-- </view>-->
<view class="cu-form-group">
<view class="title">其他安全措施：</view>
<view v-for="(item, index) in safetyList" :key="index">
<view v-if="!pd.SAFETY_SIGNATURE ">
<view v-if="!pd.SAFETY_SIGNATURE">
<view class="title">其他安全措施：</view>
<input v-if="!forbidEdit" name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" :disabled="forbidEdit" placeholder="请输入"></input>
</view>
<view v-else>
<input v-model="item.APPROVAL_CONTENT" :disabled="true" style="width: 100%; height: 40px;":readonly="true"></input>
<text class="title">安全检查项：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</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">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</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">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</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">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
<view>
<text class="title">气体分析单位负责人：</text>
@ -487,7 +527,9 @@ export default {
monitorindex:-1,
acceptUserList:[],
acceptindex:-1,
pd:{},// 数据
pd:{
safetyApprovalContent: '',
},// 数据
measuresList:[],
safetyList: [],
rules:[
@ -596,6 +638,10 @@ export default {
_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];
}
@ -605,6 +651,17 @@ export default {
}else {
_this.getSafetyCheck()
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
})
_this.measuresList = res.data.measuresList
_this.files = res.data.imgList;
_this.safetyList = res.data.pd.safetyList || [];
@ -612,7 +669,6 @@ export default {
// _this.updateForbidEdit();
let dongHuoCaoZuoRenPic = res.data.imgList2
console.log(dongHuoCaoZuoRenPic,'11111111111111111111111111111')
if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
_this.pd.dongHuoCaoZuoRenPic = []
for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) {

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

@ -189,7 +189,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -838,9 +838,9 @@
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){
_this.forbidEdit = false;
}
// if(_this.pd.APPLY_STATUS < 1){
// _this.forbidEdit = false;
// }
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

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

@ -165,7 +165,7 @@
<!-- </view>-->
<view v-if="pd.safetyApprovalContent" class="ty-group">
<text class="title">
安全检查项：</text>
安全措施确认人：</text>
<text>{{ pd.safetyApprovalContent }}</text>
</view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
@ -333,11 +333,28 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-4')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg"
@click="$noMultipleClicks(goSubmit,'2')">通 过
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-2')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">通 过
</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-2')">确定</button>
</view>
</view>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-2')">确定</button>
</view>
</view>
</view>
<view class="padding flex flex-direction">
</view>
<view class="cu-modal" :class="{'show':signModalShow}">
@ -362,6 +379,7 @@ export default {
},
data() {
return {
showRejectionConfirm: false,
baseImgPath: baseImgPath,
buttonloading: false,
isUps: false,
@ -526,13 +544,24 @@ export default {
return true
return false
},
confirmRejection() {
if (!this.imgList.length || !this.pd.CONTENT) {
uni.showToast({
icon: 'none',
title: '签字图片和意见不能为空',
duration: 1500
});
return;
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS) {
var _this = this;
let required = true
uni.showLoading({
title: '请稍候'
})
if (STATUS === 2) {
});
if (STATUS === '2') {
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
@ -542,13 +571,14 @@ export default {
return;
}
}
const formData = {}
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key]
})
if (STATUS > 0){
formData.APPROVAL_STATUS = "1"
}else {
} else {
formData.APPROVAL_STATUS = "-1"
}
formData.CREATOR = loginUser.USER_ID
@ -557,8 +587,75 @@ export default {
formData.APPLY_STATUS = STATUS
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
formData.STATUS = '2'
this.buttonloading = true
formData.STATUS = STATUS
this.buttonloading = true
if (STATUS === '2') {
uni.request({
url: basePath + '/app/hotwork/cfd/check',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID: _this.pd.HOTWORK_ID
},
success: (res) => {
if (res.data.result === 'success') {
uni.hideLoading();
if (res.data.passFlag === '0') {
uni.showModal({
title: '',
content: res.data.message,
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false;
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
}
} else if (res.data.result === 'exception') {
uni.showToast({
title: '错误',
duration: 2000
});
}
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
@ -570,8 +667,8 @@ export default {
title: '保存成功',
duration: 2000
});
_this.goback()
this.buttonloading = false
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
@ -580,7 +677,8 @@ export default {
showCancel: false
});
}
})
});
}
},
// 获取动火列表
getLimitSpace() {

4
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
View File

@ -64,8 +64,8 @@
<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
<template v-else-if="item.APPLY_STATUS==7">待验收</template>
<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
<template v-else-if="item.APPLY_STATUS==-1.5">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-1.5">作业负责人审核打回</template>
<template v-else-if="item.APPLY_STATUS==-2">项目主管部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-4">属地监管单位审核打回</template>
<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>

4
pages/application/safety-environmental-inspection/apply/detail.vue
View File

@ -258,7 +258,8 @@
</view>
<view class="cu-form-group">
<view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage" :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH">
<view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage"
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH">
<image v-if="item.IMGFILES_ID" :src="baseImgPath + hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image>
<image v-else :src="hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg" data-type="0" :data-index="index">
@ -1166,6 +1167,7 @@ export default {
let img = {};
img.IMGFILES_ID = '';
img.FILEPATH = res.tempFilePaths[i];
console.log(img.FILEPATH,'111111111111111111')
this.hiddenForm.hiddenImgs.push(img)
} else {
let img = {};