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

安全交底人，单人变多人页面调整

limingyu-20240419-一公司危险作业更新
liujun 2024-02-04 16:56:30 +08:00
parent ca3dd0a35a
commit f70735d5f3
7 changed files with 148 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@
</view>
</view>
</view>
<view v-if="pd.confessList && pd.confessList.length > 0">
<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">

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

@ -712,7 +712,7 @@
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button
v-if="!forbidEdit && pd.APPLY_STATUS <1 && pd.APPLY_STATUS != -99 && pd.APPLY_STATUS != -98 || !pd.APPLY_STATUS "
:loading="buttonloading" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'0.9')">提交
:loading="buttonloading" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1')">提交
</button>
<button
v-if="!forbidEdit && pd.APPLY_STATUS <1 && pd.APPLY_STATUS != -99 && pd.APPLY_STATUS != -98 || !pd.APPLY_STATUS "

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

@ -527,6 +527,7 @@
data: {
CONFESS_USER_ID:loginUser.USER_ID,
APPLY_STATUS:_this.STATUS,
TYPE:'0',
tm:new Date().getTime(),
KEYWORDS : _this.NameLikes, //关键字模糊查询
CORPINFO_ID:loginUser.CORPINFO_ID,

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

@ -63,11 +63,6 @@
<view v-else>{{pd.WORK_END_DATE}}</view>
</view>
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">作业负责人：</view>-->
<!-- <input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
<!-- </view>-->
<view class="cu-form-textarea">
<view style="display: flex;justify-content: space-between;align-items: center">
<view class="cu-form-title">动火人及证书编号：</view>
@ -85,30 +80,6 @@
<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
</view>
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">安全交底人：</view>-->
<!-- <input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
<!-- </view>-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">安全教育人：</view>-->
<!-- <input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
<!-- </view>-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">接受交底人：</view>-->
<!-- <input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
<!-- </view>-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">动火措施初审人：</view>-->
<!-- <input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
<!-- </view>-->
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">监护人：</view>-->
<!-- <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
<!-- </view>-->
</view>
<view class="wui-form-list" style="padding-top: 20upx;">
@ -146,13 +117,13 @@
</view>
</uni-td>
<uni-td align="center">
<radio-group class="wui-radio-group wui-radio-col">
<view class="group" style="margin-bottom: 10px">
<radio class='radio' value="-1" :checked="item.STATUS=='-1'" @click="changeRadio(index,'-1')">
<radio-group class="wui-radio-group">
<view class="group" v-if="item.STATUS=='-1'">
<radio class='radio' value="-1" checked>
<text class="wui-pl10">不涉及</text></radio>
</view>
<view class="group" style="margin-bottom: 10px">
<radio class='radio' value="1" :checked="item.STATUS=='1'" @click="changeRadio(index,'1')">
<view class="group" v-if="item.STATUS=='1'">
<radio class='radio' value="1" checked>
<text class="wui-pl10">涉&nbsp;&nbsp;&nbsp;&nbsp;及</text></radio>
</view>
</radio-group>
@ -184,14 +155,17 @@
</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 class="cu-form-group" >
<view class="cu-form-group">
<view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
{{ item.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.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view>
<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>
</view>
</view>
</view>
@ -210,6 +184,19 @@
</view>
</view>
</view>
<view v-if="files.length > 0">
<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>
<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
</view>
</view>
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">

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

@ -198,10 +198,6 @@
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业负责人</view>
@ -217,10 +213,6 @@
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火点所在单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">属地监管单位负责人</view>
@ -236,10 +228,6 @@
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">安全管理部门负责人</view>-->
<!-- {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">安全管理部门负责人</view>
@ -255,10 +243,6 @@
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">审批人</view>-->
<!-- {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">动火审批人</view>
@ -274,10 +258,6 @@
<view class="cu-form-title">动火前验票负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">动火前验票负责人</view>-->
<!-- {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">动火前验票负责人</view>
@ -293,10 +273,6 @@
<view class="cu-form-title">完工验收</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.ACCEPT_CONTENT"></textarea>
</view>
<!-- <view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
<!-- <view class="title">验收部门负责人</view>-->
<!-- {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">验收部门负责人</view>
@ -308,14 +284,9 @@
</view>
</view>
<!-- <view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">-->
<!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>-->
<!-- </view>-->
<view class="wui-sign" v-if="!pd.GUARDIAN_USER_SIGNER_PATH">
<view class="title">监护人</view>
<button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
<!-- <button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button> -->
</view>
<view class="wui-sign-box" v-show="imgList && imgList.length > 0">

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

@ -2,7 +2,7 @@
<view >
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
<block slot="backText">返回</block>
<block slot="content">作业负责人意见</block>
<block slot="content">安全检查项人意见</block>
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">
@ -63,11 +63,6 @@
<view v-else>{{pd.WORK_END_DATE}}</view>
</view>
<!-- <view class="cu-form-group" >-->
<!-- <view class="title">作业负责人：</view>-->
<!-- <input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
<!-- </view>-->
<view class="cu-form-textarea">
<view style="display: flex;justify-content: space-between;align-items: center">
<view class="cu-form-title">动火人及证书编号：</view>
@ -160,14 +155,17 @@
</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 class="cu-form-group" >
<view class="cu-form-group">
<view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
{{ item.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.APPROVAL_SIGNATURE" mode="aspectFill"
@click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
</view>
<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>
</view>
</view>
</view>
@ -188,14 +186,9 @@
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>
</view>
<view class="wui-sign">
<view class="title">作业负责人</view>
<view class="title">安全检查项人</view>
<button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
<!-- <button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button> -->
</view>
<view class="wui-sign-box" v-show="imgList && imgList.length > 0">
@ -215,8 +208,8 @@
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-2')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">通 过</button>
<button class="cu-btn bg-green margin-tb-sm lg" @click="goback()">返 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">确 定</button>
</view>
<view class="padding flex flex-direction">
</view>
@ -347,6 +340,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
showInfo:'1'
},
success: (res) => {
if ("success" == res.data.result) {
@ -400,76 +394,64 @@
formData.OPERATOR=loginUser.USER_ID
formData.ACTION_USER=loginUser.NAME
formData.APPLY_STATUS=STATUS
if(STATUS==2){
if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
uni.showModal({
title: '',
content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false
_this.goback()
}
})
} else {
if (STATUS == 2) {
formData.STATUS = STATUS
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.STATUS){
if (!measures.STATUS) {
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未勾选',
title: '第' + (i + 1) + '项未勾选',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
if (measures.STATUS == '1' && measures.QUESTION1 && !measures.ANSWER1) {
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第一项',
title: '第' + (i + 1) + '项未填写第一项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
if (measures.STATUS == '1' && measures.QUESTION2 && !measures.ANSWER2) {
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第二项',
title: '第' + (i + 1) + '项未填写第二项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
if (measures.STATUS == '1' && measures.QUESTION3 && !measures.ANSWER3) {
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第三项',
title: '第' + (i + 1) + '项未填写第三项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
if (measures.STATUS == '1' && measures.QUESTION4 && !measures.ANSWER4) {
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第四项',
title: '第' + (i + 1) + '项未填写第四项',
duration: 1500
});
return;
}
}
formData.measuresList = JSON.stringify(this.measuresList)
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
this.buttonloading = true
}
uni.uploadFile({
url: basePath+'/app/hotwork/cfd/editStatus',
url: basePath + '/app/hotwork/cfd/safetyApproval',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData:formData,
formData: formData,
success: (res) => {
uni.showToast({
icon:'none',
icon: 'none',
title: '保存成功',
duration: 2000
});
@ -484,12 +466,11 @@
});
}
})
}
}else{
} else {
formData.STATUS=STATUS
this.buttonloading = true
uni.request({
url: basePath + "/app/hotwork/cfd/editStatus",
url: basePath + "/app/hotwork/cfd/safetyApproval",
method: 'POST',
dataType: 'json',
header:{

20
pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
View File

@ -272,23 +272,9 @@
methods: {
//跳转事件
goToDetail(item) {
if(!item.ANALYZE_TIME || item.ANALYZE_TIME === '无'){
uni.showModal({
title:'提示',
content:'请进行气体检测后在审核',
showCancel:false
})
return
}
if(item.APPLY_STATUS == '0.9') {
uni.navigateTo({
url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID
});
}else{
uni.navigateTo({
url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
});
}
},
goToAdd(){
uni.navigateTo({
@ -521,7 +507,7 @@
title:"加载中..."
});//加载中动画
uni.request({
url: basePath +'/app/hotwork/cfd/list?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
url: basePath +'/app/hotwork/cfd/safetyList?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
method: 'POST',
dataType: 'json',
header: {
@ -529,8 +515,8 @@
},
data: {
CONFIRM_USER_ID:loginUser.USER_ID,
// CONFIRM_USER_ID:'6d6c37756530434382e2f14fbcafaa92',
APPLY_STATUS:'0.9',
APPLY_STATUS:'2',
TYPE:'2',
tm:new Date().getTime(),
KEYWORDS : _this.NameLikes, //关键字模糊查询
CORPINFO_ID:loginUser.CORPINFO_ID,