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

接受交底人修改为添加多个，并展示多个

bug优化0603
WenShiJun 2024-06-07 17:24:50 +08:00
parent 7277cd7ade
commit 9d408ab866
11 changed files with 293 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,21 +225,35 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
mode="" style="width: 200upx;height: 200upx;"></image>
<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- <text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.SAFETY_USER_NAME"> <view v-if="pd.SAFETY_USER_NAME">
<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" >
@ -663,6 +677,9 @@ export default {
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.FIRE_COMPLETED = this.pd.FIRE_COMPLETED;
formData.SITE_CLEANED = this.pd.SITE_CLEANED;
formData.NO_REMAINING_EMBERS = this.pd.NO_REMAINING_EMBERS;
if (STATUS == 8) { if (STATUS == 8) {
if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) { if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {

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

@ -44,7 +44,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text> <text>接受交底人：{{item.acceptConfessUserNames}}</text>
<text>安全措施确认人：{{item.SAFETY_USER_NAME}}</text> <text>安全措施确认人：{{item.SAFETY_USER_NAME}}</text>
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
@ -138,12 +138,12 @@
</view> </view>
<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
<view style="padding: 0 60upx;color: #5db174"> <view style="padding: 0 60upx;color: #5db174">
接受交底人：{{ACCEPT_CONFESS_USER_NAME}}已签字 接受交底人：{{acceptConfessUserNames}}已签字
</view> </view>
</view> </view>
<view v-if="!ACCEPT_CONFESS_USER_SIGNER_TIME"> <view v-if="!ACCEPT_CONFESS_USER_SIGNER_TIME">
<view style="padding: 0 60upx;color: red"> <view style="padding: 0 60upx;color: red">
接受交底人：{{ACCEPT_CONFESS_USER_NAME}}未签字 接受交底人：{{acceptConfessUserNames}}未签字
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
@ -237,6 +237,7 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
acceptConfessUserNames: '',
confessUserNames: '' confessUserNames: ''
} }
}, },
@ -378,6 +379,7 @@
this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
this.confessStatus = STATUS.confessStatus this.confessStatus = STATUS.confessStatus
this.confessUserNames = STATUS.confessUserNames this.confessUserNames = STATUS.confessUserNames
this.acceptConfessUserNames = STATUS.acceptConfessUserNames
}, },
getShowStatus(step) { getShowStatus(step) {
if (this.showStatus == -1.5 && step.id == 0) { if (this.showStatus == -1.5 && step.id == 0) {

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

@ -272,7 +272,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="wui-sign" v-if="!files.length"> <view class="wui-sign" v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_PATH">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
<view> <view>
<view> <view>

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

@ -554,7 +554,7 @@
<button class="cu-btn round bg-blue" @click="addAcceptconfessUser">添加接受交底人</button> <button class="cu-btn round bg-blue" @click="addAcceptconfessUser">添加接受交底人</button>
</view> </view>
</view> </view>
<view class="add_pard_item" v-for="(item,index) of acceptconfessUserList"> <view class="add_pard_item" v-for="(item,index) of acceptconfessList">
<view class="add_pard_del" v-if="index>0" @click="removeAcceptconfessUser(index)"> <view class="add_pard_del" v-if="index>0" @click="removeAcceptconfessUser(index)">
<text class="cuIcon-roundclosefill text-red f40"></text> <text class="cuIcon-roundclosefill text-red f40"></text>
</view> </view>
@ -575,8 +575,7 @@
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
<picker @change="PickerAcceptconfess($event,index)" :value="item.acceptconfessindex" :range="item.acceptconfessUserList" range-key="NAME" <picker @change="PickerAcceptconfess($event,index)" :value="item.acceptconfessindex" :range="item.acceptconfessUserList" range-key="NAME"
:disabled="item.acceptconfessUserList.length === 0" :disabled="item.acceptconfessUserList.length === 0">
@click="isBlankList('acceptconfess')">
<view class="picker"> <view class="picker">
{{ item.ACCEPT_CONFESS_USER_NAME ? item.ACCEPT_CONFESS_USER_NAME : '请选择' }} {{ item.ACCEPT_CONFESS_USER_NAME ? item.ACCEPT_CONFESS_USER_NAME : '请选择' }}
</view> </view>
@ -817,7 +816,6 @@ export default {
analyzeindex: -1, analyzeindex: -1,
confirmUserList: [], confirmUserList: [],
workuserindex: -1, workuserindex: -1,
confessUserList: [],
confessindex: -1, confessindex: -1,
acceptconfessindex: -1, acceptconfessindex: -1,
workUserList: [], workUserList: [],
@ -885,6 +883,8 @@ export default {
todayDate: '', todayDate: '',
otherAssignments: false, otherAssignments: false,
otherIdentification: false, otherIdentification: false,
confessUserList: [],
acceptconfessUserList: [],
confessList:[ confessList:[
{ {
CONFESS_DEPARTMENT_NAME:'', CONFESS_DEPARTMENT_NAME:'',
@ -895,7 +895,7 @@ export default {
confessindex: -1 confessindex: -1
} }
], ],
acceptconfessUserList: [ acceptconfessList: [
{ {
ACCEPT_CONFESS_DEPARTMENT_NAME:'', ACCEPT_CONFESS_DEPARTMENT_NAME:'',
ACCEPT_CONFESS_DEPARTMENT_ID:'', ACCEPT_CONFESS_DEPARTMENT_ID:'',
@ -1035,10 +1035,10 @@ export default {
this.getUserListForJiaoDiRen(_this.confessList[i].CONFESS_DEPARTMENT_ID, i); this.getUserListForJiaoDiRen(_this.confessList[i].CONFESS_DEPARTMENT_ID, i);
} }
} }
if (res.data.pd.acceptconfessUserList && res.data.pd.acceptconfessUserList.length > 0) { if (res.data.pd.acceptconfessList && res.data.pd.acceptconfessList.length > 0) {
_this.acceptconfessUserList = res.data.pd.acceptconfessUserList _this.acceptconfessList = res.data.pd.acceptconfessList
for (let i = 0; i < _this.acceptconfessUserList.length; i++) { for (let i = 0; i < _this.acceptconfessList.length; i++) {
this.getUserListForJiaoDiRen(_this.acceptconfessUserList[i].ACCEPT_CONFESS_DEPARTMENT_ID, i); this.getUserListForJiaoDiRen(_this.acceptconfessList[i].ACCEPT_CONFESS_DEPARTMENT_ID, i);
} }
} }
@ -1142,8 +1142,8 @@ export default {
required = false required = false
} }
} }
for (let i = 0; i < this.acceptconfessUserList.length; i++) { for (let i = 0; i < this.acceptconfessList.length; i++) {
if (!this.acceptconfessUserList[i].ACCEPT_CONFESS_USER_ID) { if (!this.acceptconfessList[i].ACCEPT_CONFESS_USER_ID) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请选择接受交底人', title: '请选择接受交底人',
@ -1152,14 +1152,14 @@ export default {
required = false required = false
} }
} }
if (this.pd.dongHuoCaoZuoRenPic.length <= 0) { // if (this.pd.dongHuoCaoZuoRenPic.length <= 0) {
uni.showToast({ // uni.showToast({
icon: 'none', // icon: 'none',
title: '请上传动火操作人图片', // title: '请上传动火操作人图片',
duration: 1500 // duration: 1500
}); // });
required = false // required = false
} // }
if (!required) { if (!required) {
return return
} }
@ -1167,8 +1167,8 @@ export default {
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.acceptconfessUserList.length; i++) { for (let i = 0; i < this.acceptconfessList.length; i++) {
this.acceptconfessUserList[i].acceptconfessUserList = [] this.acceptconfessList[i].acceptconfessUserList = []
} }
} }
const formData = {} const formData = {}
@ -1186,7 +1186,7 @@ export default {
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.acceptconfessUserList = JSON.stringify(this.acceptconfessUserList) 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,
@ -1384,8 +1384,12 @@ export default {
}, },
success: function (res) { success: function (res) {
if ("success" === res.data.result) { if ("success" === res.data.result) {
if (_this.confessList[index]) {
_this.confessList[index].confessUserList = res.data.userList; _this.confessList[index].confessUserList = res.data.userList;
_this.acceptconfessUserList[index].acceptconfessUserList = res.data.userList; }
if (_this.acceptconfessList[index]) {
_this.acceptconfessList[index].acceptconfessUserList = res.data.userList;
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -1547,12 +1551,11 @@ export default {
}, },
// 确定回调事件 // 确定回调事件
confesstreeAcceptconfirm(e,index) { confesstreeAcceptconfirm(e,index) {
console.log(e,index)
this.isUps = false; this.isUps = false;
this.acceptconfessUserList[index].ACCEPT_CONFESS_DEPARTMENT_ID = e[0].id; this.acceptconfessList[index].ACCEPT_CONFESS_DEPARTMENT_ID = e[0].id;
this.acceptconfessUserList[index].ACCEPT_CONFESS_DEPARTMENT_NAME = e[0].name; this.acceptconfessList[index].ACCEPT_CONFESS_DEPARTMENT_NAME = e[0].name;
this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_ID = '' this.acceptconfessList[index].ACCEPT_CONFESS_USER_ID = ''
this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_NAME = '' this.acceptconfessList[index].ACCEPT_CONFESS_USER_NAME = ''
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
this.getUserListForJiaoDiRen(e[0].id, index); this.getUserListForJiaoDiRen(e[0].id, index);
}, },
@ -1596,19 +1599,22 @@ export default {
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
PickerAcceptconfess(e, index) { PickerAcceptconfess(e, index) {
const userIndex = e.detail.value; this.acceptconfessList[index].acceptconfessindex = e.detail.value;
this.acceptconfessList[index].ACCEPT_CONFESS_USER_ID = this.acceptconfessList[index].acceptconfessUserList[e.detail.value].USER_ID;
console.log(this.acceptconfessUserList,'1111111111111111111') this.acceptconfessList[index].ACCEPT_CONFESS_USER_NAME = this.acceptconfessList[index].acceptconfessUserList[e.detail.value].NAME;
const selectedUser = this.acceptconfessUserList[index].acceptconfessUserList[userIndex];
if (selectedUser) {
this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_ID = selectedUser.USER_ID;
this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_NAME = selectedUser.NAME;
}
console.log(this.acceptconfessUserList[index],'3333333333333333333333333')
this.$forceUpdate(); // 强制刷新 this.$forceUpdate(); // 强制刷新
}, },
// PickerAcceptconfess(e, index) {
// const userIndex = e.detail.value;
//
// const selectedUser = this.acceptconfessList[index].acceptconfessUserList[userIndex];
//
// if (selectedUser) {
// this.acceptconfessList[index].ACCEPT_CONFESS_USER_ID = selectedUser.USER_ID;
// this.acceptconfessList[index].ACCEPT_CONFESS_USER_NAME = selectedUser.NAME;
// }
// this.$forceUpdate(); // 强制刷新
// },
/* /*
*分析人 *分析人
*分析人 *分析人
@ -1941,10 +1947,10 @@ export default {
acceptconfessUserList:[], acceptconfessUserList:[],
confessindex: -1 confessindex: -1
}; };
_this.acceptconfessUserList.push(o); _this.acceptconfessList.push(o);
}, },
removeAcceptconfessUser(index){ removeAcceptconfessUser(index){
this.acceptconfessUserList.splice(index,1); this.acceptconfessList.splice(index,1);
}, },
// 2024-02-03 created by liu jun description:安全措施确认人信息选怎 // 2024-02-03 created by liu jun description:安全措施确认人信息选怎
showSafetyTree(){ showSafetyTree(){

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

@ -233,20 +233,34 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-form-group">
<view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
mode="" style="width: 200upx;height: 200upx;"></image> @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">

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

@ -243,32 +243,60 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.CONFESS_USER_SIGNER_PATH"> <view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<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>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_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.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> </view>
<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 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>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
mode="" style="width: 200upx;height: 200upx;"></image>
<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="pd.CONFESS_USER_SIGNER_PATH">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">安全交底人</view>-->
<!-- {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
<!-- <image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- <text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">

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

@ -211,21 +211,35 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-form-group">
<view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
mode="" style="width: 200upx;height: 200upx;"></image> @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- <text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="pd.CONFIRM_USER_SIGNER_PATH"> <view v-if="pd.CONFIRM_USER_SIGNER_PATH">

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

@ -225,20 +225,34 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-form-group">
<view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
mode="" style="width: 200upx;height: 200upx;"></image> @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.SAFETY_SIGNATURE"> <view v-if="pd.SAFETY_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" >

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

@ -250,20 +250,34 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-form-group">
<view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
mode="" style="width: 200upx;height: 200upx;"></image> @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">

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

@ -233,20 +233,34 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-form-group">
<view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
mode="" style="width: 200upx;height: 200upx;"></image> @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.SAFETY_USER_NAME"> <view v-if="pd.SAFETY_USER_NAME">
<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" >

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

@ -244,21 +244,35 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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 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-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{ pd.ACCEPT_CONFESS_USER_NAME }} {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)" @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
mode="" style="width: 200upx;height: 200upx;"></image>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view v-if="files.length > 0">-->
<!-- <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">-->
<!-- <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid #e3e3e3">-->
<!-- <view class="cu-form-group">-->
<!-- <view class="title">接受交底人</view>-->
<!-- {{ pd.ACCEPT_CONFESS_USER_NAME }} {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}-->
<!-- </view>-->
<!-- <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">-->
<!-- <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index"-->
<!-- @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"-->
<!-- mode="" style="width: 200upx;height: 200upx;"></image>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view v-if="pd.SAFETY_USER_NAME"> <view v-if="pd.SAFETY_USER_NAME">
<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" >