Skip to content

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

页面修改

parent 402471c5
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 100 deletions
src/pages/sale/japaneseTrain.vue
View file @ f398d111
......@@ -3,25 +3,24 @@
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="resetSearch" filled option-value="SId" option-label="SName"
v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" clearable />
<q-select @input="resetSearch" filled option-value="SId" option-label="SName" v-model="msg.School_Id"
:options="schoolList" emit-value map-options label="关联校区" clearable />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled v-model="msg.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
<q-select @input="resetSearch" filled v-model="msg.CourseSubject" :options="CourseSubjectList"
option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目" clearable />
</div>
<div class="col-3">
<q-input @change="resetSearch" clearable filled v-model="msg.ClassNo" label="班号"
@clear="resetSearch" maxlength="20" />
<q-input @change="resetSearch" clearable filled v-model="msg.ClassNo" label="班号" @clear="resetSearch"
maxlength="20" />
</div>
<div class="col-3">
<q-input @change="resetSearch" clearable filled v-model="msg.ClassName" label="班级名称"
@clear="resetSearch" maxlength="20" />
<q-input @change="resetSearch" clearable filled v-model="msg.ClassName" label="班级名称" @clear="resetSearch"
maxlength="20" />
</div>
<div class="col-3">
<q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName"
v-model="msg.Teacher_Id" :options="TeacherList" emit-value map-options label="带班老师" clearable />
<q-select @input="resetSearch" filled option-value="TId" option-label="TeacherName" v-model="msg.Teacher_Id"
:options="TeacherList" emit-value map-options label="带班老师" clearable />
</div>
<div class="col-3">
<q-select @input="resetSearch" @filter="filterCourseFn" use-input filled option-value="CourseId"
......@@ -30,13 +29,13 @@
</div>
<div class="col-3">
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开学日期" size="small" style="width:47%;"
@change="resetSearch" clear-icon="iconfont icon-guanbi">
<q-field filled>
<template v-slot:control>
<el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开学日期"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>至
<el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期" size="small" style="width:47%;"
@change="resetSearch" clear-icon="iconfont icon-guanbi">
<el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>
</template>
</q-field>
......@@ -44,13 +43,13 @@
</div>
<div class="col-3">
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker v-model="msg.JoinStartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名截止日期" size="small"
style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
<q-field filled>
<template v-slot:control>
<el-date-picker v-model="msg.JoinStartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名截止日期"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>至
<el-date-picker v-model="msg.JoinEndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名截止日期" size="small"
style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
<el-date-picker v-model="msg.JoinEndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名截止日期"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>
</template>
</q-field>
......@@ -86,7 +85,7 @@
<th>课时数</th>
<th>价格</th>
</tr>
<tr v-for="(sItem,sIndex) in item.OtherCourseList">
<tr v-for="(sItem,sIndex) in item.OtherCourseList" :key="sIndex">
<td>{{sItem.CourseName}}</td>
<td>{{sItem.ClassHours}}</td>
<td>{{sItem.SellPrice}}</td>
......@@ -94,7 +93,6 @@
</table>
</q-banner>
</q-popup-proxy>
</span>
</template>
</div>
<div class="di-c" style="align-items:baseline"><img src="../../assets/images/administration/period.png"
......@@ -163,7 +161,7 @@
</span>
</div>
<div v-if="item.ClassStyle==2" class="row wrap" style="width: 454px;">
<div v-for="(j,k) in item.month"
<div v-for="(j,index) in item.month" :key="index+10000"
style="width: 45.4px;height: 30px;line-height: 30px;text-align: center;font-size: 12px;color: #2D2D2D;margin-top: 10px;!important">
<div
:style="{'width': '45.4px','height': '30px',background:j.select==true?'rgba(41, 97, 254, 0.2)':'#FFF'}">
......@@ -175,7 +173,7 @@
<el-calendar v-model="elvalue" id="calendar" style="width: 500px;">
<template slot="dateCell" slot-scope="{date, data}" class="row" style="height: 45px">
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
<div v-for="x in item.ClassPlanList">
<div v-for="(x,cIndex) in item.ClassPlanList" :key="cIndex+100000">
<div v-if="x.ClassDate === data.day"
style="align-items: center;justify-content: center;margin-top: 15px" class="row">
<img src="../../assets/images/administration/gou.png" alt=""
......@@ -213,9 +211,9 @@
<tbody style="border-bottom:1px dashed #d1d1d1;"
v-for="(tItem,tIndex) in item.ClassTimeList" :key="tIndex">
<template v-for="(timeItem,timeIndex) in tItem.TimeList">
<tr>
<tr :key="timeIndex+200000">
<td style="width:180px;" :rowspan=" tItem.TimeList.length" v-if="timeIndex==0">
<template v-for="(sItem,sIndex) in tItem.DateList">
<template v-for="sItem in tItem.DateList">
{{sItem}}
</template>
</td>
......@@ -347,7 +345,7 @@
StartTime: '', //开始时间
EndTime: '', //结束时间
School_Id: '', //关联校区
CouseId: 0, //课程id
CouseId: '', //课程id
Teacher_Id: 0, //教师id
Q_CanApply: "0", //是否可以报名 1是
JoinStartTime: '', //报名截止日期开始
......@@ -370,7 +368,7 @@
},
isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
CourseSubjectList: [], //科目列表
myClassList:[]
myClassList: []
}
},
created() {
......@@ -395,7 +393,7 @@
this.getList();
},
methods: {
//课程筛选
//班级筛选
filterCourseFn(val, update, abort) {
update(() => {
this.myClassList = this.ClassList.filter(
......@@ -403,7 +401,7 @@
);
});
},
//科目列表
queryCourseSubject() {
getCourseSubject({}).then(res => {
if (res.Code == 1) {
......@@ -453,11 +451,7 @@
queryCourseDropdownList({}).then(res => {
if (res.Code == 1) {
this.ClassList = res.Data;
this.ClassList.unshift({
CourseId: 0,
CourseName: "不限"
})
this.myClassList = this.ClassList;
this.myClassList = res.Data;
}
})
},
......@@ -564,8 +558,8 @@
this.orderObj.ClassId = item.ClassId;
this.orderObj.Unit_Price = item.SellPrice;
this.orderObj.CourseId = item.CouseId;
this.orderObj.B2CRatio=item.B2CRatio;
this.orderObj.B2CReNewRatio=item.B2CReNewRatio;
this.orderObj.B2CRatio = item.B2CRatio;
this.orderObj.B2CReNewRatio = item.B2CReNewRatio;
this.isShowEditOrderForm = true;
},
//跳转到课程大纲
......@@ -576,7 +570,6 @@
}
}
}
</script>
<style>
li {
......@@ -727,5 +720,4 @@
width: 500px;
color: #000;
}
</style>
\ No newline at end of file
src/pages/sale/studyjob.vue
View file @ f398d111
......@@ -18,7 +18,7 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
row-key="name" :visible-columns="visibleColumns">
<template v-slot:top="props">
<template v-slot:top>
<div class="col-2 q-table__title">留学就业产品</div>
<q-space />
<div class="page-option">
......@@ -90,12 +90,9 @@
{{props.row.B2CRNRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
</template>
<template v-slot:body-cell-PreferentialList="props">
<q-td :props="props" style="padding-right:0px">
<div v-for="x in props.value">
<div v-for="(x,xIndex) in props.value" :key="xIndex">
<div class="border-bottom" v-if="x.PriceDiscountType == 1">
买{{ x.BuyNum }}送{{ x.SendNum }}
</div>
......@@ -135,7 +132,7 @@
</template>
<template v-slot:body-cell-PreferentialListSellCommission="props">
<q-td :props="props" style="padding-right:0px;padding-left:0px">
<div v-for="x in props.value">
<div v-for="(x,xIndex) in props.value" :key="xIndex+10000">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.SaleCommissionType == 1 ? "￥" : ""
......@@ -153,7 +150,7 @@
</template>
<template v-slot:body-cell-PreferentialListB2BCommission="props">
<q-td :props="props" style="padding-left:0px">
<div v-for="x in props.value">
<div v-for="(x,xIndex) in props.value" :key="xIndex+20000">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.B2BCommissionType == 1 ? "￥" : ""
......@@ -183,8 +180,8 @@
<q-dialog v-model="showForm" persistent>
<quotationstudy-form :obj="null" @save="showForm=false"></quotationstudy-form>
</q-dialog>
<studyorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" :modityOrderType="1" @close="cloStudyform"
@save="refreshPage()"></studyorderForm>
<studyorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" :modityOrderType="1"
@close="cloStudyform" @save="refreshPage()"></studyorderForm>
</div>
</div>
</template>
......@@ -227,14 +224,14 @@
align: 'left'
},
{
name:'ProductTypeName',
label:'类型',
name: 'ProductTypeName',
label: '类型',
field: 'ProductTypeName',
align: 'left'
},
{
name:'StudyCountryName',
label:'留学国家',
name: 'StudyCountryName',
label: '留学国家',
field: 'StudyCountryName',
align: 'left'
},
......@@ -244,13 +241,6 @@
field: 'Type',
align: 'left'
},
// {
// name: 'SuggestPrice',
// label: '建议卖价',
// field: 'SuggestPrice',
// align: 'left',
// field: row => row.SuggestPrice.toFixed(2)
// },
{
name: 'SellPrice',
label: '实际卖价',
......@@ -342,27 +332,6 @@
align: "left",
field: (row) => row.B2CRNRatio
},
// {
// name: "PreferentialList",
// required: true,
// label: "优惠政策",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListSellCommission",
// required: true,
// label: "销售佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListB2BCommission",
// required: true,
// label: "同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
{
name: 'Remark',
label: '备注',
......@@ -393,7 +362,8 @@
],
//表格可见列
visibleColumns: [
'Name', 'ProductTypeName', 'StudyCountryName','Type', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
'Name', 'ProductTypeName', 'StudyCountryName', 'Type', 'SuggestPrice', 'SellPrice', "PreferentialList",
"PreferentialListSellCommission",
"PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id',
], //可见列
......@@ -459,7 +429,6 @@
},
}
}
</script>
<style scoped>
.border-bottom {
......@@ -467,9 +436,7 @@
padding-bottom: 5px;
margin-bottom: 5px;
}
</style>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
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