Commit b7386552 authored by 黄奎's avatar 黄奎

页面修改

parent 242770b1
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
height: 100%; height: 100%;
} }
/deep/ .q-field__before, .q-field__before,
/deep/ .q-field__prepend { .q-field__prepend {
padding-right: 0px !important; padding-right: 0px !important;
} }
</style> </style>
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-select filled option-value="Id" option-label="Name" class="col-6 q-pb-lg q-pr-lg" <q-select filled option-value="Id" option-label="Name" class="col-6 q-pb-lg q-pr-lg"
v-model="objOption.PlanType" :options="TypeList" emit-value map-options label="方案类型" /> v-model="objOption.PlanType" :options="TypeList" @input="getEmployeeList" emit-value map-options
label="方案类型" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.PlanName" ref="PlanName" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.PlanName" ref="PlanName"
...@@ -113,7 +114,6 @@ ...@@ -113,7 +114,6 @@
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.BasicSalary" ref="BasicSalary" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.BasicSalary" ref="BasicSalary"
class="col-6 q-pb-lg q-pr-lg" label="基本工资" @keyup.native="checkPrice(objOption,'BasicSalary')" /> class="col-6 q-pb-lg q-pr-lg" label="基本工资" @keyup.native="checkPrice(objOption,'BasicSalary')" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.OpenBonus" ref="OpenBonus" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.OpenBonus" ref="OpenBonus"
...@@ -135,20 +135,20 @@ ...@@ -135,20 +135,20 @@
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-select @filter="filterCourseFn" class="col-6 q-pb-lg q-pr-lg" use-input filled multiple <q-select @filter="filterCourseFn" class="col-6 q-pb-lg q-pr-lg" use-input filled multiple
option-value="CourseId" option-label="CourseName" v-model="UseCourseIdsArray" :options="myClassList" option-value="CourseId" option-label="CourseName" v-model="UseCourseIdsArray" :options="chooseCourseList"
emit-value map-options label="学习课程" clearable /> emit-value map-options label="学习课程" clearable />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-select @filter="filterCourseFn" use-input filled multiple option-value="CourseId" <q-select @filter="filterCourseFn" use-input filled multiple option-value="CourseId"
option-label="CourseName" v-model="NotUseCourseIdsArray" :options="myClassList" emit-value map-options option-label="CourseName" v-model="NotUseCourseIdsArray" :options="chooseCourseList" emit-value
label="不适用课程" clearable /> map-options label="不适用课程" clearable />
</div> </div>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-select filled v-model="SaleIdsArray" multiple @filter="filterEmployee" use-input class="col-6 q-pb-lg q-pr-lg" <q-select filled v-model="SaleIdsArray" multiple @filter="filterEmployee" use-input
:options="myEmployeeList" label="适用人员" option-label="EmployeeName" option-value="Id" emit-value class="col-6 q-pb-lg q-pr-lg" :options="myEmployeeList" label="适用人员" option-label="EmployeeName"
map-options /> option-value="Id" emit-value map-options />
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
...@@ -231,17 +231,17 @@ ...@@ -231,17 +231,17 @@
}], }],
myEmployeeList: [], myEmployeeList: [],
employeeList: [], employeeList: [],
myClassList: [], chooseCourseList: [],
ClassList: [], //关联课程下拉数据 CourseList: [], //关联课程下拉数据
saveLoading: false, saveLoading: false,
optionTitle: '', optionTitle: '',
} }
}, },
created() {}, created() {
mounted() {
this.CourseList();
this.getEmployeeList(); this.getEmployeeList();
this.CourseList();
},
mounted() {
this.initObj() this.initObj()
}, },
methods: { methods: {
...@@ -260,25 +260,25 @@ ...@@ -260,25 +260,25 @@
CourseList() { CourseList() {
queryCourseDropdownList({}).then(res => { queryCourseDropdownList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.ClassList = res.Data; this.CourseList = res.Data;
this.myClassList = this.ClassList; this.chooseCourseList = res.Data;
} }
}) })
}, },
//课程筛选 //课程筛选
filterCourseFn(val, update, abort) { filterCourseFn(val, update, abort) {
update(() => { update(() => {
this.myClassList = this.ClassList.filter( this.chooseCourseList = this.CourseList.filter(
v => v.CourseName.indexOf(val) > -1 v => v.CourseName.indexOf(val) > -1
); );
}); });
}, },
//获取员工列表 //获取员工列表
getEmployeeList() { getEmployeeList() {
queryEmployee({ var qMsg = {
IsLeave: 1 IsLeave: 1
}).then(res => { };
queryEmployee(qMsg).then(res => {
this.employeeList = res.Data; this.employeeList = res.Data;
this.myEmployeeList = res.Data; this.myEmployeeList = res.Data;
}) })
......
...@@ -52,13 +52,34 @@ ...@@ -52,13 +52,34 @@
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" :data="dataList" :columns="columns" row-key="name"> separator="none" :data="dataList" :columns="columns" row-key="name">
<template v-slot:top="props"> <template v-slot:top>
<div class="col-2 q-table__title">人头奖金配置</div> <div class="col-2 q-table__title">人头奖金配置</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增规则" @click="AddMsg(null)" /> <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增规则" @click="AddMsg(null)" />
</div> </div>
</template> </template>
<template v-slot:body-cell-SaleList="props">
<q-td>
<div class="border-bottom" v-for="(item,index) in props.row.SaleList" :key="index">
{{item.SaleManName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-UseCourseList="props">
<q-td>
<div class="border-bottom" v-for="(item,index) in props.row.UseCourseList" :key="index">
{{item.CourseName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-NotUseCourseList="props">
<q-td>
<div class="border-bottom" v-for="(item,index) in props.row.NotUseCourseList" :key="index">
{{item.CourseName}}
</div>
</q-td>
</template>
<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">
...@@ -147,21 +168,21 @@ ...@@ -147,21 +168,21 @@
field: 'ClueNumSalary' field: 'ClueNumSalary'
}, },
{ {
name: "SaleIds", name: "SaleList",
required: true, required: true,
label: "销售人员", label: "适用人员",
align: "left", align: "left",
field: 'SaleIds' field: 'SaleList'
}, },
{ {
name: "UseCourseIds", name: "UseCourseList",
required: true, required: true,
label: "学习课程", label: "适用课程",
align: "left", align: "left",
field: 'UseCourseIds' field: 'UseCourseList'
}, },
{ {
name: "NotUseCourseIds", name: "NotUseCourseList",
label: "不适用课程", label: "不适用课程",
field: "NotUseCourseIds", field: "NotUseCourseIds",
align: "left", align: "left",
......
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