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

动火页面统计数逻辑修改 

安全检查项意见逻辑修改
所有节点字段显示内容修改
bug优化0603
WenShiJun 2024-06-13 18:09:35 +08:00
parent fcf1acd4b4
commit 19f3cb1dbb
20 changed files with 592 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,20 +107,20 @@
<!-- <input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>--> <!-- <input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
<!-- </view>--> <!-- </view>-->
<view class="cu-form-group" > <!-- <view class="cu-form-group" >-->
<view class="title">安全教育人：</view> <!-- <view class="title">安全教育人：</view>-->
<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input> <!-- <input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
</view> <!-- </view>-->
<!-- <view class="cu-form-group" >--> <!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人：</view>--> <!-- <view class="title">接受交底人：</view>-->
<!-- <input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>--> <!-- <input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
<!-- </view>--> <!-- </view>-->
<view class="cu-form-group" > <!-- <view class="cu-form-group" >-->
<view class="title">动火措施初审人：</view> <!-- <view class="title">动火措施初审人：</view>-->
<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input> <!-- <input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
</view> <!-- </view>-->
<!-- <view class="cu-form-group" >--> <!-- <view class="cu-form-group" >-->
<!-- <view class="title">监护人：</view>--> <!-- <view class="title">监护人：</view>-->
<!-- <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>--> <!-- <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">

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

@ -120,9 +120,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -146,19 +148,24 @@
</uni-table> </uni-table>
</view> </view>
<view> <view>
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view> </view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> </view>
<view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view> </view>
<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
<text class="title">
作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<!-- <view v-if="pd.CONFIRM_CONTENT" class="ty-group">-->
<!-- <text class="title">-->
<!-- 作业负责人：</text>-->
<!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
<!-- </view>-->
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group"> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
项目责任负责人：</text> 项目责任负责人：</text>

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

@ -107,9 +107,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -135,6 +137,16 @@
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title">
安全措施确认人：</text>
<text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">

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

