From fbea533566a6d5145fd39bee2c2266d23874a2c4 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 5 Feb 2024 11:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=8A=A8=E7=81=AB?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept/hotwork-accept-detail.vue  | 322 ++++++++----------
 .../hotwork-leader/hotwork-leader-detail.vue  |  43 +--
 .../hotwork-monitor-detail.vue                | 110 +++---
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue |   7 +-
 4 files changed, 196 insertions(+), 286 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 1e8b792..fa6d80c 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -62,12 +62,6 @@
 					></ruiDatePicker>
 					<view v-else>{{pd.WORK_END_DATE}}</view>
 				</view>
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">作业负责人：</view>-->
-<!--					<input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
 				<view class="cu-form-textarea">
 					<view style="display: flex;justify-content: space-between;align-items: center">
 						<view class="cu-form-title">动火人及证书编号：</view>
@@ -85,30 +79,6 @@
 					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全交底人：</view>-->
-<!--					<input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全教育人：</view>-->
-<!--					<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">接受交底人：</view>-->
-<!--					<input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">动火措施初审人：</view>-->
-<!--					<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-<!--        <view class="cu-form-group" >-->
-<!--          <view class="title">监护人：</view>-->
-<!--          <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
-<!--        </view>-->
-
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
@@ -217,17 +187,20 @@
 						</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>
-					</view>
-				</view>
+        <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>
 				<view v-if="files.length > 0">
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 						<view class="cu-form-group" >
@@ -243,6 +216,19 @@
 						</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">
 
@@ -251,10 +237,6 @@
 					<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>
@@ -265,23 +247,25 @@
 					</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>-->
-<!--				</view>-->
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">监护人</view>-->
-<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
-<!--				</view>-->
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">项目主管部门负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
+        </view>
+        <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
+          </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
+        </view>
 
-				<view class="cu-form-textarea" style="border: none;">
+
+        <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>
@@ -296,10 +280,6 @@
 					<view class="cu-form-title">安全管理部门意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">安全管理部门负责人</view>-->
