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 @@ -
+ -
- - {{rtuenConfinementData(blame).startTime+ " - " + rtuenConfinementData(blame).endTime}} -
-
- - {{rtuenConfinementData(blame).confinementTime}} -
-
- - {{rtuenConfinementData(blame).matter}} -
-
+ + + + + + + + + + + + +
-
-
- - {{rtuenLeadConfinementData(blame).startTime+ " - " + rtuenLeadConfinementData(blame).endTime}} -
-
- - {{rtuenLeadConfinementData(blame).confinementTime}} -
-
- - {{rtuenLeadConfinementData(blame).matter}} -
-
+ + + + + + + + + + + + + + + +
@@ -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}) /** * 获取禁闭信息 * */