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

动火各个流程模块查看详情时显示审批记录

bug优化0603
WenShiJun 2024-06-04 10:58:52 +08:00
parent ba7073d79e
commit 43d1c36dc7
4 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -688,7 +688,7 @@
title: '请稍候' title: '请稍候'
}) })
uni.request({ uni.request({
url: basePath + '/app/hotwork_cfd/goEdit', url: basePath + '/app/hotwork/cfd/goEdit',
method: 'POST', method: 'POST',
header: { header: {
'Content-type': 'application/x-www-form-urlencoded' 'Content-type': 'application/x-www-form-urlencoded'

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

@ -430,20 +430,28 @@
<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="pd.CONFIRM_CONTENT"></textarea>
</view> </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}}-->
<!-- </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" >
<view class="title">作业负责人</view> <view class="title">作业负责人</view>
{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image> <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> </view>
</view> </view>
<view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
<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>
</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-textarea" style="border: none;">-->
<!-- <view class="cu-form-title">监护人意见</view>--> <!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>--> <!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@ -452,25 +460,21 @@
<!-- <view class="title">监护人</view>--> <!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}--> <!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_SIGNER_PATH"> <view v-if="pd.LEADER_CONTENT && pd.LEADER_CONTENT !== '无'">
<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="pd.LEADER_CONTENT"></textarea>
</view> </view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">--> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<!-- <view class="title">动火点属地监管单位负责人</view>--> <view class="cu-form-group">
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}--> <view class="title">属地监管单位负责人</view>
<!-- </view>--> {{ pd.LEADER_USER_NAME }} {{ pd.LEADER_USER_SIGNER_TIME }}
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> </view>
<view class="cu-form-group" > <view style="width: 400upx; height: 200upx; margin: 30upx; margin-top: 0upx; margin-bottom: 20upx;">
<view class="title">属地监管单位负责人</view> <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} </view>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > </view>
<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.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>

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

@ -444,6 +444,22 @@
</view> </view>
</view> </view>
</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>
<view class="cu-form-group" >
<view class="title">审批时间</view>
{{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
</view>
<!-- <view class="cu-form-textarea" style="border: none;">--> <!-- <view class="cu-form-textarea" style="border: none;">-->
<!-- <view class="cu-form-title">监护人意见</view>--> <!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>--> <!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@ -452,25 +468,22 @@
<!-- <view class="title">监护人</view>--> <!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}--> <!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>--> <!-- </view>-->
<view 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="pd.LEADER_CONTENT"></textarea>
</view> </view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">--> <!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>--> <!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}--> <!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
<!-- </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" >
<view class="title">属地监管单位负责人</view> <view class="title">属地监管单位负责人</view>
{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > </view>
<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>
<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>

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

@ -435,15 +435,27 @@
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}--> <!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
<!-- </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" >
<view class="title">作业负责人</view> <view class="title">作业负责人</view>
{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image> <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> </view>
</view> </view>
<view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
<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>
</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-textarea" style="border: none;">-->
<!-- <view class="cu-form-title">监护人意见</view>--> <!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>--> <!-- <textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@ -461,15 +473,12 @@
<!-- <view class="title">动火点属地监管单位负责人</view>--> <!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}--> <!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
<!-- </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" >
<view class="title">属地监管单位负责人</view> <view class="title">属地监管单位负责人</view>
{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > </view>
<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>
<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;">