|
|
|
|
@ -16,11 +16,20 @@
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
<!-- 收到的 -->
|
|
|
|
|
<div class="m-recives-obj">
|
|
|
|
|
|
|
|
|
|
<div class="m-recives-obj" v-if="menuActive == 0">
|
|
|
|
|
<view v-if="recivesRecord && recivesRecord.length == 0"
|
|
|
|
|
class="g_flex_column_center" style="padding-top: 130px;"
|
|
|
|
|
>
|
|
|
|
|
<g-empty />
|
|
|
|
|
</view>
|
|
|
|
|
<view v-if="recivesRecord && recivesRecord.length > 0"
|
|
|
|
|
class="g_flex_column_center"
|
|
|
|
|
>
|
|
|
|
|
11
|
|
|
|
|
</view>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- 申请/发起 -->
|
|
|
|
|
<view class="m-applys-obj">
|
|
|
|
|
<view class="m-applys-obj" v-if="menuActive == 1">
|
|
|
|
|
<view class="m-aform g_flex_row_start g_h_60"
|
|
|
|
|
@click="openApply"
|
|
|
|
|
>
|
|
|
|
|
@ -29,7 +38,39 @@
|
|
|
|
|
</view>
|
|
|
|
|
<view class="g_flex_1 g_flex_column_center value">申请合并</view>
|
|
|
|
|
</view>
|
|
|
|
|
<div class="m-alist"></div>
|
|
|
|
|
<div class="m-alist">
|
|
|
|
|
<view v-if="applysRecord && applysRecord.length == 0"
|
|
|
|
|
class="g_flex_column_center" style="padding-top: 130px;"
|
|
|
|
|
>
|
|
|
|
|
<g-empty />
|
|
|
|
|
</view>
|
|
|
|
|
<view v-if="applysRecord && applysRecord.length > 0"
|
|
|
|
|
class="g_flex_column_center as"
|
|
|
|
|
>
|
|
|
|
|
<view class="g_flex_row_between m-item g_h_60"
|
|
|
|
|
v-for="(item,index) in applysRecord" :key="index"
|
|
|
|
|
>
|
|
|
|
|
<view class="avatar-obj g_flex_none g_flex_column_center" style="height: 60px;overflow: hidden;border-radius: 50%;">
|
|
|
|
|
<image src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/APP/default.svg" alt=""
|
|
|
|
|
mode="widthFix" style="width: 40px;border-radius: 50%;"
|
|
|
|
|
/>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="info-obj g_flex_1 g_flex_column_center" style="margin: 0 10px;">
|
|
|
|
|
<view class="g_ell_1 g_fs_16 g_fw_600">
|
|
|
|
|
{{item.targetAgency.agencyName}}
|
|
|
|
|
</view>
|
|
|
|
|
<view class="g_ell_1 g_fs_14" style="color: #666;margin-top: 8px;">
|
|
|
|
|
{{item.desp || '-'}}
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="status-obj g_flex_none g_flex_column_center" >
|
|
|
|
|
<view v-if="item.state == 0" style="color: orange;font-size: 16px;">审核中</view>
|
|
|
|
|
<view v-if="item.state == 1" style="color: green;font-size: 16px;">已通过</view>
|
|
|
|
|
<view v-if="item.state == 2" style="color: red;font-size: 16px;">已驳回</view>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
</div>
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</style>
|
|
|
|
|
|
