Skip to content

C
confucius
Commit 4fca0726 authored by Mac's avatar Mac
Browse files
Options

学员页面

parent 910653d5
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 17 deletions
src/api/sale/sale.js
View file @ 4fca0726
......@@ -57,3 +57,15 @@ export function getOrderStateEnumList(data) {
data
})
}
/**
* 订单客人列表
*
*/
export function getOrderGuestPageList(data) {
return request({
url: '/order/GetOrderGuestPageList',
method: 'post',
data
})
}
src/pages/sale/japaneseTrain.vue
View file @ 4fca0726
......@@ -57,8 +57,8 @@
<q-banner>
<div class="price-popup" style="padding: 10px">
<div class="popup-top">
<span style="color:#2D2D2D;font-size: 14px;font-weight: bold">上课时间</span>
<div style="background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;justify-content: space-around;margin-top: 20px">
<div style="color:#2D2D2D;font-size: 14px;font-weight: bold" >上课时间</div>
<div style="background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;justify-content: space-around;margin-top: 20px" v-if="item.ClassStyle==1">
<span>周末</span>
<span>周一</span>
<span>周二</span>
......@@ -67,12 +67,12 @@
<span>周五</span>
<span>周六</span>
</div>
<div style="font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;justify-content: space-around;border-bottom: 1px solid rgba(138, 138, 138, 0.09);margin-bottom: 20px">
<div v-if="item.ClassStyle==1" style="font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;justify-content: space-around;border-bottom: 1px solid rgba(138, 138, 138, 0.09);margin-bottom: 20px">
<span v-for="(j,k) in item.weeks" :key="k" style="width: 24.5px;">
<img src="../../assets/images/administration/gou.png" alt="" style="width: 16px;height: 12px" v-if="j.select==true">
</span>
</div>
<span style="color:#2D2D2D;font-size: 14px;font-weight: bold;">课程安排</span>
<div style="color:#2D2D2D;font-size: 14px;font-weight: bold;">课程安排</div>
<div style="width: 454px;height: 40px;background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: 600;margin-top: 20px;display: flex;align-items: center">
<div style="width: 50%;padding-left: 20px">
课节
......
src/pages/sale/myOrder.vue
View file @ 4fca0726
......@@ -147,7 +147,7 @@
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup >
<q-item-section>
<q-item-section @click="gostudent(item)">
<q-item-label>学生名单</q-item-label>
</q-item-section>
</q-item>
......@@ -189,10 +189,21 @@
<div class="col">
<div>销售备注：</div>
<div class="remarks-b">
<div v-for="(x,j) in item.SaleRemarkList" :index="j" v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0">
<div>{{j+1}}、{{x.Content}}</div>
<div style="text-align: right">{{x.CreateBy}} {{x.CreateTime}}
<div v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0">
<div>{{item.SaleRemarkList[0].Content}}</div>
<div style="text-align: right">{{item.SaleRemarkList[0].CreateBy}} {{item.SaleRemarkList[0].CreateTime}}
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
<q-popup-proxy v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0">
<q-banner>
<div style="width: 500px;" >
<div>销售备注</div>
<div v-for="(xq,jq) in item.SaleRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
</div>
</q-banner>
</q-popup-proxy>
</div>
</div>
<span v-if="item.SaleRemarkList && item.SaleRemarkList.length==0">暂无</span>
......@@ -201,21 +212,69 @@
<div class="col">
<div>教务备注：</div>
<div class="remarks-b ">
<span v-for="(x,j) in item.TeacherRemarkList" v-if="item.TeacherRemarkList && item.TeacherRemarkList.length>0">{{x}}</span>
<div v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0">
<div>{{item.TeacherRemarkList[0].Content}}</div>
<div style="text-align: right">{{item.TeacherRemarkList[0].CreateBy}} {{item.TeacherRemarkList[0].CreateTime}}
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
<q-popup-proxy v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0">
<q-banner>
<div style="width: 500px;" >
<div>教务备注</div>
<div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
</div>
</q-banner>
</q-popup-proxy>
</div>
</div>
<span v-if="item.TeacherRemarkList && item.TeacherRemarkList.length==0">暂无</span>
</div>
</div>
<div class="col">
<div>校长备注：</div>
<div class="remarks-b ">
<span v-for="(x,j) in item.RectorRemarkList" v-if="item.RectorRemarkList && item.RectorRemarkList.length>0">{{x}}</span>
<div v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0">
<div>{{item.RectorRemarkList[0].Content}}</div>
<div style="text-align: right">{{item.RectorRemarkList[0].CreateBy}} {{item.RectorRemarkList[0].CreateTime}}
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
<q-popup-proxy v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0">
<q-banner>
<div style="width: 500px;" >
<div>校长备注</div>
<div v-for="(xq,jq) in item.RectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
</div>
</q-banner>
</q-popup-proxy>
</div>
</div>
<span v-if="item.RectorRemarkList && item.RectorRemarkList.length==0">暂无</span>
</div>
</div>
<div class="col">
<div>总经理备注：</div>
<div class="remarks-b ">
<span v-for="(x,j) in item.DirectorRemarkList" v-if="item.DirectorRemarkList && item.DirectorRemarkList.length>0">{{x}}</span>
<div v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0">
<div>{{item.DirectorRemarkList[0].Content}}</div>
<div style="text-align: right">{{item.DirectorRemarkList[0].CreateBy}} {{item.DirectorRemarkList[0].CreateTime}}
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
<q-popup-proxy v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0">
<q-banner>
<div style="width: 500px;" >
<div>总经理备注</div>
<div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
</div>
</q-banner>
</q-popup-proxy>
</div>
</div>
<span v-if="item.DirectorRemarkList && item.DirectorRemarkList.length==0">暂无</span>
</div>
</div>
......@@ -223,15 +282,9 @@
<div>收款单据：</div>
</div>
</div>
</td>
</tr>
</tbody>
</table>
......@@ -361,6 +414,12 @@
this.loading = false
})
},
gostudent(item){//跳转到学生名单
var tempStr = '/sale/studentList?OrderId='+item.OrderId+'&ClassId='+item.ClassId;
this.$router.push({
path: tempStr
});
},
......@@ -506,4 +565,5 @@
font-size: 12px;
color: #999999;
}
</style>
src/pages/sale/studentList.vue 0 → 100644
View file @ 4fca0726
<template>
<div class="page-body">
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title" @click="goreturn">返回</div>
<q-space />
<div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增名单" @click="persistent=true" />
</div>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-toggle size="sm" color="secondary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditRole(props.row)" />
</q-td>
</template>
</q-table>
</div>
<q-dialog v-model="persistent" content-class="bg-grey-1" transition-show="scale"
transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">{{addMsg.Id==0?'新增学员':'修改学员'}}</div>
</q-card-section>
<div class="text-caption q-mb-lg q-px-md text-grey-6">基础信息</div>
<q-card-section class="q-pt-none">
<div class="row wrap">
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源（FR）" :rules="[val => !!val || '公文来源（FR）']"/>
<q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips
option-value="Id" option-label="EmployeeName" v-model="tempManager2" ref="ManagerId" :options="PersionList"
label="默认抄送" :dense="false" emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" :loading="saveLoading"
@click="save_t()" />
</q-card-actions>
</q-card>
</q-dialog>
</div>
</template>
<script>
import {
getOrderGuestPageList,
} from '../../api/sale/sale'
export default {
data() {
return {
currentUrl: "",
columns: [{
name: 'RoleId',
label: '名称',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleName',
required: true,
label: '职业',
align: 'left',
field: row => row.RoleName
},
{
name: 'RoleId',
label: '性别',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '年龄',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '电话',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '日语基础',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '客户来源',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '学日语目的',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '重要联系人',
field: 'RoleId',
align: 'left'
},
{
name: 'RoleId',
label: '重要联系电话',
field: 'RoleId',
align: 'left'
},
{
name: 'optioned',
label: '操作',
field: 'RoleId'
}
],
data: [],
loading: true,
msg: {
pageIndex: 1,
pageSize: 12,
OrderId: 0,
ClassId: 0,
GuestName: '',
GuestState:0,
},
pageCount: 0,
persistent:false,
addMsg:{
},
}
},
mounted() {
if(this.$route.query){
this.msg.OrderId =this.$route.query.OrderId
this.msg.ClassId =this.$route.query.ClassId
}
this.getRolelist()
},
methods: {
//重新查询
resetSearch() {
this.msg.pageIndex = 1;
this.getRolelist();
},
//翻页
changePage(val) {
this.msg.pageIndex = val;
this.getRolelist()
},
//获取菜单分页列表
getRolelist() {
this.loading = true;
getOrderGuestPageList(this.msg).then(res => {
this.loading = false
this.data = res.Data.PageData
this.pageCount = res.Data.PageCount
}).catch(() => {
this.loading = false
})
},
goreturn(){
this.$router.go(-1)
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass');
</style>
src/router/routes.js
View file @ 4fca0726
......@@ -341,6 +341,11 @@ const routes = [{
component: () =>
import("pages/sale/myOrder.vue")
},
{
path: "/sale/studentList", //销售 学生名单
component: () =>
import("pages/sale/studentList.vue")
},
{
path: "/test", //API测试
component: () =>
......
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