From 7545d06ce5e03e09669060afc624df01e4119480 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Fri, 23 May 2025 12:37:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E5=8E=BB=E9=99=A4=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=A6=81=E9=97=AD=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../negative/verify-description.vue           | 84 +++++++++++--------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/components/negative/verify-description.vue b/src/components/negative/verify-description.vue
index 11a55b7..07909b7 100644
--- a/src/components/negative/verify-description.vue
+++ b/src/components/negative/verify-description.vue
@@ -151,21 +151,21 @@
                 </div>
 
             </div>
-            <div class="row">
+<!--            <div class="row">-->
 
-              <div class="col col-12" v-if="rtuenConfinementData(blame)">
-                <label>禁闭时间</label>
-                <span >{{rtuenConfinementData(blame).startTime+ "   -   " + rtuenConfinementData(blame).endTime}}</span>
-              </div>
-              <div class="col col-4" v-if="rtuenConfinementData(blame)">
-                <label>禁闭时长（天）</label>
-                <span >{{rtuenConfinementData(blame).confinementTime}}</span>
-              </div>
-              <div class="col col-24" v-if="rtuenConfinementData(blame)">
-                <label>禁闭措施</label>
-                <span>{{rtuenConfinementData(blame).matter}}</span>
-              </div>
-            </div>
+<!--              <div class="col col-12" v-if="blame.ConfinementData">-->
+<!--                <label>禁闭时间</label>-->
+<!--                <span >{{blame.ConfinementData.startTime+ "   -   " + blame.ConfinementData.endTime}}</span>-->
+<!--              </div>-->
+<!--              <div class="col col-4" v-if="blame.ConfinementData">-->
+<!--                <label>禁闭时长（天）</label>-->
+<!--                <span >{{blame.ConfinementData.confinementTime}}</span>-->
+<!--              </div>-->
+<!--              <div class="col col-24" v-if="blame.ConfinementData">-->
+<!--                <label>禁闭措施</label>-->
+<!--                <span>{{blame.ConfinementData.matter}}</span>-->
+<!--              </div>-->
+<!--            </div>-->
             <div v-perms="['negative:score']">
                 <div
                     class="row"
@@ -217,20 +217,22 @@
                 </div>
 
             </div>
-          <div class="row" style="background: #f5f5f5">
-            <div class="col col-12" v-if="rtuenLeadConfinementData(blame)">
-              <label>禁闭时间</label>
-              <span >{{rtuenLeadConfinementData(blame).startTime+ "   -   " + rtuenLeadConfinementData(blame).endTime}}</span>
-            </div>
-            <div class="col col-4" v-if="rtuenLeadConfinementData(blame)">
-              <label>禁闭时长（天）</label>
-              <span >{{rtuenLeadConfinementData(blame).confinementTime}}</span>
-            </div>
-            <div class="col col-24" v-if="rtuenLeadConfinementData(blame)">
-              <label>禁闭措施</label>
-              <span>{{rtuenLeadConfinementData(blame).matter}}</span>
-            </div>
-          </div>
+<!--          <div class="row" style="background: #f5f5f5" v-if="blame.leadConfinement">-->
+<!--            <div class="col col-12"v-if="blames.leadConfinement" >-->
+<!--              <label>禁闭时间</label>-->
+<!--              <span >{{blames.leadConfinement.startTime+ "   -   " + blames.leadConfinement.endTime}}</span>-->
+<!--            </div>-->
+<!--            <div class="col col-4" v-if="blames.leadConfinement">-->
+<!--              <label>禁闭时长（天）</label>-->
+<!--              <span >{{blames.leadConfinement.confinementTime}}</span>-->
+<!--            </div>-->
+<!--            <div class="col col-24" v-if="blames.leadConfinement">-->
+<!--              <label>禁闭措施</label>-->
+<!--              <span>{{blames.leadConfinement.matter}}</span>-->
+<!--            </div>-->
+<!--          </div>-->
+
+
             <div class="row" style="background: #f5f5f5">
               <div class="col col-6" v-if="blame.leadProtectRightsName">
                 <label>维权容错</label>
@@ -330,7 +332,7 @@ const activeNames = ref([
     "completionAttachment",
     "completed",
 ]);
-const negative = inject("negative");
+let negative = inject("negative");
 console.log(negative)
 
 let ConfinementDataList= ref([])
@@ -347,10 +349,10 @@ let confinementQuery = ref({
  * 警员禁闭处罚
  * */
 function  rtuenConfinementData(val){
-  const data =  getConfinementData(val)
 
+  const data =  getConfinementData(val.confinementId)
   if(Array.isArray(data)){
-    data.find(s=>s.id === val.confinementId)
+    val.ConfinementData[index]= data.find(s=>s.id === val.confinementId)
   }else{
     return  null;
   }
@@ -359,13 +361,29 @@ function  rtuenConfinementData(val){
  * 领导禁闭处罚
  * */
 function  rtuenLeadConfinementData(val){
-  const data =  getConfinementData(val)
+  const data =  getConfinementData(val.leadConfinementId)
   if(Array.isArray(data)){
-    data.find(s=>s.id === val.leadConfinementId)
+    val.leadConfinement[index]=  data.find(s=>s.id === val.leadConfinementId)
   }else{
     return  null;
   }
 }
+
+// watch(()=>negative,()=>{
+//   console.log('00001010101')
+//   console.log(negative)
+//   if(negative.value.blames){
+//       for (let item in negative.value.blames){
+//         rtuenConfinementData(item)
+//       }
+//   }
+//
+//   if(negative.value.blames){
+//     for (let item in negative.value.blames){
+//       rtuenLeadConfinementData(item)
+//     }
+//   }
+// },{immediate:true,deep:true})
 /**
  * 获取禁闭信息
  * */