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

各环节签字意见不填可以提交，签字后意见显示为无，建议不填的默认显示同意bug修复

bug优化0603
WenShiJun 2024-06-04 14:43:54 +08:00
parent 45e1401b6f
commit fcc5d47399
9 changed files with 377 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -454,11 +454,23 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.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 class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@ -474,10 +486,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -493,10 +505,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -512,10 +524,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -639,6 +651,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -704,6 +736,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],

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

@ -428,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -446,6 +446,18 @@
</view>
</view>
</view>
<view v-if="pd.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 class="cu-form-textarea" style="border: none;">-->
<!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@ -455,10 +467,10 @@
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.LEADER_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@ -474,10 +486,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -493,10 +505,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -512,10 +524,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -639,6 +651,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -704,6 +736,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],

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

@ -428,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -454,30 +454,39 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.LEADER_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">属地监管单位负责人</view>
{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
</view>
<view v-if="pd.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 class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">属地监管单位负责人</view>
{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
</view>
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -493,10 +502,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -512,10 +521,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -639,6 +648,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -704,6 +733,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],

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

@ -136,10 +136,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<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;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
@ -426,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业负责人</view>
@ -440,11 +442,11 @@
</view>
</view>
</view>
<view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
<view v-if="pd.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="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
@ -463,7 +465,7 @@
<view v-if="pd.LEADER_CONTENT && pd.LEADER_CONTENT !== '无'">
<view class="cu-form-textarea" style="border: none;">
<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 style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
@ -476,10 +478,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -495,10 +497,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -514,10 +516,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -638,9 +640,28 @@
{name:'GUARDIAN_USER',message:'请输入监护人'},
],
todayDate:'',
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -706,6 +727,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],

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

@ -428,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -447,18 +447,14 @@
</view>
</view>
<view>
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}}
</view>
<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="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
<view class="cu-form-group" >
<view class="title">审批时间</view>
{{pd.EXAMINE_APPROVAL_CREATE_TIME}}
<view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
</view>
@ -473,7 +469,7 @@
<view v-if="pd.LEADER_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<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 class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
@ -487,10 +483,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -506,10 +502,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -525,10 +521,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -652,6 +648,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

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

@ -264,19 +264,6 @@
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
@ -291,7 +278,19 @@
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
</view>
</view>
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">属地监管单位意见</view>

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

@ -426,10 +426,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -452,11 +452,23 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.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 class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@ -472,10 +484,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -491,10 +503,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -510,10 +522,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -637,6 +649,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -702,6 +734,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],

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

@ -102,10 +102,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<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;width: 80px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}

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

@ -428,10 +428,10 @@
<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
</view>
<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -446,11 +446,11 @@
</view>
</view>
</view>
<view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
<view v-if="pd.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="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
@ -467,10 +467,10 @@
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.LEADER_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@ -483,10 +483,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
@ -502,10 +502,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
@ -521,10 +521,10 @@
</view>
</view>
<view v-if="pd.MONITOR_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
@ -648,6 +648,26 @@
}
},
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 : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
@ -713,6 +733,9 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
}
_this.pd = Object.assign(_this.pd,
{
"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],