From 7b6d4d1085cb1847c55e4bc6e5285c95a605fef9 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Wed, 19 Jun 2024 18:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8E=A5=E5=8F=97=E4=BA=A4?=
 =?UTF-8?q?=E5=BA=95=E4=BA=BA=E5=92=8C=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95?=
 =?UTF-8?q?=E4=BA=BA=E6=9C=89=E5=A4=9A=E4=B8=AA=E4=BA=BA=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA=E6=88=96?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95=E4=BA=BA=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E5=90=8E=E5=9C=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E6=98=BE=E7=A4=BA=E6=89=8B=E5=86=99=E7=AD=BE=E5=AD=97?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/tool.js                                |  5 +++++
 .../hotwork-acceptconfess-detail.vue          | 17 ++++++-----------
 .../hotwork-confess-detail.vue                | 19 ++++++++++++++-----
 .../hotwork-guardian-detail.vue               |  5 -----
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/common/tool.js b/common/tool.js
index 934b250..a2103b6 100644
--- a/common/tool.js
+++ b/common/tool.js
@@ -44,6 +44,11 @@ export function loginSession (){
         });
     }
 }
+
+export function getLoginUserId() {
+    return loginUserId;
+}
+
 export function setloginUser (user){
     loginUser = user;
 }
diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
index f6b3220..84856d1 100644
--- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
@@ -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;
                   }
                 }
diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
index e4997b1..a5e067f 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
@@ -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;
                   }
                 }
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
index d7f670b..9c9b8bb 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -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">