fix:4、禁闭管理涉及问题下发详情

src/components/negative/dialog.vue

@@ -179,7 +179,7 @@
                             "
                         >
 <!--                          核查办理（查看）-->
-                            <negative-verify-description />
+                            <negative-verify-description :ConfinementData="ConfinementDataList" />
                         </template>
                         <template v-if="approves.length">
 <!--                          审批意见-->
@@ -424,6 +424,7 @@ import { getDictLable } from "@/utils/util";
 
 import useCatchStore from "@/stores/modules/catch";
 import { nextTick, onMounted } from "vue";
+import {getConfinementListAll} from "@/api/work/confinement";
 
 const dict = useCatchStore().getDicts([
     "processingStatus",
@@ -455,6 +456,7 @@ const signReturns = ref([]);
 const approves = ref([]);
 const extensionApply = ref({});
 const countersignApplys = ref([]);
+const ConfinementDataList =ref([])
 provide("negative", negative);
 provide("actionHistory", actionHistory);
 provide("signReturns", signReturns);
@@ -471,6 +473,7 @@ watch(
     () => props.id,
     () => {
         getDetails();
+        getConfinementData()
         verifyEditFlag.value = false;
         formData.value = {};
     }
@@ -565,6 +568,7 @@ async function handleExecute(action, data) {
         emit("close");
         return;
     }
+    getConfinementData();
     getDetails();
 }
 
@@ -583,7 +587,22 @@ function handleFav() {
 }
 
 const spotCheckEditFlag = ref(false);
+let confinementQuery = ref({
+  current: 1,
+  size: 10000,
+  departBranch: false
+})
 
+
+
+/**
+ * 获取禁闭信息
+ * */
+async function  getConfinementData(){
+  const res = await getConfinementListAll(confinementQuery.value);
+  ConfinementDataList.value= res.records;
+
+}
 function spotCheck() {
     spotCheckEditFlag.value = true;
 }

src/components/negative/verify-description.vue

@@ -27,7 +27,7 @@
                     <label>整改限制</label>
                     <span>{{ `${negative.rectifyRestrictionDays}天` }}</span>
                 </div>
-                
+
             </div>
             <div class="row" v-if="negative.checkStatusDesc">
                 <div class="col col-24">
@@ -149,6 +149,22 @@
                     <label>督察措施</label>
                     <span>{{ blame.superviseMeasuresName }}</span>
                 </div>
+
+            </div>
+            <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 v-perms="['negative:score']">
                 <div
@@ -157,7 +173,7 @@
                         (item) => blame.blameIdCode === item.idCode
                     )"
                     :key="item"
-                    
+
                 >
                     <div class="col col-6">
                         <label>问题分值</label>
@@ -199,10 +215,27 @@
                         <span v-if="blame.leadHandleResultNameOther">({{ blame.leadHandleResultNameOther }})</span>
                     </span>
                 </div>
-                <div class="col col-6" v-if="blame.leadProtectRightsName">
+
-                    <label>维权容错</label>
+            </div>
-                    <span>{{ blame.leadProtectRightsName }}</span>
+          <div class="row" style="background: #f5f5f5">
-                </div>
+            <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">
+              <div class="col col-6" v-if="blame.leadProtectRightsName">
+                <label>维权容错</label>
+                <span>{{ blame.leadProtectRightsName }}</span>
+              </div>
             </div>
         </el-collapse-item>
         <el-collapse-item
@@ -273,7 +306,7 @@
             </template>
             <file-list :files="negative.files" />
         </el-collapse-item>
-        
+
     </el-collapse>
 </template>
 <script setup>
@@ -282,6 +315,7 @@ import { BlameType, ProblemSources } from "@/enums/dictEnums";
 import { ProcessingStatus } from "@/enums/flowEnums";
 import { getDictLable } from "@/utils/util";
 import useCatchStore from "@/stores/modules/catch";
+import {getConfinementListAll} from "@/api/work/confinement";
 
 const dict = useCatchStore().getDicts([
     "accountabilityTarget",
@@ -297,6 +331,27 @@ const activeNames = ref([
     "completed",
 ]);
 const negative = inject("negative");
+console.log(negative)
+
+let props = defineProps(['ConfinementData'])
+/**
+ * 禁闭信息入参
+ * */
+
+
+/**
+ * 警员禁闭处罚
+ * */
+function  rtuenConfinementData(val){
+  return  props.ConfinementData?.find(s=>s.id === val.confinementId);
+}
+/**
+ * 领导禁闭处罚
+ * */
+function  rtuenLeadConfinementData(val){
+  return   props.ConfinementData?.find(s=>s.id === val.leadConfinementId);
+}
+
 
 for (
     let i = 0;
@@ -313,4 +368,4 @@ for (
     --el-collapse-header-text-color: var(--primary-color);
     --el-collapse-header-font-size: 16px;
 }
-</style>
+</style>

src/components/negative/verify.vue

@@ -950,7 +950,7 @@
                     <el-select
                         filterable
                         :filter-method="fileConfinement"
-                        :prop="`blameLeaders.${index}.leadonfinementId`"
+                        v-model="item.leadConfinementId"
                          popper-class="widthClass" >
                       <template #header>
                         <el-row>