From ca3dd0a35abc5a4aeb44eb45eed60cc828929456 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sun, 4 Feb 2024 14:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=95=E4=BA=BA=E5=8F=98=E5=A4=9A=E4=BA=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/application/eight-assignments/index.vue | 14 +--
 .../hotwork-acceptconfess-detail.vue          | 87 +++----------------
 .../hotwork-acceptconfess-list.vue            |  2 +-
 .../hotwork-guardian-detail.vue               | 49 +++--------
 .../hotwork-guardian-list.vue                 |  2 +-
 5 files changed, 32 insertions(+), 122 deletions(-)

diff --git a/pages/application/eight-assignments/index.vue b/pages/application/eight-assignments/index.vue
index f2d0934..b975b75 100644
--- a/pages/application/eight-assignments/index.vue
+++ b/pages/application/eight-assignments/index.vue
@@ -75,23 +75,13 @@
           <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list">
             <view class="imgs action">
               <image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
-              <view v-if="count.xiangMuNum" class="cu-tag badge">{{count.xiangMuNum}}</view>
+              <view v-if="count.belongingNum" class="cu-tag badge">{{count.belongingNum}}</view>
             </view>
             <view class="text-semi"  style="text-align: center;">
               <view>项目主管部门</view>
               <view>负责人意见</view>
             </view>
           </navigator>
-          <!--					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-guardian/hotwork-guardian-list">-->
-          <!--						<view class="imgs action">-->
-          <!--							<image src="../../../static/icon-apps/icon-zl-9.png" mode=""></image>-->
-          <!--							<view v-if="count.COUNTGUARDIAN" class="cu-tag badge">{{count.COUNTGUARDIAN}}</view>-->
-          <!--						</view>-->
-          <!--						<view class="text-semi"  style="text-align: center;">-->
-          <!--							<view>监护人</view>-->
-          <!--							<view>意见</view>-->
-          <!--						</view>-->
-          <!--					</navigator>-->
           <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list">
             <view class="imgs action">
               <image src="../../../static/icon-apps/icon-807.png" mode=""></image>
@@ -161,7 +151,7 @@
           <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list">
             <view class="imgs action">
               <image src="../../../static/icon-apps/icon-aq-1_cfd.png" mode=""></image>
-              <view v-if="count.COUNTCONFESS" class="cu-tag badge">{{count.COUNTCONFESS}}</view>
+              <view v-if="count.confessNum" class="cu-tag badge">{{count.confessNum}}</view>
             </view>
             <view class="text-semi" style="text-align: center;">
               <view>安全交底人</view>
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 77cfd89..52b914b 100644
--- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-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>
@@ -84,31 +78,6 @@
 						<view class="cu-form-title">风险辨识结果：</view>
 						<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;" v-if="pd.APPLY_STATUS > 1">
@@ -164,7 +133,6 @@
 					<view>
 						<view class="cu-form-textarea">
 							<view class="cu-form-title">其他安全措施：</view>
-<!--							<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>-->
 						</view>
 						<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
 							<text class="title">
@@ -185,17 +153,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">
+            <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="pd.ACCEPT_CONFESS_USER_SIGNER_PATH">
 						<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 							<view class="cu-form-group" >
@@ -214,10 +185,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>
@@ -233,10 +200,6 @@
 							<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>
@@ -252,10 +215,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>
@@ -271,10 +230,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>
@@ -290,10 +245,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>
@@ -309,10 +260,6 @@
 							<view class="cu-form-title">完工验收</view>
 							<textarea maxlength="255" disabled="disabled" v-model="pd.ACCEPT_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.ACCEPT_USER_NAME}} {{pd.ACCEPT_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>
@@ -323,17 +270,11 @@
 							</view>
 						</view>
 					</view>
-
-					<!--				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">-->
-					<!--					<view class="cu-form-title">监护人意见</view>-->
-					<!--					<textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>-->
-					<!--				</view>-->
 					<view class="wui-sign" v-if="!files.length">
 						<view class="title">接受交底人</view>
 						<view>
 							<view>
 								<button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">新增手写签字</button>
-								<!-- <button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button> -->
 							</view>
 						</view>
 					</view>
diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue
index 0df734b..3cb0b6d 100644
--- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue
@@ -79,7 +79,7 @@
 								<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
 								<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
 							</text>
-							<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+							<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
 						</view>
 						<view class="dy-subtitle-flex">
 							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
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 40ad4f3..adc32a6 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -85,30 +85,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;" v-if="pd.APPLY_STATUS > 1">
@@ -186,17 +162,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">
+          <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" >
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue
index 80473bb..f99e542 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue
@@ -79,7 +79,7 @@
 								<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
 								<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
 							</text>
-							<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+							<text v-if="item.APPLY_STATUS<=0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
 						</view>
 						<view class="dy-subtitle-flex">
 							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"