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

所有节点： 

其他安全措施逻辑修改
bug优化0603
WenShiJun 2024-06-18 10:54:44 +08:00
parent bc0e06f85c
commit ec276afd3c
14 changed files with 285 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,42 +181,57 @@
</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-textarea"> <!-- <view class="cu-form-textarea">-->
<view class="cu-form-title">其他安全措施：</view> <!-- <view class="cu-form-title">其他安全措施：</view>-->
<view> <!-- <view>-->
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea> <!-- <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea>-->
</view> <!-- </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_USER_MEASURES" class="ty-group">
<text class="title">
作业单位：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
车间：</text> 项目责任负责人：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text> <text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批部门：</text> 属地监管单位：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 安全管理部门：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.LEADER_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title">
动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view> </view>
<view v-if="pd.SAFETY_SIGNATURE"> <view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
@ -784,6 +799,7 @@
success: (res) => { success: (res) => {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
console.log(res.data.pd,'1111111111111111111111111')
_this.pd = res.data.pd; //参数map _this.pd = res.data.pd; //参数map
if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
_this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;

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

@ -148,10 +148,10 @@
</uni-table> </uni-table>
</view> </view>
<view> <view>
<view class="cu-form-group" > <!-- <view class="cu-form-group" >-->
<view class="title">其他安全措施：</view> <!-- <view class="title">其他安全措施：</view>-->
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <!-- <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>-->
</view> <!-- </view>-->
<!-- <view v-if="pd.safetyList" class="ty-group">--> <!-- <view v-if="pd.safetyList" class="ty-group">-->
<!-- <view v-for="(item, index) in pd.safetyList" :key="index">--> <!-- <view v-for="(item, index) in pd.safetyList" :key="index">-->
<!-- <text class="title">--> <!-- <text class="title">-->
@ -159,11 +159,11 @@
<!-- <text>{{ item.USER_NAME }}</text>--> <!-- <text>{{ item.USER_NAME }}</text>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- <view v-if="pd.CONFIRM_CONTENT" class="ty-group">--> <view v-if="pd.CONFIRM_CONTENT" class="ty-group">
<!-- <text class="title">--> <text class="title">
<!-- 作业负责人：</text>--> 作业负责人：</text>
<!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>--> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
<!-- </view>--> </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>
@ -689,6 +689,7 @@ export default {
formData.FIRE_COMPLETED = this.pd.FIRE_COMPLETED; formData.FIRE_COMPLETED = this.pd.FIRE_COMPLETED;
formData.SITE_CLEANED = this.pd.SITE_CLEANED; formData.SITE_CLEANED = this.pd.SITE_CLEANED;
formData.NO_REMAINING_EMBERS = this.pd.NO_REMAINING_EMBERS; formData.NO_REMAINING_EMBERS = this.pd.NO_REMAINING_EMBERS;
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
if (STATUS == 8) { if (STATUS == 8) {
if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) { if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {

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

@ -184,34 +184,49 @@
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view> <view>
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业单位：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
车间：</text> <!-- 车间：</text>-->
<text>{{ pd.LEADER_USER_MEASURES}}</text> <!-- <text>{{ pd.LEADER_USER_MEASURES}}</text>-->
</view> <!-- </view>-->
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
安全管理部门：</text> <!-- 审批人：</text>-->
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <!-- <text>{{ pd.APPROVE_USER_MEASURES}}</text>-->
</view> <!-- </view>-->
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批人：</text> 动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 班长：</text>

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

@ -156,7 +156,7 @@
<view> <view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">其他安全措施：</view> <view class="title">其他安全措施：</view>
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
</view> </view>
</view> </view>
<view> <view>
@ -579,6 +579,7 @@
formData.OPERATOR=loginUser.USER_ID formData.OPERATOR=loginUser.USER_ID
formData.ACTION_USER=loginUser.NAME formData.ACTION_USER=loginUser.NAME
formData.APPLY_STATUS=STATUS formData.APPLY_STATUS=STATUS
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
if(STATUS==6){ if(STATUS==6){
formData.STATUS = STATUS formData.STATUS = STATUS
this.buttonloading = true this.buttonloading = true

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

@ -184,39 +184,49 @@
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title">其他安全措施：</view> <view class="cu-form-title">其他安全措施：</view>
<view> <view>
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.LEADER_USER_MEASURES"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业单位：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title">
属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
车间：</text> <!-- 车间：</text>-->
<text>{{ pd.LEADER_USER_MEASURES}}</text> <!-- <text>{{ pd.LEADER_USER_MEASURES}}</text>-->
</view> <!-- </view>-->
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批部门：</text> 动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 班长：</text>
<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.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">

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

@ -180,7 +180,7 @@
<view> <view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">其他安全措施：</view> <view class="title">其他安全措施：</view>
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
</view> </view>
<view> <view>
<!-- <view v-if="pd.safetyList" class="ty-group">--> <!-- <view v-if="pd.safetyList" class="ty-group">-->
@ -205,16 +205,16 @@
属地监管单位：</text> 属地监管单位：</text>
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title">
动火前验票：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text>
</view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
动火审批人：</text> 动火审批人：</text>
@ -617,6 +617,7 @@
formData.APPLY_STATUS=STATUS formData.APPLY_STATUS=STATUS
formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
if(STATUS==5){ if(STATUS==5){
formData.STATUS = STATUS formData.STATUS = STATUS
if (!_this.validStr(this.pd.APPROVE_USER_ID)) { if (!_this.validStr(this.pd.APPROVE_USER_ID)) {

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

@ -187,36 +187,41 @@
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.CONFIRM_OTHER_CONTENT"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.CONFIRM_OTHER_CONTENT"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
作业单位：</text> <!-- 作业负责人：</text>-->
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
</view> <!-- </view>-->
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<!-- <text class="title">--> <text class="title">
<!-- 监护人：</text>--> 项目责任负责人：</text>
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <text>{{ pd.BELONGING_USER_MEASURES}}</text>
<!-- </view>--> </view>
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
车间：</text> 属地监管单位：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.LEADER_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批人：</text> 动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 动火前验票：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view> </view>
<view v-if="pd.SAFETY_SIGNATURE"> <view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">

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

@ -157,11 +157,11 @@
<!-- 安全措施确认人：</text>--> <!-- 安全措施确认人：</text>-->
<!-- <text>{{ pd.SAFETY_USER_MEASURES}}</text>--> <!-- <text>{{ pd.SAFETY_USER_MEASURES}}</text>-->
<!-- </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">-->
作业负责人：</text> <!-- 作业负责人：</text>-->
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text> <!-- <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
</view> <!-- </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>

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

@ -183,40 +183,45 @@
<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-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"> <view>
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.GUARDIAN_USER_MEASURES"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业单位：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
车间：</text> 安全管理部门：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text> <text>{{ pd.LEADER_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 动火审批人：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批部门：</text> 动火前验票：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 班长：</text>
<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.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">

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

@ -151,7 +151,7 @@
<view> <view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">其他安全措施：</view> <view class="title">其他安全措施：</view>
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
</view> </view>
<view> <view>
<!-- <view v-if="pd.safetyList" class="ty-group">--> <!-- <view v-if="pd.safetyList" class="ty-group">-->
@ -171,11 +171,11 @@
项目责任负责人：</text> 项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text> <text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
属地监管单位：</text> <!-- 属地监管单位：</text>-->
<text>{{ pd.GUARDIAN_USER_MEASURES}}</text> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
</view> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
动火前验票：</text> 动火前验票：</text>
@ -554,6 +554,7 @@
formData.APPLY_STATUS=STATUS formData.APPLY_STATUS=STATUS
formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES;
if(STATUS==4){ if(STATUS==4){
formData.STATUS = STATUS formData.STATUS = STATUS

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

@ -187,31 +187,36 @@
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业单位：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
车间：</text> 属地监管单位：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.LEADER_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批部门：</text> 动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 班长：</text>

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

@ -156,7 +156,7 @@
<view> <view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">其他安全措施：</view> <view class="title">其他安全措施：</view>
<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input> <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
</view> </view>
<view> <view>
<!-- <view v-if="pd.safetyList" class="ty-group">--> <!-- <view v-if="pd.safetyList" class="ty-group">-->
@ -597,6 +597,7 @@
formData.OPERATOR = loginUser.USER_ID formData.OPERATOR = loginUser.USER_ID
formData.ACTION_USER = loginUser.NAME formData.ACTION_USER = loginUser.NAME
formData.APPLY_STATUS = STATUS formData.APPLY_STATUS = STATUS
formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
if (STATUS == 7) { if (STATUS == 7) {
formData.STATUS = STATUS formData.STATUS = STATUS
this.buttonloading = true this.buttonloading = true

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

@ -187,36 +187,46 @@
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.BELONGING_USER_MEASURES"></textarea> <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.BELONGING_USER_MEASURES"></textarea>
</view> </view>
</view> </view>
<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group"> <view v-if="pd.CONFIRM_OTHER_CONTENT" class="ty-group">
<text class="title"> <text class="title">
作业单位：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_USER_MEASURES}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<!-- <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">-->
<!-- 项目责任负责人：</text>-->
<!-- <text>{{ pd.BELONGING_USER_MEASURES}}</text>-->
<!-- </view>-->
<!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">--> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<!-- <text class="title">--> <!-- <text class="title">-->
<!-- 监护人：</text>--> <!-- 监护人：</text>-->
<!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>--> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>-->
<!-- </view>--> <!-- </view>-->
<view v-if="pd.LEADER_USER_MEASURES" class="ty-group"> <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
车间：</text> 属地监管单位：</text>
<text>{{ pd.LEADER_USER_MEASURES}}</text> <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group"> <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
安全管理部门：</text> 安全管理部门：</text>
<text>{{ pd.AUDIT_USER_MEASURES}}</text> <text>{{ pd.LEADER_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group"> <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
审批人：</text> 动火审批人：</text>
<text>{{ pd.APPROVE_USER_MEASURES}}</text> <text>{{ pd.AUDIT_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group"> <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
班长：</text> 动火前验票：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.APPROVE_USER_MEASURES}}</text>
</view> </view>
<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
<text class="title">
班长：</text>
<text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view>
</view> </view>
<view v-if="pd.SAFETY_SIGNATURE"> <view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">

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

@ -168,11 +168,6 @@
作业负责人：</text> 作业负责人：</text>
<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text> <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
</view> </view>
<view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
<text class="title">
项目责任负责人：</text>
<text>{{ pd.BELONGING_USER_MEASURES}}</text>
</view>
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group"> <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
<text class="title"> <text class="title">
属地监管单位：</text> 属地监管单位：</text>
@ -199,18 +194,18 @@
<text>{{ pd.MONITOR_USER_MEASURES}}</text> <text>{{ pd.MONITOR_USER_MEASURES}}</text>
</view> </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">-->
作业单位： <!-- 作业单位：-->
</text> <!-- </text>-->
<text>{{ pd.CONFIRM_USER_MEASURES }}</text> <!-- <text>{{ pd.CONFIRM_USER_MEASURES }}</text>-->
</view> <!-- </view>-->
<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group"> <!-- <view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">-->
<text class="title"> <!-- <text class="title">-->
动火点属地监管单位负责人： <!-- 动火点属地监管单位负责人：-->
</text> <!-- </text>-->
<text>{{ pd.GUARDIAN_USER_MEASURES }}</text> <!-- <text>{{ pd.GUARDIAN_USER_MEASURES }}</text>-->
</view> <!-- </view>-->
</view> </view>
<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1"> <view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
<view> <view>