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

如果接受交底人和安全交底人有多个人，当前接受交底人或安全交底人签字后在详情页面不再显示手写签字按钮

bug优化0603
WenShiJun 2024-06-19 18:14:18 +08:00
parent 09705fa5c4
commit 7b6d4d1085
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/tool.js
View File

@ -44,6 +44,11 @@ export function loginSession (){
});
}
}
export function getLoginUserId() {
return loginUserId;
}
export function setloginUser (user){
loginUser = user;
}

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

@ -356,7 +356,7 @@
</view>
</view>
</view>
<view class="wui-sign" v-if="!allSigned">
<view class="wui-sign" v-if="!allSigned && !isAlreadySigned">
<view class="title">接受交底人</view>
<view>
<view>
@ -402,7 +402,7 @@
<script>
import {
basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath,getLoginUserId
} from '@/common/tool.js';
import tkiTree from "@/components/select-tree/select-tree.vue"
import writingBoard from "@/components/writing-board/writing-board.vue"
@ -414,6 +414,7 @@
},
data() {
return {
isAlreadySigned: false,
baseImgPath:baseImgPath,
isUps:false,
forbidEdit:true,// 禁止修改
@ -567,16 +568,10 @@
_this.files = res.data.imgList;
_this.measuresList = res.data.measuresList
if (_this.pd.acceptConfessList && _this.pd.acceptConfessList.length > 0) {
const currentUserId = getLoginUserId();
for (let i = 0; i < _this.pd.acceptConfessList.length; i++) {
if (_this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH) {
_this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH;
_this.pd.ACCEPT_CONFESS_USER_NAME = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_NAME;
_this.pd.ACCEPT_CONFESS_USER_SIGNER_TIME = _this.pd.acceptConfessList[i].CREATE_TIME;
// 将ACCEPT_CONFESS_USER_SIGNER_PATH转换为数组并赋值给imgList
// _this.imgList = _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH.split(';').map(path => ({
// filePath: _this.baseImgPath + path.trim()
// }));
if (_this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_ID === currentUserId && _this.pd.acceptConfessList[i].APPROVAL_SIGNATURE) {
_this.isAlreadySigned = true; // 更新标记
break;
}
}

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

@ -427,7 +427,7 @@
<!-- <view class="cu-form-title">监护人意见</view>-->
<!-- <textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>-->
<!-- </view>-->
<view class="wui-sign" v-if="!allSigned">
<view class="wui-sign" v-if="!allSigned && !isAlreadySigned">
<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> -->
@ -467,7 +467,7 @@
<script>
import {
basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath,getLoginUserId
} from '@/common/tool.js';
import tkiTree from "@/components/select-tree/select-tree.vue"
import writingBoard from "@/components/writing-board/writing-board.vue"
@ -479,6 +479,7 @@
},
data() {
return {
isAlreadySigned: false,
baseImgPath:baseImgPath,
isUps:false,
forbidEdit:true,// 禁止修改
@ -613,7 +614,6 @@
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
console.log(res.data.pd,'111111111111111111111111')
_this.pd = res.data.pd; //参数map
if (_this.pd.ACCEPT_USER_SIGNER_PATH) {
@ -634,10 +634,19 @@
_this.files = res.data.imgList;
_this.measuresList = res.data.measuresList
// if (_this.pd.confessList && _this.pd.confessList.length > 0) {
// for (let i = 0; i < _this.pd.confessList.length; i++) {
// if (_this.pd.confessList[i].APPROVAL_SIGNATURE) {
// _this.pd.CONFESS_USER_SIGNER_PATH = _this.pd.confessList[i].APPROVAL_SIGNATURE;
// break;
// }
// }
// }
if (_this.pd.confessList && _this.pd.confessList.length > 0) {
const currentUserId = getLoginUserId();
for (let i = 0; i < _this.pd.confessList.length; i++) {
if (_this.pd.confessList[i].APPROVAL_SIGNATURE) {
_this.pd.CONFESS_USER_SIGNER_PATH = _this.pd.confessList[i].APPROVAL_SIGNATURE;
if (_this.pd.confessList[i].CONFESS_USER_ID === currentUserId && _this.pd.confessList[i].CONFESS_USER_ID) {
_this.isAlreadySigned = true; // 更新标记
break;
}
}

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

@ -167,11 +167,6 @@
<!-- <text>{{ item.USER_NAME }}</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>
<view v-if="pd.SAFETY_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">