From 960b3ffd27f5a62f9a4dbeb5643aa90339858c69 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sun, 4 Feb 2024 17:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-confirm-detail.vue                |  2 +-
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 40 +++++++++++++------
 .../hotwork-xiang-mu/hotwork-xiang-list.vue   |  6 +--
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index dbc37b0..b5ace25 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -184,7 +184,7 @@
 						</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 class="cu-form-group" >
               <view class="title">安全项检查人</view>
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index 6eaf46f..1f3e2e3 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
@@ -174,15 +174,17 @@
               </view>
             </view>
           </view>
-          <view v-if="pd.CONFESS_USER_SIGNER_PATH">
-            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-              <view class="cu-form-group">
-                <view class="title">安全交底人</view>
-                {{ pd.CONFESS_USER_NAME }} {{ pd.CONFESS_USER_SIGNER_TIME }}
-              </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 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="title">安全交底人</view>
+                  {{ 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>
             </view>
           </view>
@@ -204,7 +206,21 @@
               </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 class="wui-form-list">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">作业负责人意见</view>
@@ -251,7 +267,7 @@
       <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 :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg"
-                @click="$noMultipleClicks(goSubmit,'1.5')">通 过
+                @click="$noMultipleClicks(goSubmit,'2')">通 过
         </button>
       </view>
       <view class="padding flex flex-direction">
@@ -430,7 +446,7 @@ export default {
       uni.showLoading({
         title: '请稍候'
       })
-      if (STATUS === 1.5) {
+      if (STATUS === 2) {
         if (_this.imgList.length <= 0) {
           uni.showToast({
             icon: 'none',
@@ -447,7 +463,7 @@ export default {
       formData.CREATOR = loginUser.USER_ID
       formData.OPERATOR = loginUser.USER_ID
       formData.ACTION_USER = loginUser.NAME
-      formData.APPLY_STATUS = '2'
+      formData.APPLY_STATUS = STATUS
       formData.CORPINFO_ID = loginUser.CORPINFO_ID
       formData.USER_ID = loginUser.USER_ID
 
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
index 1cc913a..a1dab75 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
-			<block slot="content">作业负责人意见</block>
+			<block slot="content">项目主管部门意见</block>
 		</cu-custom>
 		<view class="select-fixed top-fixed">
 			<view class="cu-bar search bg-white">
@@ -273,11 +273,11 @@
 			goToDetail(item) {
 				if(item.APPLY_STATUS == '1.5') {
 					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{
 					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
 					});
 				}
 			},