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

申请时，安全交底人可添加、接受交底人不能已添加

bug优化0603
WenShiJun 2024-06-06 18:06:12 +08:00
parent bc3e628959
commit 7277cd7ade
18 changed files with 412 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/application/eight-assignments/index.vue
View File

@ -160,7 +160,7 @@
<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list"> <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-js-1_cfd.png" mode=""></image> <image src="../../../static/icon-apps/icon-js-1_cfd.png" mode=""></image>
<view v-if="count.COUNTACCEPTCONFESS" class="cu-tag badge">{{count.COUNTACCEPTCONFESS}}</view> <view v-if="count.acceptConfessNum" class="cu-tag badge">{{count.acceptConfessNum}}</view>
</view> </view>
<view class="text-semi" style="text-align: center;"> <view class="text-semi" style="text-align: center;">
<view>接受交底人</view> <view>接受交底人</view>
@ -230,7 +230,6 @@ export default {
if ("success" == res.data.result) { if ("success" == res.data.result) {
_this.count = res.data.count; _this.count = res.data.count;
} }
} }
}) })
}, },

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

@ -472,14 +472,14 @@
}); });
return; return;
} }
var fileList = []; // var fileList = [];
var signtime = []; // var signtime = [];
const formData={} const formData={}
Object.keys(this.pd).map(key => { Object.keys(this.pd).map(key => {
formData[key]=this.pd[key] formData[key]=this.pd[key]
}) })
this.uploadImgFaults(fileList,signtime) // this.uploadImgFaults(fileList,signtime)
formData.SIGNTIME = signtime.join(",") // formData.SIGNTIME = signtime.join(",")
formData.CREATOR=loginUser.USER_ID formData.CREATOR=loginUser.USER_ID
formData.OPERATOR=loginUser.USER_ID formData.OPERATOR=loginUser.USER_ID
formData.ACTION_USER=loginUser.NAME formData.ACTION_USER=loginUser.NAME
@ -487,7 +487,9 @@
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
uni.uploadFile({ uni.uploadFile({
url: basePath+'/app/hotwork/cfd/editAcceptconfess', url: basePath+'/app/hotwork/cfd/editAcceptconfess',
files: fileList, // files: fileList,
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData, formData: formData,
success: (res) => { success: (res) => {
uni.showToast({ uni.showToast({
@ -506,15 +508,15 @@
} }
}) })
}, },
uploadImgFaults(fileList,signtime) { // uploadImgFaults(fileList,signtime) {
this.imgList.map(item => { // this.imgList.map(item => {
var img = {} // var img = {}
img.name = 'file'+(fileList.length) // img.name = 'file'+(fileList.length)
img.uri = item.filePath // img.uri = item.filePath
fileList.push(img) // fileList.push(img)
signtime.push(item.SIGNER_TIME) // signtime.push(item.SIGNER_TIME)
}) // })
}, // },
DelImg(index){ DelImg(index){
this.imgList.splice(index,1) this.imgList.splice(index,1)
}, },

14
pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue
View File

@ -53,7 +53,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<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.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
@ -150,12 +150,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>
@ -248,7 +248,8 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
confessUserNames: '' confessUserNames: '',
acceptConfessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -384,6 +385,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) {
@ -543,7 +545,8 @@
title:"加载中..." title:"加载中..."
});//加载中动画 });//加载中动画
uni.request({ uni.request({
url: basePath +'/app/hotwork/cfd/jslist?showCount='+_this.showCount+'&currentPage='+_this.currentPage , // url: basePath +'/app/hotwork/cfd/jslist?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
url: basePath +'/app/hotwork/cfd/safetyList?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
method: 'POST', method: 'POST',
dataType: 'json', dataType: 'json',
header: { header: {
@ -552,6 +555,7 @@
data: { data: {
ACCEPT_CONFESS_USER_ID:loginUser.USER_ID, ACCEPT_CONFESS_USER_ID:loginUser.USER_ID,
APPLY_STATUS:_this.STATUS, APPLY_STATUS:_this.STATUS,
TYPE:'3',
tm:new Date().getTime(), tm:new Date().getTime(),
KEYWORDS : _this.NameLikes, //关键字模糊查询 KEYWORDS : _this.NameLikes, //关键字模糊查询
CORPINFO_ID:loginUser.CORPINFO_ID, CORPINFO_ID:loginUser.CORPINFO_ID,

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

@ -164,10 +164,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据"> <uni-table name='measuresList' border stripe emptyText="暂无更多数据">
<!-- 表头行 --> <!-- 表头行 -->
<uni-tr> <uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th> <uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th> <uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr> </uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID"> <uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td> <uni-td>
<view style="margin-bottom: 20upx;"> <view style="margin-bottom: 20upx;">
{{ item.PROTECTIVE_MEASURES }} {{ item.PROTECTIVE_MEASURES }}
@ -546,32 +548,68 @@
</view> </view>
</view> </view>
</view> </view>
<view class="wui-form-list" v-if="!forbidEdit"> <view class="add_pard_box" v-if="!forbidEdit">
<view class="cu-form-group"> <view class="add_pard_btns">
<view class="title">接受交底人单位</view> <view class="add_pard_b" style="width: 170px;">
<view class="picker-tree-box"> <button class="cu-btn round bg-blue" @click="addAcceptconfessUser">添加接受交底人</button>
<view class="picker-tree" @tap="showAcceptconfessTree">
{{ pd.ACCEPT_CONFESS_DEPARTMENT_NAME ? pd.ACCEPT_CONFESS_DEPARTMENT_NAME : '请选择' }}
</view>
</view> </view>
<tki-tree ref="tkiTree_acceptconfess"
:selectParent=true
:range="treeNode"
rangeKey="name"
@confirm="confesstreeAcceptconfirm"
@cancel="acceptconfesstreeCancel"></tki-tree>
</view> </view>
<view class="cu-form-group"> <view class="add_pard_item" v-for="(item,index) of acceptconfessUserList">
<view class="title">接受交底人</view> <view class="add_pard_del" v-if="index>0" @click="removeAcceptconfessUser(index)">
<picker @change="PickerAcceptconfess" :value="acceptconfessindex" :range="acceptconfessUserList" <text class="cuIcon-roundclosefill text-red f40"></text>
range-key="NAME" :disabled="acceptconfessUserList.length == 0" </view>
@click="isBlankList('acceptconfess')"> <view class="cu-form-group">
<view class="picker"> <view class="title">接受交底人单位</view>
{{ pd.ACCEPT_CONFESS_USER_NAME ? pd.ACCEPT_CONFESS_USER_NAME : '请选择' }} <view class="picker-tree-box">
<view class="picker-tree" @tap="showAcceptconfessTree(index)">
{{ item.ACCEPT_CONFESS_DEPARTMENT_NAME ? item.ACCEPT_CONFESS_DEPARTMENT_NAME : '请选择' }}
</view>
</view> </view>
</picker> <tki-tree ref="tkiTree_acceptconfess"
:selectParent=true
:range="treeNode"
rangeKey="name"
@confirm="confesstreeAcceptconfirm($event,index)"
@cancel="acceptconfesstreeCancel"></tki-tree>
</view>
<view class="cu-form-group">
<view class="title">接受交底人</view>
<picker @change="PickerAcceptconfess($event,index)" :value="item.acceptconfessindex" :range="item.acceptconfessUserList" range-key="NAME"
:disabled="item.acceptconfessUserList.length === 0"
@click="isBlankList('acceptconfess')">
<view class="picker">
{{ item.ACCEPT_CONFESS_USER_NAME ? item.ACCEPT_CONFESS_USER_NAME : '请选择' }}
</view>
</picker>
</view>
</view> </view>
</view> </view>
<!-- <view class="wui-form-list" v-if="!forbidEdit">-->
<!-- <view class="cu-form-group">-->
<!-- <view class="title">接受交底人单位</view>-->
<!-- <view class="picker-tree-box">-->
<!-- <view class="picker-tree" @tap="showAcceptconfessTree">-->
<!-- {{ pd.ACCEPT_CONFESS_DEPARTMENT_NAME ? pd.ACCEPT_CONFESS_DEPARTMENT_NAME : '请选择' }}-->
<!-- </view>-->
<!-- </view>-->
<!-- <tki-tree ref="tkiTree_acceptconfess"-->
<!-- :selectParent=true-->
<!-- :range="treeNode"-->
<!-- rangeKey="name"-->
<!-- @confirm="confesstreeAcceptconfirm"-->
<!-- @cancel="acceptconfesstreeCancel"></tki-tree>-->
<!-- </view>-->
<!-- <view class="cu-form-group">-->
<!-- <view class="title">接受交底人</view>-->
<!-- <picker @change="PickerAcceptconfess" :value="acceptconfessindex" :range="acceptconfessUserList"-->
<!-- range-key="NAME" :disabled="acceptconfessUserList.length == 0"-->
<!-- @click="isBlankList('acceptconfess')">-->
<!-- <view class="picker">-->
<!-- {{ pd.ACCEPT_CONFESS_USER_NAME ? pd.ACCEPT_CONFESS_USER_NAME : '请选择' }}-->
<!-- </view>-->
<!-- </picker>-->
<!-- </view>-->
<!-- </view>-->
<view class="wui-form-list" v-if="!forbidEdit"> <view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">验收部门</view> <view class="title">验收部门</view>
@ -609,7 +647,7 @@
<view v-if="pd.CONFIRM_USER_SIGNER_PATH"> <view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view> <view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea> <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
@ -622,10 +660,22 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
<view v-if="pd.LEADER_USER_SIGNER_PATH"> <view v-if="pd.LEADER_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view> <view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea> <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
@ -641,7 +691,7 @@
<view v-if="pd.AUDIT_USER_SIGNER_PATH"> <view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view> <view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea> <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
@ -657,7 +707,7 @@
<view v-if="pd.APPROVE_USER_SIGNER_PATH"> <view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view> <view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea> <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
@ -673,7 +723,7 @@
<view v-if="pd.MONITOR_USER_SIGNER_PATH"> <view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view> <view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea> <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view> </view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group"> <view class="cu-form-group">
@ -769,7 +819,6 @@ export default {
workuserindex: -1, workuserindex: -1,
confessUserList: [], confessUserList: [],
confessindex: -1, confessindex: -1,
acceptconfessUserList: [],
acceptconfessindex: -1, acceptconfessindex: -1,
workUserList: [], workUserList: [],
confirmindex: -1, confirmindex: -1,
@ -790,6 +839,7 @@ export default {
OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;', OTHER_PROTECTIVE_MEASURES: ';_;;_;;_;;_;;_;;_;;_;',
WORK_LONGITUDE: '', WORK_LONGITUDE: '',
WORK_LATITUDE: '', WORK_LATITUDE: '',
ACCEPT_CONFESS_USER_ID: '',
dongHuoCaoZuoRenPic: [] dongHuoCaoZuoRenPic: []
},// 数据 },// 数据
measuresList: [], measuresList: [],
@ -808,10 +858,30 @@ export default {
{name: 'MONITOR_USER_ID', message: '请选择动火前验票负责人'}, {name: 'MONITOR_USER_ID', message: '请选择动火前验票负责人'},
{name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人'}, {name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人'},
{name: 'GUARDIAN_USER_ID', message: '请选择监护人'}, {name: 'GUARDIAN_USER_ID', message: '请选择监护人'},
{name: 'ACCEPT_CONFESS_USER_ID', message: '请选择接受交底人'}, // {name: 'ACCEPT_CONFESS_USER_ID', message: '请选择接受交底人'},
{name: 'BELONGING_USER_ID', message: '请选择项目主管部门负责人'}, {name: 'BELONGING_USER_ID', message: '请选择项目主管部门负责人'},
{name: 'SAFETY_USER_ID', message: '请选择项安全措施确认人'}, {name: 'SAFETY_USER_ID', message: '请选择项安全措施确认人'},
], ],
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
},
formattedExamineApprovalOpinions() {
return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
},
formattedLeaderContent() {
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
},
formattedAuditContent() {
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
},
formattedApproveContent() {
return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
},
formattedMonitorContent() {
return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
}
},
todayDate: '', todayDate: '',
otherAssignments: false, otherAssignments: false,
otherIdentification: false, otherIdentification: false,
@ -825,7 +895,16 @@ export default {
confessindex: -1 confessindex: -1
} }
], ],
acceptconfessUserList: [
{
ACCEPT_CONFESS_DEPARTMENT_NAME:'',
ACCEPT_CONFESS_DEPARTMENT_ID:'',
ACCEPT_CONFESS_USER_NAME:'',
ACCEPT_CONFESS_USER_ID:'',
acceptconfessUserList:[],
confessindex: -1
}
],
safetyIndex: -1, safetyIndex: -1,
safetyUserList: [], safetyUserList: [],
@ -956,7 +1035,12 @@ 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) {
_this.acceptconfessUserList = res.data.pd.acceptconfessUserList
for (let i = 0; i < _this.acceptconfessUserList.length; i++) {
this.getUserListForJiaoDiRen(_this.acceptconfessUserList[i].ACCEPT_CONFESS_DEPARTMENT_ID, i);
}
}
} else if ("exception" == data.result) { } else if ("exception" == data.result) {
uni.showToast({ uni.showToast({
@ -1058,6 +1142,16 @@ export default {
required = false required = false
} }
} }
for (let i = 0; i < this.acceptconfessUserList.length; i++) {
if (!this.acceptconfessUserList[i].ACCEPT_CONFESS_USER_ID) {
uni.showToast({
icon: 'none',
title: '请选择接受交底人',
duration: 1500
});
required = false
}
}
if (this.pd.dongHuoCaoZuoRenPic.length <= 0) { if (this.pd.dongHuoCaoZuoRenPic.length <= 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -1073,6 +1167,9 @@ 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++) {
this.acceptconfessUserList[i].acceptconfessUserList = []
}
} }
const formData = {} const formData = {}
Object.keys(this.pd).map(key => { Object.keys(this.pd).map(key => {
@ -1089,6 +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)
this.buttonloading = true this.buttonloading = true
uni.request({ uni.request({
url: basePath + "/app/hotwork/cfd/" + _this.msg, url: basePath + "/app/hotwork/cfd/" + _this.msg,
@ -1287,6 +1385,7 @@ export default {
success: function (res) { success: function (res) {
if ("success" === res.data.result) { if ("success" === res.data.result) {
_this.confessList[index].confessUserList = res.data.userList; _this.confessList[index].confessUserList = res.data.userList;
_this.acceptconfessUserList[index].acceptconfessUserList = res.data.userList;
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -1447,14 +1546,15 @@ export default {
this.getUserListForJiaoDiRen(e[0].id, index); this.getUserListForJiaoDiRen(e[0].id, index);
}, },
// 确定回调事件 // 确定回调事件
confesstreeAcceptconfirm(e) { confesstreeAcceptconfirm(e,index) {
console.log(e,index)
this.isUps = false; this.isUps = false;
this.pd.ACCEPT_CONFESS_DEPARTMENT_ID = e[0].id; this.acceptconfessUserList[index].ACCEPT_CONFESS_DEPARTMENT_ID = e[0].id;
this.pd.ACCEPT_CONFESS_DEPARTMENT_NAME = e[0].name; this.acceptconfessUserList[index].ACCEPT_CONFESS_DEPARTMENT_NAME = e[0].name;
this.pd.ACCEPT_CONFESS_USER_ID = '' this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_ID = ''
this.pd.ACCEPT_CONFESS_USER_NAME = '' this.acceptconfessUserList[index].ACCEPT_CONFESS_USER_NAME = ''
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
this.getUserList(e[0].id, 'acceptconfessUserList'); this.getUserListForJiaoDiRen(e[0].id, index);
}, },
// 取消回调事件 // 取消回调事件
guardiantreeCancel(e) { guardiantreeCancel(e) {
@ -1479,9 +1579,9 @@ export default {
this.$refs.tkiTree_confess[index]._show(); this.$refs.tkiTree_confess[index]._show();
}, },
// 显示树形选择器 // 显示树形选择器
showAcceptconfessTree() { showAcceptconfessTree(index) {
this.isUps = true this.isUps = true
this.$refs.tkiTree_acceptconfess._show(); this.$refs.tkiTree_acceptconfess[index]._show();
}, },
PickerGuardian(e) { PickerGuardian(e) {
this.guardianindex = e.detail.value; this.guardianindex = e.detail.value;
@ -1495,13 +1595,22 @@ export default {
this.confessList[index].CONFESS_USER_NAME = this.confessList[index].confessUserList[e.detail.value].NAME; this.confessList[index].CONFESS_USER_NAME = this.confessList[index].confessUserList[e.detail.value].NAME;
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
PickerAcceptconfess(e) { PickerAcceptconfess(e, index) {
this.acceptconfessindex = e.detail.value; const userIndex = e.detail.value;
this.pd.ACCEPT_CONFESS_USER_ID = this.acceptconfessUserList[this.acceptconfessindex].USER_ID;
this.pd.ACCEPT_CONFESS_USER_NAME = this.acceptconfessUserList[this.acceptconfessindex].NAME; console.log(this.acceptconfessUserList,'1111111111111111111')
this.$forceUpdate();//强制刷新
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(); // 强制刷新
}, },
/* /*
*分析人
*分析人 *分析人
*/ */
// 确定回调事件 // 确定回调事件
@ -1822,6 +1931,21 @@ export default {
removeConfessUser(index){ removeConfessUser(index){
this.confessList.splice(index,1); this.confessList.splice(index,1);
}, },
addAcceptconfessUser(){
var _this = this;
let o = {
ACCEPT_CONFESS_DEPARTMENT_NAME:'',
ACCEPT_CONFESS_DEPARTMENT_ID:'',
ACCEPT_CONFESS_USER_NAME:'',
ACCEPT_CONFESS_USER_ID:'',
acceptconfessUserList:[],
confessindex: -1
};
_this.acceptconfessUserList.push(o);
},
removeAcceptconfessUser(index){
this.acceptconfessUserList.splice(index,1);
},
// 2024-02-03 created by liu jun description:安全措施确认人信息选怎 // 2024-02-03 created by liu jun description:安全措施确认人信息选怎
showSafetyTree(){ showSafetyTree(){
this.isUps = true this.isUps = true

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

@ -53,7 +53,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<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.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
@ -154,12 +154,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>
@ -255,6 +255,7 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus:'0', confessStatus:'0',
acceptConfessUserNames:'0',
confessUserNames: '' confessUserNames: ''
} }
}, },
@ -391,6 +392,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) {

8
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-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: ''
} }
}, },
@ -379,6 +380,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) {

8
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-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: ''
} }
}, },
@ -379,6 +380,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) {

10
pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue
View File

@ -53,7 +53,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<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.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
@ -150,12 +150,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>
@ -248,7 +248,8 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
confessUserNames: '' confessUserNames: '',
acceptConfessUserNames: ''
} }
}, },
onReady() { onReady() {
@ -384,6 +385,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) {

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

@ -53,7 +53,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)">
@ -147,12 +147,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>
@ -246,6 +246,7 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
acceptConfessUserNames: '',
confessUserNames: '' confessUserNames: ''
} }
}, },
@ -396,6 +397,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) {

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

@ -44,7 +44,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<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.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
@ -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: ''
} }
}, },
@ -368,6 +369,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) {

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

@ -53,7 +53,7 @@
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<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.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
@ -150,12 +150,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>
@ -248,6 +248,7 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
acceptConfessUserNames: '',
confessUserNames: '' confessUserNames: ''
} }
}, },
@ -384,6 +385,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) {

8
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-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: ''
} }
}, },
@ -379,6 +380,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) {

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

@ -561,7 +561,6 @@
title: '请稍候' title: '请稍候'
}) })
if (STATUS == 7) { if (STATUS == 7) {
if (_this.imgList.length <= 0) { if (_this.imgList.length <= 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',

8
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-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>
@ -238,6 +238,7 @@
ACCEPT_CONFESS_USER_SIGNER_TIME: '', ACCEPT_CONFESS_USER_SIGNER_TIME: '',
ACCEPT_CONFESS_USER_NAME: '', ACCEPT_CONFESS_USER_NAME: '',
confessStatus: '', confessStatus: '',
acceptConfessUserNames: '',
confessUserNames: '' confessUserNames: ''
} }
}, },
@ -396,6 +397,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) {

8
pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-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: ''
} }
}, },
@ -373,6 +374,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) {

10
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-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) {
@ -544,7 +546,7 @@
'Content-type':'application/x-www-form-urlencoded' 'Content-type':'application/x-www-form-urlencoded'
}, },
data: { data: {
BELONGING_USER_ID:loginUser.USER_ID, LEADER_USER_ID:loginUser.USER_ID,
APPLY_STATUS:'1.5', APPLY_STATUS:'1.5',
tm:new Date().getTime(), tm:new Date().getTime(),
KEYWORDS : _this.NameLikes, //关键字模糊查询 KEYWORDS : _this.NameLikes, //关键字模糊查询

104
unpackage/dist/dev/app-plus/pages/application/onlinexxks/face/index.js vendored
View File

File diff suppressed because one or more lines are too long

206
unpackage/dist/dev/app-plus/pages/my/face/index.js vendored
View File

File diff suppressed because one or more lines are too long