From 43d1c36dc733f2bac6950bd86249e2386f4af5e1 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Tue, 4 Jun 2024 10:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=90=84=E4=B8=AA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=A8=A1=E5=9D=97=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-approve-alldetail.vue             |  2 +-
 .../hotwork-confirm-alldetail.vue             | 58 ++++++++++---------
 .../hotwork-leader-alldetail.vue              | 51 ++++++++++------
 .../hotwork-xiang-alldetail.vue               | 35 ++++++-----
 4 files changed, 86 insertions(+), 60 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
index 78dc710..925431b 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
@@ -688,7 +688,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hotwork_cfd/goEdit',
+					url: basePath + '/app/hotwork/cfd/goEdit',
 					method: 'POST',
  					header: {
 						'Content-type': 'application/x-www-form-urlencoded'
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
index a6fb394..aa0996d 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
@@ -430,20 +430,28 @@
 						<view class="cu-form-title">作业负责人意见</view>
 						<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
 					</view>
-					<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-					<!--					<view class="title">作业负责人</view>-->
-					<!--					{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
-					<!--				</view>-->
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">作业负责人</view>
-							{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
-						</view>
+            <view class="cu-form-group" >
+              <view class="title">作业负责人</view>
+              {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
+            </view>
 						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
 							<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
 				</view>
+        <view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
+            </view>
+          </view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+          </view>
+        </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
 				<!--					<textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@@ -452,25 +460,21 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-				<view v-if="pd.LEADER_USER_SIGNER_PATH">
-					<view class="cu-form-textarea" style="border: none;">
-						<view class="cu-form-title">属地监管单位意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-					</view>
-					<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-					<!--					<view class="title">动火点属地监管单位负责人</view>-->
-					<!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
-					<!--				</view>-->
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">属地监管单位负责人</view>
-							{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
-						</view>
-						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-							<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
-						</view>
-					</view>
-				</view>
+        <view v-if="pd.LEADER_CONTENT  && pd.LEADER_CONTENT !== '无'">
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">属地监管单位意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group">
+              <view class="title">属地监管单位负责人</view>
+              {{ pd.LEADER_USER_NAME }} {{ pd.LEADER_USER_SIGNER_TIME }}
+            </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx; margin-top: 0upx; margin-bottom: 20upx;">
+              <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+            </view>
+          </view>
+        </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
 					<view class="cu-form-textarea" style="border: none;">
 						<view class="cu-form-title">安全管理部门意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
index e5795de..448b682 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
@@ -444,6 +444,22 @@
 						</view>
 					</view>
 				</view>
+        <view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}}
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">负责人意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
+            </view>
+            <view class="cu-form-group" >
+              <view class="title">审批时间</view>
+              {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+            </view>
+          </view>
+        </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
 				<!--					<textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@@ -452,25 +468,22 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-				<view v-if="pd.LEADER_USER_SIGNER_PATH">
-					<view class="cu-form-textarea" style="border: none;">
-						<view class="cu-form-title">属地监管单位意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
-					</view>
-					<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-					<!--					<view class="title">动火点属地监管单位负责人</view>-->
-					<!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
-					<!--				</view>-->
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">属地监管单位负责人</view>
-							{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
-						</view>
-						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-							<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
-						</view>
-					</view>
-				</view>
+        <view v-if="pd.LEADER_USER_SIGNER_PATH">
+          <view class="cu-form-textarea" style="border: none;">
+            <view class="cu-form-title">属地监管单位意见</view>
+            <textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
+          </view>
+          <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">动火点属地监管单位负责人</view>-->
+          <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">属地监管单位负责人</view>
+              {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
+            </view>
+          </view>
+        </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
 					<view class="cu-form-textarea" style="border: none;">
 						<view class="cu-form-title">安全管理部门意见</view>
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
index a6fb394..06ba94b 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
@@ -435,15 +435,27 @@
 					<!--					{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
 					<!--				</view>-->
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">作业负责人</view>
-							{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
-						</view>
+            <view class="cu-form-group" >
+              <view class="title">作业负责人</view>
+              {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
+            </view>
 						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
 							<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
 				</view>
+        <view v-if="pd.EXAMINE_APPROVAL_OPINIONS">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="pd.EXAMINE_APPROVAL_OPINIONS"></textarea>
+            </view>
+          </view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+          </view>
+        </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
 				<!--					<textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
@@ -461,15 +473,12 @@
 					<!--					<view class="title">动火点属地监管单位负责人</view>-->
 					<!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
 					<!--				</view>-->
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">属地监管单位负责人</view>
-							{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
-						</view>
-						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-							<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
-						</view>
-					</view>
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">属地监管单位负责人</view>
+              {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
+            </view>
+          </view>
 				</view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
 					<view class="cu-form-textarea" style="border: none;">