@ -1152,14 +1152,14 @@ export default {
required = false required = false
} }
} }
// if (this.pd.dongHuoCaoZuoRenPic.length <= 0) { if (this.pd.dongHuoCaoZuoRenPic.length <= 0) {
// uni.showToast({ uni.showToast({
// icon: 'none', icon: 'none',
// title: '请上传动火操作人图片', title: '请上传动火操作人图片',
// duration: 1500 duration: 1500
// }); });
// required = false required = false
// } }
if (!required) { if (!required) {
return return
} }

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -214,25 +219,43 @@
</view> </view>
</view> </view>
<view v-if="pd.CONFESS_USER_SIGNER_PATH"> <view v-if="pd.SAFETY_USER_NAME">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">安全项检查人</view>
{{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
</view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view>
</view>
</view>
<view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH"> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>

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

@ -126,9 +126,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -153,15 +155,19 @@
</view> </view>
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea> <text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -208,6 +214,18 @@
</view> </view>
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="pd.SAFETY_USER_NAME">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">安全项检查人</view>
{{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
</view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view>
</view>
</view>
<view v-if="pd.GUARDIAN_USER_SIGNER_PATH"> <view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
<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" >

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -213,26 +218,43 @@
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view> </view>
</view> </view>
<view v-if="pd.SAFETY_USER_NAME">
<view v-if="pd.CONFESS_USER_SIGNER_PATH">
<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>
{{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
</view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view>
</view>
</view>
<view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH"> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>

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

@ -150,9 +150,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -177,14 +179,18 @@
</view> </view>
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea> <text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
@ -232,6 +238,18 @@
</view> </view>
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="pd.SAFETY_USER_NAME">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">安全项检查人</view>
{{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
</view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view>
</view>
</view>
<view v-if="pd.GUARDIAN_USER_SIGNER_PATH"> <view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
<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" >

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

@ -150,9 +150,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -178,7 +180,16 @@
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<!-- <textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>--> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title">
安全措施确认人：</text>
<text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -214,25 +219,43 @@
</view> </view>
</view> </view>
<view v-if="pd.CONFESS_USER_SIGNER_PATH"> <view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH"> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
</view>
</view>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">安全项检查人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view> </view>
</view> </view>
</view> </view>

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

@ -121,9 +121,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input> <input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -145,15 +147,19 @@
</uni-tr> </uni-tr>
</uni-table> </uni-table>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">

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

@ -104,7 +104,7 @@
<text class="text-semi">安全防护措施</text> <text class="text-semi">安全防护措施</text>
</view> </view>
<view class="wui-table" style="padding: 0 20upx;"> <view class="wui-table" style="padding: 0 20upx;">
<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;">序&nbsp;号</uni-th>
@ -112,8 +112,8 @@
<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 align="center" class="wui-border">{{ index + 1 }}</uni-td>
<uni-td> <uni-td class="wui-border">
<view style="margin-bottom: 20upx;"> <view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}} {{item.PROTECTIVE_MEASURES}}
</view> </view>
@ -127,16 +127,18 @@
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'">
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view> </view>
</view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input>
</view> </view>
</view> </view>
</uni-td> </uni-td>
<uni-td align="center"> <uni-td align="center" class="wui-border">
<radio-group class="wui-radio-group"> <radio-group class="wui-radio-group">
<view class="group" v-if="item.STATUS=='-1'"> <view class="group" v-if="item.STATUS=='-1'">
<radio class='radio' value="-1" checked> <radio class='radio' value="-1" checked>
@ -154,7 +156,16 @@
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<!-- <textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>--> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view>
<view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title">
安全措施确认人：</text>
<text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -213,26 +218,43 @@
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view> </view>
</view> </view>
<view v-if="pd.SAFETY_USER_NAME">
<view v-if="pd.CONFESS_USER_SIGNER_PATH">
<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>
{{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
</view>
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view>
</view>
</view>
<view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH"> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">接受交底人</view> <view class="title">接受交底人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>

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

@ -121,9 +121,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -148,14 +150,18 @@
</view> </view>
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea> <text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">

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

@ -126,9 +126,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -153,14 +155,18 @@
</view> </view>
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea> <text class="title">其他安全措施：</text>
<textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">

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

@ -122,9 +122,11 @@
<input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input> <input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3">
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input> <input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
</view> </view>
</view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
<input name="input" v-model="item.ANSWER4" type="number" placeholder="请输入"></input> <input name="input" v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
@ -430,7 +432,8 @@
duration: 1500 duration: 1500
}); });
return; return;
} }1
console.log('11111111111111111', measures)
if (measures.STATUS == '1' && measures.QUESTION1 && !measures.ANSWER1) { if (measures.STATUS == '1' && measures.QUESTION1 && !measures.ANSWER1) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -901,5 +904,4 @@
</script> </script>
<style> <style>
</style> </style>

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

@ -154,9 +154,11 @@
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
@ -179,8 +181,11 @@
</uni-table> </uni-table>
</view> </view>
<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view class="cu-form-group"> <view class="cu-form-textarea">
<view class="title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
@ -214,25 +219,43 @@
</view> </view>
</view> </view>
<view v-if="pd.CONFESS_USER_SIGNER_PATH"> <view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.confessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view> </view>
</view> </view>
</view> </view>
<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH"> </view>
<view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
<view v-for="(item,index) in pd.acceptConfessList" >
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">接受交底人</view>
{{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
<image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
@click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
</view>
</view>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">接受交底人</view> <view class="title">安全项检查人</view>
{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
</view> </view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" > <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image> <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
mode="" style="width: 200upx;height: 200upx;"></image>
</view> </view>
</view> </view>
</view> </view>

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

@ -121,10 +121,12 @@
<view class="title">{{ item.QUESTION2 }}</view> <view class="title">{{ item.QUESTION2 }}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'" >
<view class="title">{{ item.QUESTION3 }}</view> <view style="display: flex;flex-direction: column">
<view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
</view> </view>
</view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'">
<view class="title">{{ item.QUESTION4 }}</view> <view class="title">{{ item.QUESTION4 }}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input> <input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input>
@ -150,15 +152,18 @@
</view> </view>
<view> <view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view v-for="(item, index) in pd.safetyList" :key="index">
<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" <text class="title">其他安全措施：</text>
placeholder="请输入其他防护措施..."></textarea> <textarea maxlength="255" v-model="item.APPROVAL_CONTENT"></textarea>
</view>
</view> </view>
<view> <view>
<view v-if="pd.SAFETY_USER_MEASURES" class="ty-group"> <view v-if="pd.safetyList" class="ty-group">
<view v-for="(item, index) in pd.safetyList" :key="index">
<text class="title"> <text class="title">
安全措施确认人：</text> 安全措施确认人：</text>
<text>{{ pd.SAFETY_USER_MEASURES}}</text> <text>{{ item.USER_NAME }}</text>
</view>
</view> </view>
<view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">

2
pages/basics/home.vue
View File

@ -901,7 +901,7 @@
background-color: #dd514c; background-color: #dd514c;
color: white; color: white;
border-radius: 50%; border-radius: 50%;
padding: 2px 5px; padding:3px 6px;
font-size: 12px; font-size: 12px;
} }
} }