diff --git a/root/person/marge.vue b/root/person/marge.vue
index ea77991..d6b962b 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -16,11 +16,20 @@
-
-
+
+
+
+
+
+ 11
+
-
+
@@ -29,7 +38,39 @@
申请合并
-
+
+
+
+
+
+
+
+
+
+
+
+ {{item.targetAgency.agencyName}}
+
+
+ {{item.desp || '-'}}
+
+
+
+ 审核中
+ 已通过
+ 已驳回
+
+
+
+
@@ -120,14 +161,15 @@ export default {
},
],
menuActive: 0,
-
modalApplyData:{
isShow:false,
tel:'',
desp:'',
resultList:[],
selectResult:''
- }
+ },
+ applysRecord:[],
+ recivesRecord:[],
};
},
onShow() {
@@ -142,6 +184,8 @@ export default {
}
that.G.Get(that.api.person_getMargeRecord,params,(res)=>{
console.log('合并记录:',res);
+ that.applysRecord = res.applys;
+ that.recivesRecord = res.recives;
})
},
handleUpdateMenu(e){
@@ -233,5 +277,19 @@ export default {
}
}
}
+ .m-alist{
+ .m-item{
+ &:first-child{
+ margin-top: 0 !important;
+ }
+ }
+ }
+ .m-item{
+ width: calc(100% - 52px);
+ margin: 10px auto;
+ background-color: #fff;
+ padding: 0 16px;
+ border-radius: 8px;
+ }
}