fix:禁闭关联详情

src/components/negative/dialog.vue

@@ -530,14 +530,17 @@ const getConfinementData=()=>{
  * */
 function  rtuenConfinementData(val,index){
   confinementQuery.value.id = val.confinementId
-  getConfinementListAll(confinementQuery.value).then((res)=>{
+  if(val.confinementId){
-    const data = res.records;
+    getConfinementListAll(confinementQuery.value).then((res)=>{
-    if(Array.isArray(data)){
+      const data = res.records;
-      negative.value.blames[index].ConfinementData= data[0]
+      if(Array.isArray(data)){
-    }else{
+        negative.value.blames[index].ConfinementData= data[0]
-      return  null;
+      }else{
-    }
+        return  null;
-  })
+      }
+    })
+  }
+
 
 }
 /**
@@ -545,15 +548,17 @@ function  rtuenConfinementData(val,index){
  * */
 async function  rtuenLeadConfinementData(val,index){
   confinementQuery.value.id = val.leadConfinementId
-  getConfinementListAll(confinementQuery.value).then((res)=>{
+ if(val.leadConfinementId){
-    const data = res.records;
+   getConfinementListAll(confinementQuery.value).then((res)=>{
-    if(Array.isArray(data)){
+     const data = res.records;
-      negative.value.blames[index].leadConfinement= data[0]
+     if(Array.isArray(data)){
-
+       negative.value.blames[index].leadConfinement= data[0]
-    }else{
+
-      return  null;
+     }else{
-    }
+       return  null;
-  })
+     }
+   })
+ }
 }
 
 

src/views/work/Confinement.vue

@@ -190,15 +190,16 @@ const handleDetail = (row) => {
   formData.value.gender = gender
   formData.value.age = age
   formData.value.birthTime = birthTime
-
   detailShow.value=true
 }
 /**
  * 删除数据
  * */
 const handleDel = async (row) => {
+  await feedback.confirm("确定要删除该数据？");
   const res = await DelConfinementById(row.id);
   getList()
+  feedback.msgSuccess("删除成功");
 }
 /**
  * 编辑
@@ -721,13 +722,13 @@ onMounted(() => {
             <el-col :span="12">
               <el-form-item label="出生日期" prop="birthTime">
 
-                {{ calculateAge(formData.birthTime) || '/' }}
+                {{ timeFormat(formData.birthTime) || '/' }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="入党（团）时间" prop="joinPartyTime">
 
-                {{ calculateAge(formData.joinPartyTime) || '/' }}
+                {{ timeFormat(formData.joinPartyTime) || '/' }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -735,14 +736,14 @@ onMounted(() => {
             <el-col :span="12">
               <el-form-item label="参加工作时间" prop="joinWorkTime">
 
-                {{ calculateAge(formData.joinWorkTime) || '/' }}
+                {{ timeFormat(formData.joinWorkTime) || '/' }}
               </el-form-item>
             </el-col>
             <el-col :span="12" label="参加公安工作时间" prop="joinPoliceTime">
 
               <el-form-item label="参加公安工作时间" prop="joinPoliceTime">
 
-                {{ calculateAge(formData.joinPoliceTime) || '/' }}
+                {{ timeFormat(formData.joinPoliceTime) || '/' }}
               </el-form-item>
 
             </el-col>
@@ -798,14 +799,13 @@ onMounted(() => {
           <el-row>
             <el-col :span="12">
               <el-form-item label="开始日期" prop="startTime">
-
+                {{ timeFormat(formData.startTime) || '/' }}
-                {{ calculateAge(formData.startTime) || '/' }}
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="结束日期" prop="endTime">
 
-                {{ calculateAge(formData.endTime) || '/' }}
+                {{ timeFormat(formData.endTime) || '/' }}
               </el-form-item>
             </el-col>
           </el-row>