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

项目负责人审批bug修复

limingyu-20240419-一公司危险作业更新
liujun 2024-02-04 17:52:47 +08:00
parent 3a24d3b669
commit 960b3ffd27
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="files.length > 0"> <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> <view class="title">安全项检查人</view>

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

@ -174,15 +174,17 @@
</view> </view>
</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 style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee"> <view v-for="(item,index) in pd.confessList" >
<view class="cu-form-group"> <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="title">安全交底人</view> <view class="cu-form-group">
{{ pd.CONFESS_USER_NAME }} {{ pd.CONFESS_USER_SIGNER_TIME }} <view class="title">安全交底人</view>
</view> {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;"> </view>
<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
@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>
@ -204,7 +206,21 @@
</view> </view>
</view> </view>
</view> </view>
<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>
<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
</view>
</view>
</view>
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view> <view class="cu-form-title">作业负责人意见</view>
@ -251,7 +267,7 @@
<view class="cu-bar btn-group" style="margin-top: 30upx;"> <view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-4')">打 回</button> <button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-4')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" <button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg"
@click="$noMultipleClicks(goSubmit,'1.5')">通 过 @click="$noMultipleClicks(goSubmit,'2')">通 过
</button> </button>
</view> </view>
<view class="padding flex flex-direction"> <view class="padding flex flex-direction">
@ -430,7 +446,7 @@ export default {
uni.showLoading({ uni.showLoading({
title: '请稍候' title: '请稍候'
}) })
if (STATUS === 1.5) { if (STATUS === 2) {
if (_this.imgList.length <= 0) { if (_this.imgList.length <= 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
@ -447,7 +463,7 @@ export default {
formData.CREATOR = loginUser.USER_ID formData.CREATOR = loginUser.USER_ID
formData.OPERATOR = loginUser.USER_ID formData.OPERATOR = loginUser.USER_ID
formData.ACTION_USER = loginUser.NAME formData.ACTION_USER = loginUser.NAME
formData.APPLY_STATUS = '2' 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

6
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
View File

@ -2,7 +2,7 @@
<view> <view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true"> <cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block> <block slot="backText">返回</block>
<block slot="content">作业负责人意见</block> <block slot="content">项目主管部门意见</block>
</cu-custom> </cu-custom>
<view class="select-fixed top-fixed"> <view class="select-fixed top-fixed">
<view class="cu-bar search bg-white"> <view class="cu-bar search bg-white">
@ -273,11 +273,11 @@
goToDetail(item) { goToDetail(item) {
if(item.APPLY_STATUS == '1.5') { if(item.APPLY_STATUS == '1.5') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail?HOTWORK_ID=' + item.HOTWORK_ID url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail?HOTWORK_ID=' + item.HOTWORK_ID
}); });
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail?HOTWORK_ID=' + item.HOTWORK_ID url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
}); });
} }
}, },