Skip to content

C
confucius
Commit deb1cf39 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e16b61bc
Show whitespace changes
Inline Side-by-side
Showing with 387 additions and 498 deletions
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @ deb1cf39
<style>
.baseSet_Title {
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
}
.CommissionDetail .border-bottom {
.CommissionDetail .border-bottom {
padding-bottom: 5px;
margin-bottom: 5px;
}
}
.CommissionDetail .text-bottom {
.CommissionDetail .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
}
}
.CommissionDetail ._icon_btn i.icon-sousuo {
.CommissionDetail ._icon_btn i.icon-sousuo {
background-color: #47bf8c;
}
}
.CommissionDetail ._icon_btn i {
.CommissionDetail ._icon_btn i {
width: 26px;
height: 26px;
display: inline-block;
......@@ -31,186 +31,85 @@
margin-right: 10px;
cursor: pointer;
outline: none;
}
}
.CommissionDetail .el-table td,
.el-table th {
.CommissionDetail .el-table td,
.el-table th {
padding: 5px 0;
}
}
</style>
<template>
<div class="page-body CommissionDetail">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div style="margin-right: 10px;">
<q-btn
color="primary"
size="11px"
label="返回"
@click="goreturn"
style="margin-left:10px"
/>
<q-btn color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px" />
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3" v-if="isShowFrom">
<q-select
filled
stack-label
:disable="!isShowFrom"
input-debounce="0"
option-value="Id"
@input="getlaiyuan"
option-label="Name"
v-model="msg.OrderSourceType"
:options="customFromList"
label="返佣类型"
dense
emit-value
map-options
>
<q-select filled stack-label :disable="!isShowFrom" input-debounce="0" option-value="Id" @input="getlaiyuan"
option-label="Name" v-model="msg.OrderSourceType" :options="customFromList" label="返佣类型" dense emit-value
map-options>
</q-select>
</div>
<div
class="col-3"
v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3"
>
<q-select
filled
stack-label
clearable
v-model="msg.UserDept"
dense
:options="DepartmentList"
use-input
@input="getList(), getEmployeeList()"
label="部门"
@filter="filterEmployee"
option-label="DeptName"
option-value="DeptId"
emit-value
map-options
>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select filled stack-label clearable v-model="msg.UserDept" dense :options="DepartmentList" use-input
@input="getList(), getEmployeeList()" label="部门" @filter="filterEmployee" option-label="DeptName"
option-value="DeptId" emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"
>未找到相关数据</q-item-section
>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div
class="col-3"
v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3"
>
<q-select
filled
stack-label
clearable
v-model="msg.OrderSourceId"
dense
:options="myEmployeeList"
use-input
@input="getList"
label="人员"
@filter="filterEmployee"
option-label="EmployeeName"
option-value="Id"
emit-value
map-options
>
<div class="col-3" v-if="msg.OrderSourceType == 1 || msg.OrderSourceType == 3">
<q-select filled stack-label clearable v-model="msg.OrderSourceId" dense :options="myEmployeeList" use-input
@input="getList" label="人员" @filter="filterEmployee" option-label="EmployeeName" option-value="Id"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"
>未找到相关数据</q-item-section
>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 2">
<q-select
filled
stack-label
v-model="msg.OrderSourceId"
clearable
dense
:options="customList"
use-input
@input="getList"
label="关联同行"
@filter="filterFn"
option-label="CustomerName"
option-value="CustomerId"
emit-value
map-options
>
<q-select filled stack-label v-model="msg.OrderSourceId" clearable dense :options="customList" use-input
@input="getList" label="关联同行" @filter="filterFn" option-label="CustomerName" option-value="CustomerId"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"
>未找到相关数据</q-item-section
>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" v-if="msg.OrderSourceType == 4">
<q-select
filled
clearable
stack-label
v-model="msg.OrderSourceId"
dense
:options="InvitationList"
use-input
@input="getList"
label="转介人"
@filter="filterFnStudent"
option-label="StuName"
option-value="StuId"
emit-value
map-options
>
<q-select filled clearable stack-label v-model="msg.OrderSourceId" dense :options="InvitationList" use-input
@input="getList" label="转介人" @filter="filterFnStudent" option-label="StuName" option-value="StuId"
emit-value map-options>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"
>未找到相关数据</q-item-section
>
<q-item-section class="text-grey">未找到相关数据</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div class="col-3" style="float:right;">
<q-btn
color="accent"
class="q-mr-md"
size="sm"
icon="download"
style="margin-top:6px;"
@click="DownLoadCommissionUserList"
label="下载"
/>
<q-btn color="accent" class="q-mr-md" size="sm" icon="download" style="margin-top:6px;"
@click="DownLoadCommissionUserList" label="下载" />
</div>
</div>
</div>
</div>
<template>
<el-table
ref="filterTable"
:data="tableData"
v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }"
border
style="width: 100%"
>
<el-table ref="filterTable" :data="tableData" v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }" border style="width: 100%">
<el-table-column prop="SchoolName" label="校区"></el-table-column>
<el-table-column prop="UserDeptName" label="部门"></el-table-column>
<el-table-column
prop="UserName"
label="人员"
:filters="UserNamelist"
:filter-method="filterHandler"
>
<el-table-column prop="UserName" label="人员" :filters="UserNamelist" :filter-method="filterHandler">
</el-table-column>
<el-table-column label="类型">
<template slot-scope="scope">
......@@ -223,33 +122,15 @@
{{ scope.row.OrderSourceType == 4 ? "学员" : "" }}
</template>
</el-table-column>
<el-table-column
prop="StudentCount"
label="学生数量"
sortable
:sort-method="StudentCount"
></el-table-column>
<el-table-column
prop="CommissionMoeny"
label="提成金额"
sortable
:sort-method="CommissionMoeny"
></el-table-column>
<el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"></el-table-column>
<el-table-column prop="CommissionMoeny" label="提成金额" sortable :sort-method="CommissionMoeny"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div class="_icon_btn">
<el-tooltip
class="item"
effect="dark"
content="查看"
placement="top"
>
<i
class="iconfont icon-sousuo"
@click="
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="
goUrl('returnPassbook/returnpassbookStatistics', scope.row)
"
></i>
"></i>
</el-tooltip>
</div>
</template>
......@@ -259,18 +140,37 @@
</div>
</template>
<script>
import { GetClassTypePageList } from "../../../api/system/index";
import { GetStudentList } from "../../../api/course/class";
import { getCommissionUserList } from "../../../api/finance/index";
import { getStudentDorpDownList } from "../../../api/school/index";
import {
GetClassTypePageList
} from "../../../api/system/index";
import {
GetStudentList
} from "../../../api/course/class";
import {
getCommissionUserList
} from "../../../api/finance/index";
import {
getStudentDorpDownList
} from "../../../api/school/index";
import { getDeptList } from "../../../api/system/dept";
import {
getDeptList
} from "../../../api/system/dept";
import { queryEmployee } from "../../../api/users/user";
import { CreateTypeList, GetCustomerList } from "../../../api/sale/sale";
import { EduDownLoad } from "../../../api/common/common";
import { mapState } from "vuex";
export default {
import {
queryEmployee
} from "../../../api/users/user";
import {
CreateTypeList,
GetCustomerList
} from "../../../api/sale/sale";
import {
EduDownLoad
} from "../../../api/common/common";
import {
mapState
} from "vuex";
export default {
meta: {
title: "销售提成详情"
},
......@@ -292,8 +192,7 @@ export default {
pageCount: 0,
persistent: false,
tableData: [],
StatusList: [
{
StatusList: [{
Id: "-2",
Name: "不限"
},
......@@ -550,15 +449,13 @@ export default {
});
},
goUrl(path, row) {
this.$router.push({
path: "/financial/" + path,
query: {
var newpath = "/financial/" + path;
this.OpenNewUrl(newpath, {
preriodId: this.$route.query.id,
CommissionType: this.$route.query.CommissionType,
OrderSourceType: row.OrderSourceType,
OrderSourceId: row.OrderSourceId,
blank: "y"
}
});
},
filterHandler(value, row, column) {
......@@ -575,8 +472,10 @@ export default {
this.$router.go(-1);
}
}
};
};
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
@import url('~assets/css/table.sass')
</style>
src/pages/financial/returnPassbook/ReturnperiodsList.vue
View file @ deb1cf39
......@@ -42,6 +42,7 @@
.el-table th {
padding: 5px 0;
}
</style>
<template>
<div class="page-body ReturnperiodsList">
......@@ -270,24 +271,11 @@
})
},
goUrl(id) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
this.OpenNewUrl("/financial/returnPassbook/ReturnUserList", {
"id": id,
"CommissionType": 1,
blank: 'y',
}
})
},
goUrl(id) {
this.$router.push({
path: '/financial/returnPassbook/ReturnUserList',
query: {
"id": id,
"CommissionType": 1,
blank: 'y',
}
})
});
},
handleCurrentChanges(val) {
this.msg.PageIndex = val;
......@@ -295,7 +283,9 @@
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/utils/erpindex.js
View file @ deb1cf39
......@@ -81,7 +81,7 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = 'http://192.168.10.46';
let domainUrl = 'http://192.168.10.214';
let viewFileUrl = 'http://192.168.10.214:8120';
let mallUrl = "http://192.168.10.2:8088";
......
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