From e7107158cfc2b6d37fb6bc6d59591947924c099d Mon Sep 17 00:00:00 2001
From: guoyuepeng <770272267@qq.com>
Date: Wed, 8 Nov 2023 09:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                     |  2 +-
 .../branch-information/detail.vue                 | 15 +++++++++++++++
 .../hidden-management/list.vue                    | 15 ++++++++-------
 .../hidden-management/view.vue                    | 11 +++++++----
 .../penalty-management/list.vue                   |  8 ++++----
 .../penalty-management/viewHidden.vue             |  6 +++++-
 .../safety-environmental-inspection/list.vue      |  1 +
 7 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/manifest.json b/manifest.json
index 96f7c57..9a05603 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "秦港双控-监管端",
     "appid" : "__UNI__DB65C6B",
     "description" : "秦港双控-监管端",
-    "versionName" : "01.00.42",
+    "versionName" : "01.00.44",
     "versionCode" : 42,
     "transformPx" : false,
     /* 5+App特有相关  
diff --git a/pages/branch-information-management/branch-information/detail.vue b/pages/branch-information-management/branch-information/detail.vue
index 0f1ab02..60fdbea 100644
--- a/pages/branch-information-management/branch-information/detail.vue
+++ b/pages/branch-information-management/branch-information/detail.vue
@@ -114,6 +114,21 @@
           </u-cell>
         </u-cell-group>
       </view>
+	  <view class="card" v-if="form.SAFETY_NAME">
+	    <view class="view-title">
+	      <u--text text="安全负责人信息" bold></u--text>
+	    </view>
+	    <u-cell-group :border="false" class="mt-10">
+	      <u-cell>
+	        <view slot="title" class="title">姓名：</view>
+	        <view slot="value">{{ form.SAFETY_NAME }}</view>
+	      </u-cell>
+	      <u-cell>
+	        <view slot="title" class="title">手机号码：</view>
+	        <view slot="value">{{ form.SAFETY_PHONE }}</view>
+	      </u-cell>
+	    </u-cell-group>
+	  </view>
     </template>
     <template v-if="subsectionCurrent === 1">
       <u-list v-if="list.length > 0">
diff --git a/pages/key-project-management/hidden-management/list.vue b/pages/key-project-management/hidden-management/list.vue
index 40d4c59..7ee9c2d 100644
--- a/pages/key-project-management/hidden-management/list.vue
+++ b/pages/key-project-management/hidden-management/list.vue
@@ -40,12 +40,13 @@
           </view>
           <view class="flex-end mt-10 subtitle">
             <u-button 	
-			v-if="item.ISPUNISH !== '2' 
-			&& item.CREATOR == userInfo.USER_ID
-			|| tabsType === '2'
+			v-if="item.CREATOR == userInfo.USER_ID
+			&& tabsType === '1'
 			"
-			type="primary" :text="tabsType === '1' ? '验收' : '查看'" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID)"></u-button>
-            <!-- <u-button 
+			type="primary" text="验收" size="mini" class="bth-mini" @click="fnNavigatorDetail(item.HIDDEN_ID,'acceptance')"></u-button>
+            <u-button
+            type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnNavigatorDetail(item.HIDDEN_ID,'view')"></u-button>
+			<!-- <u-button 
 			v-if="item.ISPUNISH !== '2'  
 			&& !item.KEYPROJECTPUNISH_ID
 			&& item.PUNISH_THE_PERSON
@@ -186,12 +187,12 @@ export default {
       this.list = []
       this.getData()
     },
-    fnNavigatorDetail(HIDDEN_ID){
+    fnNavigatorDetail(HIDDEN_ID,type){
       uni.$u.route({
         url: '/pages/key-project-management/hidden-management/view',
         params: {
           HIDDEN_ID,
-          type: this.tabsType === '1' ? 'acceptance' : 'view'
+          type: type 
         }
       })
     },
diff --git a/pages/key-project-management/hidden-management/view.vue b/pages/key-project-management/hidden-management/view.vue
index c37add1..ccf33a0 100644
--- a/pages/key-project-management/hidden-management/view.vue
+++ b/pages/key-project-management/hidden-management/view.vue
@@ -95,12 +95,12 @@
             </u-row>
           </view>
         </u-cell>
-        <view class="card">
+        <view class="card" v-show="type === 'acceptance'||hiddenData.STATE==='4'">
           <view class="view-title">
-            <u--text text="隐患验收"></u--text>
+            <u--text text="验收信息"></u--text>
           </view>
         </view>
-        <u-cell>
+        <u-cell v-if="type === 'acceptance'||hiddenData.STATE==='4'">
           <view slot="title" class="title required">验收时间：</view>
           <view slot="value">
             <text @click="type === 'view' ? null : timeShow = true">{{ CHECKTIME || '请选择' }}</text>
@@ -110,7 +110,7 @@
                                @confirm="timeConfirm"></u-datetime-picker>
           </view>
         </u-cell>
-        <u-cell class="flex-none">
+        <u-cell class="flex-none" v-if="type === 'acceptance'||hiddenData.STATE==='4'">
           <view slot="title" class="title required">验收图片：</view>
           <view slot="value" class="mt-10">
             <u-upload
@@ -235,6 +235,9 @@ export default {
       this.form.CHECKTIME = resData.pd.CHECKTIME
       this.form.ISPUNISH = resData.pd.ISPUNISH
 	  this.punishForm = resData.pd.punishForm
+	  if(this.punishForm){
+	  		  this.punishForm.HANDLE_IMG = this.$store.state.filePath +this.punishForm.HANDLE_IMG;
+	  }
     },
     previewVideo(videoUrl){
       this.modalShow = true;
diff --git a/pages/key-project-management/penalty-management/list.vue b/pages/key-project-management/penalty-management/list.vue
index 3b8ad6a..8dc5fe5 100644
--- a/pages/key-project-management/penalty-management/list.vue
+++ b/pages/key-project-management/penalty-management/list.vue
@@ -53,7 +53,7 @@
 			<view v-if="punishForm.ISPUNISH==1">
 			  <u-cell>
 				<view slot="title" class="title required">
-				  处罚原因：
+				  处罚原因:
 				</view>
 				<view slot="value">
 				  <u--input v-model="punishForm.REASON" border="none" inputAlign="right"></u--input>
@@ -61,9 +61,9 @@
 			  </u-cell>
 			  <u-cell>
 				<view slot="title" class="title required">
-				  处罚金额(元)：
+				  处罚金额(元):
 				</view>
-				<view slot="value">
+				<view slot="value" style="flex: 1;">
 				  <u--input v-model="punishForm.AMOUT" border="none" type="number" inputAlign="right"></u--input>
 				</view>
 			  </u-cell>
@@ -208,7 +208,7 @@ export default {
 		editHiddenIspunish({
 			  ...this.punishForm,
 			  ISPUNISH:Ispunish,
-			  PUNISH_PERSON:UserInfo.USER_ID
+			  PUNISH_PERSON:this.userInfo.USER_ID
 		  })
 		  this.punishForm= {
 		  	HIDDEN_ID: '',
diff --git a/pages/key-project-management/penalty-management/viewHidden.vue b/pages/key-project-management/penalty-management/viewHidden.vue
index 1bfc8d8..e49a1a8 100644
--- a/pages/key-project-management/penalty-management/viewHidden.vue
+++ b/pages/key-project-management/penalty-management/viewHidden.vue
@@ -97,7 +97,7 @@
         </u-cell>
         <view class="card" v-show="hiddenData.STATE==='4'">
           <view class="view-title">
-            <u--text text="隐患验收"></u--text>
+            <u--text text="验收信息"></u--text>
           </view>
         </view>
         <u-cell v-show="hiddenData.STATE==='4'">
@@ -221,6 +221,7 @@ export default {
         resData.pd.zgImgs[j].url =
             this.$store.state.filePath + resData.pd.zgImgs[j].FILEPATH;
       }
+	  console.log(this.$store.state.filePath);
       for (let j = 0; j < resData.pd.ysImgs.length; j++) {
         resData.pd.ysImgs[j].url =
             this.$store.state.filePath + resData.pd.ysImgs[j].FILEPATH;
@@ -230,6 +231,9 @@ export default {
       this.form.CHECKTIME = resData.pd.CHECKTIME
       this.form.ISPUNISH = resData.pd.ISPUNISH
 	  this.punishForm = resData.pd.punishForm
+	  if(this.punishForm){
+		  this.punishForm.HANDLE_IMG = this.$store.state.filePath +this.punishForm.HANDLE_IMG;
+	  }
     },
     previewVideo(videoUrl){
       this.modalShow = true;
diff --git a/pages/key-project-management/safety-environmental-inspection/list.vue b/pages/key-project-management/safety-environmental-inspection/list.vue
index 1dea264..8e76b1a 100644
--- a/pages/key-project-management/safety-environmental-inspection/list.vue
+++ b/pages/key-project-management/safety-environmental-inspection/list.vue
@@ -80,6 +80,7 @@ export default {
         showCount: this.pageSize,
         currentPage: this.currentPage,
 		UserId: this.userInfo.USER_ID,
+		STATE:'1'
       });
       this.list = [...this.list,...resData.varList];
       this.totalPage = resData.page.totalPage;