-<!--					{{pd.AUDIT_USER_NAME}} {{pd.AUDIT_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>
@@ -315,10 +295,6 @@
 					<view class="cu-form-title">动火审批人意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">审批人</view>-->
-<!--					{{pd.APPROVE_USER_NAME}} {{pd.APPROVE_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>
@@ -333,10 +309,6 @@
 					<view class="cu-form-title">动火前验票负责人意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">动火前验票负责人</view>-->
-<!--					{{pd.MONITOR_USER_NAME}} {{pd.MONITOR_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>
@@ -355,7 +327,6 @@
 				<view class="wui-sign">
 					<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> -->
 				</view>
 				<view class="wui-sign-box wui-sign-box1"  v-show="imgList && imgList.length > 0">
 					<view class="sign-title">
@@ -548,119 +519,104 @@
 					current: 0
 				});
 			},
-			async goSubmit(STATUS){
-				var _this = this;
-				let required = true
-				uni.showLoading({
-					title: '请稍候'
-				})
-				if(STATUS==8) {
+      async goSubmit(STATUS) {
+        var _this = this;
+        let required = true
+        uni.showLoading({
+          title: '请稍候'
+        })
+        if (STATUS == 8) {
 
-					if (_this.imgList.length <= 0) {
-						uni.showToast({
-							icon: 'none',
-							title: '请签字',
-							duration: 1500
-						});
-						return;
-					}
-				}
-				var fileList = [];
-				var signtime = [];
-				const formData={}
-				Object.keys(this.pd).map(key => {
-					formData[key]=this.pd[key]
-				})
-				this.uploadImgFaults(fileList,signtime)
-				formData.SIGNTIME = signtime.join(",")
-				formData.CORPINFO_ID=corpinfoId
-				formData.CREATOR=loginUser.USER_ID
-				formData.OPERATOR=loginUser.USER_ID
-				formData.ACTION_USER=loginUser.NAME
-				formData.APPLY_STATUS=STATUS
-				if(STATUS==8){
-					// if (await this.getGasFlag()) {
-						if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
-							uni.showModal({
-								title: '',
-								content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
-								cancelColor: "#000000",
-								cancelText: '取消',
-								confirmText: '确定',
-								success: res => {
-									this.buttonloading = false
-									_this.goback()
-								}
-							})
-						}else {
-							if(new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() >0){
-								uni.showModal({
-									title: '',
-									content: '作业未开始之前不能进行验收',
-									cancelColor: "#000000",
-									cancelText: '取消',
-									confirmText: '确定',
-									success: res => {
-										this.buttonloading = false
-										_this.goback()
-									}
-								})
-							}else{
-							formData.STATUS = STATUS
-							this.buttonloading = true
-							uni.uploadFile({
-								url: basePath + '/app/hotwork/cfd/editAcceptStatus',
-								files: fileList,
-								formData:formData,
-								success: (res) => {
-									uni.showToast({
-										icon: 'none',
-										title: '保存成功',
-										duration: 2000
-									});
-									_this.goback()
-									this.buttonloading = false
-								},
-								fail: (err) => {
-									uni.hideLoading();
-									uni.showModal({
-										content: err.errMsg,
-										showCancel: false
-									});
-								}
-							})
-						}
-					}
-				}else{
-					formData.STATUS=STATUS
-					this.buttonloading = true
-					uni.request({
-						url: basePath + "/app/hotwork/cfd/editStatus",
-						method: 'POST',
-						dataType: 'json',
-						header:{
-							'Content-type':'application/x-www-form-urlencoded'
-						},
-						data: formData,
-						success: (res) => {
-							uni.showToast({
-								icon:'none',
-								title: '保存成功',
-								duration: 2000
-							});
-							_this.goback()
-							this.buttonloading = false
-						},
-						fail: (err) => {
-							uni.hideLoading();
-							uni.showModal({
-								content: err.errMsg,
-								showCancel: false
-							});
-						}
-					})
-				}
-			},
+          if (_this.imgList.length <= 0) {
+            uni.showToast({
+              icon: 'none',
+              title: '请签字',
+              duration: 1500
+            });
+            return;
+          }
+        }
+        var fileList = [];
+        var signtime = [];
+        const formData = {}
+        Object.keys(this.pd).map(key => {
+          formData[key] = this.pd[key]
+        })
+        this.uploadImgFaults(fileList, signtime)
+        formData.SIGNTIME = signtime.join(",")
+        formData.CORPINFO_ID = corpinfoId
+        formData.CREATOR = loginUser.USER_ID
+        formData.OPERATOR = loginUser.USER_ID
+        formData.ACTION_USER = loginUser.NAME
+        formData.APPLY_STATUS = STATUS
+        if (STATUS == 8) {
+          if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {
+            uni.showModal({
+              title: '',
+              content: '作业未开始之前不能进行验收',
+              cancelColor: "#000000",
+              cancelText: '取消',
+              confirmText: '确定',
+              success: res => {
+                this.buttonloading = false
+                _this.goback()
+              }
+            })
+          } else {
+            formData.STATUS = STATUS
+            this.buttonloading = true
+            uni.uploadFile({
+              url: basePath + '/app/hotwork/cfd/editAcceptStatus',
+              files: fileList,
+              formData: formData,
+              success: (res) => {
+                uni.showToast({
+                  icon: 'none',
+                  title: '保存成功',
+                  duration: 2000
+                });
+                _this.goback()
+                this.buttonloading = false
+              },
+              fail: (err) => {
+                uni.hideLoading();
+                uni.showModal({
+                  content: err.errMsg,
+                  showCancel: false
+                });
+              }
+            })
+          }
+        } else {
+          formData.STATUS = STATUS
+          this.buttonloading = true
+          uni.request({
+            url: basePath + "/app/hotwork/cfd/editStatus",
+            method: 'POST',
+            dataType: 'json',
+            header: {
+              'Content-type': 'application/x-www-form-urlencoded'
+            },
+            data: formData,
+            success: (res) => {
+              uni.showToast({
+                icon: 'none',
+                title: '保存成功',
+                duration: 2000
+              });
+              _this.goback()
+              this.buttonloading = false
+            },
+            fail: (err) => {
+              uni.hideLoading();
+              uni.showModal({
+                content: err.errMsg,
+                showCancel: false
+              });
+            }
+          })
+        }
+      },
 			getGasFlag(){
 				return new Promise((resolve,reject)=> {
 					if (this.gasList.length < 1) {
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 4d721ef..d34f822 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -63,11 +63,6 @@
 					<view v-else>{{pd.WORK_END_DATE}}</view>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">作业负责人：</view>-->
-<!--					<input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
 				<view class="cu-form-textarea">
 					<view style="display: flex;justify-content: space-between;align-items: center">
 						<view class="cu-form-title">动火人及证书编号：</view>
@@ -85,30 +80,6 @@
 					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全交底人：</view>-->
-<!--					<input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全教育人：</view>-->
-<!--					<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">接受交底人：</view>-->
-<!--					<input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">动火措施初审人：</view>-->
-<!--					<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-<!--        <view class="cu-form-group" >-->
-<!--          <view class="title">监护人：</view>-->
-<!--          <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
-<!--        </view>-->
-
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
@@ -210,6 +181,19 @@
               </view>
             </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 v-if="files.length > 0">
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
@@ -264,7 +248,6 @@
 				<view class="wui-sign">
 					<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> -->
 				</view>
 
 				<view class="wui-sign-box"  v-show="imgList && imgList.length > 0">
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 7dae74c..4aaa27e 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -85,30 +85,6 @@
 					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全交底人：</view>-->
-<!--					<input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全教育人：</view>-->
-<!--					<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">接受交底人：</view>-->
-<!--					<input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">动火措施初审人：</view>-->
-<!--					<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-<!--        <view class="cu-form-group" >-->
-<!--          <view class="title">监护人：</view>-->
-<!--          <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
-<!--        </view>-->
-
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
@@ -212,17 +188,20 @@
 						</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>
-					</view>
-				</view>
+        <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>
 				<view v-if="files.length > 0">
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 						<view class="cu-form-group" >
@@ -238,16 +217,26 @@
 						</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>
 					<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>
@@ -258,32 +247,24 @@
 					</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>-->
-<!--				</view>-->
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">监护人</view>-->
-<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_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.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
-<!--					</view>-->
-<!--					<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
-<!--						<image :src="baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
-<!--					</view>-->
-<!--				</view>-->
+        <view class="cu-form-textarea" style="border: none;">
+          <view class="cu-form-title">项目主管部门负责人意见</view>
+          <textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
+        </view>
+        <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
+          </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
+        </view>
 
 				<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>
@@ -298,10 +279,6 @@
 					<view class="cu-form-title">安全管理部门意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">安全管理部门负责人</view>-->
-<!--					{{pd.AUDIT_USER_NAME}} {{pd.AUDIT_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>
@@ -317,10 +294,6 @@
 					<view class="cu-form-title">动火审批意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">审批部门</view>-->
-<!--					{{pd.APPROVE_USER_NAME}} {{pd.APPROVE_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>
@@ -338,7 +311,6 @@
 				<view class="wui-sign">
 					<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> -->
 				</view>
 
 				<view class="wui-sign-box"  v-show="imgList && imgList.length > 0">
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 383881b..6f207bc 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
@@ -2,7 +2,7 @@
   <view>
     <cu-custom bgColor="bg-gradual-blueness" :isBack="true">
       <block slot="backText">返回</block>
-      <block slot="content">所在单位意见</block>
+      <block slot="content">项目主管部门意见</block>
     </cu-custom>
     <scroll-view scroll-y="false">
       <view class="form">
@@ -237,13 +237,12 @@
             </view>
           </view>
 
-
           <view class="cu-form-textarea" style="border-bottom:  1px dashed #eee;">
-            <view class="cu-form-title">所在单位意见</view>
+            <view class="cu-form-title">项目主管部门意见</view>
             <textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>
           </view>
           <view class="wui-sign">
-            <view class="title">所在单位负责人</view>
+            <view class="title">项目主管部门负责人</view>
             <button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
           </view>