From b428272965773bc90955533df2125b4d749fe3bf Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 3 Apr 2024 16:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept/hotwork-accept-detail.vue       |  3 +--
 .../hotwork-apply/hotwork-apply-detail.vue         | 14 ++++++--------
 .../hotwork-approve/hotwork-approve-detail.vue     |  9 ++++-----
 .../hotwork-confess/hotwork-confess-detail.vue     |  8 ++++----
 .../hotwork-confirm/hotwork-confirm-detail.vue     |  3 +--
 .../hotwork-leader/hotwork-leader-detail.vue       | 12 +++++-------
 .../hotwork-monitor/hotwork-monitor-detail.vue     | 12 +++++-------
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue      |  3 +--
 8 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index 0de85ec..5ec02af 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -232,12 +232,11 @@
           <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_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>
diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
index 124a953..9f0ac71 100644
--- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
@@ -268,18 +268,16 @@
           </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.ACCEPT_CONFESS_USER_NAME }} {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}
-              </view>
-              <view class="cu-item" v-for="(item,index) in files" :key="index"
-                    style="border-bottom: 1px solid  #e3e3e3">
+              <view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+                <view class="cu-form-group">
+                  <view class="title">接受交底人</view>
+                  {{ pd.ACCEPT_CONFESS_USER_NAME }} {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+                </view>
                 <view class="imgs"
                       style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
                   <image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index"
                          @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
                          mode="" style="width: 200upx;height: 200upx;"></image>
-                  <text>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</text>
                 </view>
               </view>
             </view>
@@ -1057,7 +1055,7 @@ export default {
             required = false
           }
         }
-        if (this.pd.dongHuoCaoZuoRenPic.length > 0) {
+        if (this.pd.dongHuoCaoZuoRenPic.length <= 0) {
           uni.showToast({
             icon: 'none',
             title: '请上传动火操作人图片',
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
index bfc9459..68bb1fd 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -211,15 +211,14 @@
         </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.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
-						</view>
 						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+              <view class="cu-form-group" >
+                <view class="title">接受交底人</view>
+                {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+              </view>
 							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
 								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
 									   mode="" style="width: 200upx;height: 200upx;"></image>
-								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
 							</view>
 						</view>
 					</view>
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 46463c5..e4e80d7 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
@@ -211,11 +211,11 @@
 					</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.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
-							</view>
 							<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+                <view class="cu-form-group" >
+                  <view class="title">接受交底人</view>
+                  {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+                </view>
 								<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
 									<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
 										   mode="" style="width: 200upx;height: 200upx;"></image>
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 397e295..91b130e 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -200,12 +200,11 @@
           <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_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
             </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>
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
index f859464..9b4e38d 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -198,26 +198,24 @@
           <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_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 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.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
-						</view>
 						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+              <view class="cu-form-group" >
+                <view class="title">接受交底人</view>
+                {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+              </view>
 							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
 								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
 									   mode="" style="width: 200upx;height: 200upx;"></image>
-								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
 							</view>
 						</view>
 					</view>
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
index 7b9298b..2e8fc87 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -216,15 +216,14 @@
         </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.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
-						</view>
 						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+              <view class="cu-form-group" >
+                <view class="title">接受交底人</view>
+                {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+              </view>
 							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
 								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
 									   mode="" style="width: 200upx;height: 200upx;"></image>
-								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
 							</view>
 						</view>
 					</view>
@@ -233,12 +232,11 @@
           <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_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>
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 a080123..2d02451 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
@@ -222,12 +222,11 @@
             <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_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>