From 492fa391b3f660c211b81b6c5363ab0c9b6b2cac Mon Sep 17 00:00:00 2001
From: liy <3101763317@qq.com>
Date: Thu, 29 Aug 2024 08:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8D=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/sign/sign.vue                      |  1 -
 .../branch-information/qualification.vue      |  4 +++-
 .../detail.vue                                |  3 ++-
 .../initiate/detail.vue                       | 24 +++++++++++--------
 .../inspector-archives/detail.vue             | 19 ++++++++++-----
 .../inspector-confirms/detail.vue             | 14 ++++++-----
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/components/sign/sign.vue b/components/sign/sign.vue
index 515f37f..d444aae 100644
--- a/components/sign/sign.vue
+++ b/components/sign/sign.vue
@@ -63,7 +63,6 @@
     },
     mounted() {
       uni.$on("getSignImg", ({ base64, path }) => {
-        console.log({ base64, path })
         this.$emit('confirm', {id: '', filePath: base64});
         this.fnClose();
       });
diff --git a/pages/branch-information-management/branch-information/qualification.vue b/pages/branch-information-management/branch-information/qualification.vue
index 6d51e68..4f70474 100644
--- a/pages/branch-information-management/branch-information/qualification.vue
+++ b/pages/branch-information-management/branch-information/qualification.vue
@@ -67,5 +67,7 @@ export default {
 </script>
 
 <style scoped>
-
+.title {
+  min-width: 150rpx;
+}
 </style>
diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue
index 3dbdf27..0c73f1e 100644
--- a/pages/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/key-project-management/safety-environmental-inspection/detail.vue
@@ -109,7 +109,7 @@
                 <uni-th align="center">隐患描述</uni-th>
                 <uni-th align="center">操作</uni-th>
               </uni-tr>
-              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.HIDDEN_ID || item.id">
+              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.id">
                 <uni-td>{{ index + 1 }}</uni-td>
                 <uni-td>{{ item.HIDDENPART }}</uni-td>
                 <uni-td>{{ item.HIDDENDESCR }}</uni-td>
@@ -457,6 +457,7 @@ export default {
     async fnGetKeyProjectsCheckView() {
       let resData = await getKeyProjectsCheckView({KEYPROJECTCHECK_ID: this.KEYPROJECTCHECK_ID})
       for (let i = 0; i < resData.pd.hiddenList.length; i++) {
+        resData.pd.hiddenList[i].id = resData.pd.hiddenList[i].HIDDEN_ID
         for (let j = 0; j < resData.pd.hiddenList[i].hiddenImgs.length; j++) {
           resData.pd.hiddenList[i].hiddenImgs[j].url = this.$store.state.filePath + resData.pd.hiddenList[i].hiddenImgs[j].FILEPATH
         }
diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue
index 550367e..4921071 100644
--- a/pages/safety-environmental-inspection/initiate/detail.vue
+++ b/pages/safety-environmental-inspection/initiate/detail.vue
@@ -76,12 +76,10 @@
           </view>
         </u-cell>
         <u-cell class="flex-none">
-          <view slot="value">
-            <view class="pr mt-10" v-for="(item,index) in form.situationList" :key="item.id">
-              <u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" :disabled="disabled"></u--textarea>
-              <u-badge value="X" type="error" :offset="[-9,-10]" absolute
-                       @click.native="removeSituation(item,index)" v-if="!disabled"></u-badge>
-            </view>
+          <view class="pr mt-10 textarea-box" v-for="(item,index) in form.situationList" :key="item.id">
+            <u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" :disabled="disabled"></u--textarea>
+            <u-badge value="X" type="error" :offset="[-9,-10]" absolute
+                     @click.native="removeSituation(item,index)" v-if="!disabled"></u-badge>
           </view>
         </u-cell>
         <u-cell>
@@ -152,7 +150,7 @@
         <template v-for="item in form.inspectorVerifyList" v-if="!type||!(type==='add' || type==='edit')">
           <u-cell class="flex-none" v-show="item.INSPECTION_USER_OPINION">
             <view slot="title" class="title">检查人意见：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="item.INSPECTION_USER_OPINION" disabled placeholder="请输入检查人意见"></u--textarea>
             </view>
           </u-cell>
@@ -181,7 +179,7 @@
         <template v-if="type&&(type==='add' || type==='edit')">
           <u-cell class="flex-none">
             <view slot="title" class="title">检查人意见：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="form.INSPECTION_USER_OPINION" placeholder="请输入检查人意见"></u--textarea>
             </view>
           </u-cell>
@@ -257,7 +255,7 @@
           </u-cell>
           <u-cell class="flex-none">
             <view slot="title" class="title required">隐患描述：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="hiddenForm.HIDDENDESCR" placeholder="请输入隐患描述"
                            :disabled="popupDisabled"></u--textarea>
             </view>
@@ -317,7 +315,7 @@
           </u-cell>
           <u-cell class="flex-none">
             <view slot="title" class="title">隐患位置描述：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="hiddenForm.POSITIONDESC" placeholder="请输入隐患位置描述"
                            :disabled="popupDisabled"></u--textarea>
             </view>
@@ -968,4 +966,10 @@ export default {
 .flex-1 {
   flex: 1;
 }
+.title {
+  min-width: 170rpx;
+}
+.textarea-box {
+  width: 100%;
+}
 </style>
diff --git a/pages/safety-environmental-inspection/inspector-archives/detail.vue b/pages/safety-environmental-inspection/inspector-archives/detail.vue
index 9fcb445..229a86c 100644
--- a/pages/safety-environmental-inspection/inspector-archives/detail.vue
+++ b/pages/safety-environmental-inspection/inspector-archives/detail.vue
@@ -59,7 +59,7 @@
           <view slot="title" class="title">检查情况：</view>
         </u-cell>
         <u-cell class="flex-none">
-          <view slot="value">
+          <view slot="value textarea-box">
             <view class="pr mt-10" v-for="(item,index) in form.situationList" :key="item.id">
               <u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" disabled></u--textarea>
             </view>
@@ -100,7 +100,7 @@
                 <uni-th align="center">隐患描述</uni-th>
                 <uni-th align="center">操作</uni-th>
               </uni-tr>
-              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.HIDDEN_ID || item.id">
+              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.id">
                 <uni-td>{{ index + 1 }}</uni-td>
                 <uni-td>{{ item.HIDDENPART_NAME }}</uni-td>
                 <uni-td>{{ item.HIDDENDESCR }}</uni-td>
@@ -116,7 +116,7 @@
         <template v-for="item in form.inspectorVerifyList">
           <u-cell class="flex-none" v-show="item.INSPECTION_USER_OPINION">
             <view slot="title" class="title">检查人意见：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="item.INSPECTION_USER_OPINION" disabled placeholder="请输入检查人意见"></u--textarea>
             </view>
           </u-cell>
@@ -173,7 +173,7 @@
           </u-cell>
           <u-cell class="flex-none">
             <view slot="title" class="title required">隐患描述：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="hiddenForm.HIDDENDESCR" placeholder="请输入隐患描述" disabled></u--textarea>
             </view>
           </u-cell>
@@ -216,7 +216,7 @@
           </u-cell>
           <u-cell class="flex-none">
             <view slot="title" class="title required">隐患位置描述：</view>
-            <view slot="value" class="mt-10">
+            <view slot="value" class="mt-10 textarea-box">
               <u--textarea v-model="hiddenForm.POSITIONDESC" placeholder="请输入隐患位置描述" disabled></u--textarea>
             </view>
           </u-cell>
@@ -301,6 +301,7 @@ export default {
     async fnGetSafetyenvironmentalGoEdit() {
       let resData = await getSafetyenvironmentalGoEdit({INSPECTION_ID: this.INSPECTION_ID})
       for (let i = 0; i < resData.pd.hiddenList.length; i++) {
+        resData.pd.hiddenList[i].id = resData.pd.hiddenList[i].HIDDEN_ID
         for (let j = 0; j < resData.pd.hiddenList[i].hiddenImgs.length; j++) {
           resData.pd.hiddenList[i].hiddenImgs[j].url = this.$store.state.filePath + resData.pd.hiddenList[i].hiddenImgs[j].FILEPATH
         }
@@ -333,5 +334,11 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
+.title {
+  min-width: 170rpx;
+}
+.textarea-box {
+  width: 100%;
+}
 </style>
diff --git a/pages/safety-environmental-inspection/inspector-confirms/detail.vue b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
index 5a6b466..e9b92dc 100644
--- a/pages/safety-environmental-inspection/inspector-confirms/detail.vue
+++ b/pages/safety-environmental-inspection/inspector-confirms/detail.vue
@@ -59,10 +59,8 @@
           <view slot="title" class="title">检查情况：</view>
         </u-cell>
         <u-cell class="flex-none">
-          <view slot="value">
-            <view class="pr mt-10" v-for="(item,index) in form.situationList" :key="item.id">
-              <u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" disabled></u--textarea>
-            </view>
+          <view class="pr mt-10" v-for="(item,index) in form.situationList" :key="item.id">
+            <u--textarea v-model="item.SITUATION" placeholder="请输入检查情况" disabled></u--textarea>
           </view>
         </u-cell>
         <u-cell>
@@ -100,7 +98,7 @@
                 <uni-th align="center">隐患描述</uni-th>
                 <uni-th align="center">操作</uni-th>
               </uni-tr>
-              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.HIDDEN_ID || item.id">
+              <uni-tr v-for="(item,index) in form.hiddenList" :key="item.id">
                 <uni-td>{{ index + 1 }}</uni-td>
                 <uni-td>{{ item.HIDDENPART_NAME?item.HIDDENPART_NAME:item.HIDDENPART }}</uni-td>
                 <uni-td>{{ item.HIDDENDESCR }}</uni-td>
@@ -358,6 +356,7 @@ export default {
     async fnGetSafetyenvironmentalGoEdit() {
       let resData = await getSafetyenvironmentalGoEdit({INSPECTION_ID: this.INSPECTION_ID})
       for (let i = 0; i < resData.pd.hiddenList.length; i++) {
+        resData.pd.hiddenList[i].id = resData.pd.hiddenList[i].HIDDEN_ID
         for (let j = 0; j < resData.pd.hiddenList[i].hiddenImgs.length; j++) {
           resData.pd.hiddenList[i].hiddenImgs[j].url = this.$store.state.filePath + resData.pd.hiddenList[i].hiddenImgs[j].FILEPATH
         }
@@ -427,5 +426,8 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
+.title {
+  min-width: 150rpx;
+}
 </style>