Commit 2f3c689d authored by zhengke's avatar zhengke

修改

parent d5a7ff04
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6" style="display:flex;align-items:center;"> <div class="col-6" style="display:flex;align-items:center;">
<q-select filled v-model="SaleIdsArray" style="width:290px;" multiple @filter="filterEmployee" use-input <q-select filled v-model="SaleIdsArray" style="width:290px;" clearable multiple @filter="filterEmployee" use-input
class="q-pb-lg" :options="myEmployeeList" label="适用人员" option-label="EmployeeName" class="q-pb-lg" :options="myEmployeeList" label="适用人员" option-label="EmployeeName"
option-value="Id" emit-value map-options /> option-value="Id" emit-value map-options />
<div class="q-gutter-sm q-pb-lg"> <div class="q-gutter-sm q-pb-lg">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</div> </div>
<div class="col-4"> <div class="col-4">
<q-input filled stack-label maxlength="20" :dense="false" v-model="item.EndNum" ref="EndNum" <q-input filled stack-label maxlength="20" :dense="false" v-model="item.EndNum" ref="EndNum"
class="col-6 q-pb-lg q-pr-lg" label="开始人数" @keyup.native="checkInteger(item,'EndNum')" /> class="col-6 q-pb-lg q-pr-lg" label="结束人数" @keyup.native="checkInteger(item,'EndNum')" />
</div> </div>
<div class="col-4"> <div class="col-4">
<q-input filled stack-label maxlength="20" :dense="false" v-model="item.Money" ref="Money" <q-input filled stack-label maxlength="20" :dense="false" v-model="item.Money" ref="Money"
...@@ -246,10 +246,10 @@ ...@@ -246,10 +246,10 @@
} }
}, },
created() { created() {
this.getEmployeeList();
this.getCourseList(); this.getCourseList();
}, },
mounted() { mounted() {
this.getEmployeeList();
this.initObj() this.initObj()
}, },
methods: { methods: {
...@@ -300,6 +300,11 @@ ...@@ -300,6 +300,11 @@
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
this.employeeList = res.Data; this.employeeList = res.Data;
this.myEmployeeList = res.Data; this.myEmployeeList = res.Data;
if(this.SaleIdsArray.length==this.employeeList.length){
this.isCheckAll=true;
}else{
this.isCheckAll=false;
}
}) })
}, },
//筛选员工 //筛选员工
......
...@@ -39,6 +39,18 @@ ...@@ -39,6 +39,18 @@
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.stulistNum {
display: inline-block;
width: 25px;
height: 25px;
text-align: center;
line-height: 23px;
border: 1px solid #2961FE;
border-radius: 50%;
cursor: pointer;
color: #2961FE;
}
</style> </style>
<template> <template>
<div class="page-body marketRules"> <div class="page-body marketRules">
...@@ -50,8 +62,9 @@ ...@@ -50,8 +62,9 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
separator="none" :data="dataList" :columns="columns" row-key="name"> class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
row-key="name">
<template v-slot:top> <template v-slot:top>
<div class="col-2 q-table__title">人头奖金配置</div> <div class="col-2 q-table__title">人头奖金配置</div>
<q-space /> <q-space />
...@@ -61,9 +74,27 @@ ...@@ -61,9 +74,27 @@
</template> </template>
<template v-slot:body-cell-SaleList="props"> <template v-slot:body-cell-SaleList="props">
<q-td> <q-td>
<div class="border-bottom" v-for="(item,index) in props.row.SaleList" :key="index"> <template v-if="props.row.SaleList">
{{item.SaleManName}} <template v-if="props.row.SaleList.length==1">
{{props.row.SaleList[0].SaleManName}}
</template>
<template v-if="props.row.SaleList.length>1">
{{props.row.SaleList[0].SaleManName}}
<span class="stulistNum">
{{props.row.SaleList.length}}
<q-popup-proxy>
<q-banner>
<div style="width:400px;max-height:600px;overflow-y:auto;">
<el-tag size="mini" style="margin:0 10px 10px 0" v-for="(item,index) in props.row.SaleList" :key="index">{{item.SaleManName}}</el-tag>
</div> </div>
</q-banner>
</q-popup-proxy>
</span>
</template>
<template v-if="props.row.SaleList.length==0">
</template>
</template>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-UseCourseList="props"> <template v-slot:body-cell-UseCourseList="props">
...@@ -83,7 +114,8 @@ ...@@ -83,7 +114,8 @@
<template v-slot:body-cell-DetailList="props"> <template v-slot:body-cell-DetailList="props">
<q-td> <q-td>
<div class="border-bottom" v-for="(item,index) in props.row.DetailList" :key="index"> <div class="border-bottom" v-for="(item,index) in props.row.DetailList" :key="index">
月报名人数:<span style="margin-left:10px;color:blue">{{item.StartNum}}-{{item.EndNum}}</span> 人,奖励<span style="margin-left:10px;color:red">{{item.Money}}</span> 月报名人数:<span style="margin-left:10px;color:blue">{{item.StartNum}}-{{item.EndNum}}</span> 人,奖励<span
style="margin-left:10px;color:red">{{item.Money}}</span>
</div> </div>
</q-td> </q-td>
</template> </template>
...@@ -271,7 +303,9 @@ ...@@ -271,7 +303,9 @@
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment