Skip to content

A
admin-base
Commit 99540928 authored by 赵茹林's avatar 赵茹林
Browse files
Options

回访信息 [更新] 去掉只读时不能添加回访信息的权限判断 

回访信息 [修复] 班级成员界面点沟通情况时未传teacher id导致不能添加回访信息的问题
教师列表选择框 [更新] 接口条数限制改为500
parent 24b04b2a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3202 additions and 3115 deletions
src/components/class/dialog.vue
View file @ 99540928
This diff is collapsed.
src/components/class/userList.vue
View file @ 99540928
...@@ -88,7 +88,9 @@ ...@@ -88,7 +88,9 @@
<el-table-column type="selection" width="40"></el-table-column> <el-table-column type="selection" width="40"></el-table-column>
<el-table-column width="120" label="沟通情况"> <el-table-column width="120" label="沟通情况">
<template slot-scope="scope"> <template slot-scope="scope">
<teacher-desc :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc> <!--<teacher-desc :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc>-->
<!---->
<teacher-desc :teacherId="userObj.teacherId" :row="scope.row" :typeFlag="true" :descType="2" @onSuccess="searchList()"></teacher-desc>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="用户" className="f-c" min-width="180" sortable prop="user_id"> <el-table-column label="用户" className="f-c" min-width="180" sortable prop="user_id">
......
src/components/conversionList/channelTransList.vue
View file @ 99540928
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import {
getTeacherListApi, getTeacherListApi,
getchannelTransListApi, getchannelTransListApi,
getPeriodsApi, getPeriodsApi,
...@@ -163,16 +163,16 @@ import { ...@@ -163,16 +163,16 @@ import {
getPeriodsOtherListApi, getPeriodsOtherListApi,
getConfigListApi, getConfigListApi,
getUpdateTimeApi getUpdateTimeApi
} from "../../service/api"; } from "../../service/api";
import page from "../framework/page"; import page from "../framework/page";
import { GOODSTYPE, CLASSSOURCE } from "../../util/wordbook"; import {GOODSTYPE, CLASSSOURCE} from "../../util/wordbook";
export default { export default {
name: "channelTransList", name: "channelTransList",
data() { data() {
return { return {
updateTime: '', updateTime: '',
typeList:[], typeList: [],
width: 0, width: 0,
nowPage: 1, nowPage: 1,
limit: 20, limit: 20,
...@@ -276,7 +276,7 @@ export default { ...@@ -276,7 +276,7 @@ export default {
contentSpanArr: [], contentSpanArr: [],
searchFrom: { searchFrom: {
payTime: [], payTime: [],
classTime:[], classTime: [],
start_at: "", start_at: "",
end_at: "", end_at: "",
invite_type: "", invite_type: "",
...@@ -289,14 +289,14 @@ export default { ...@@ -289,14 +289,14 @@ export default {
}, },
propertyList: [], propertyList: [],
watchList: [ watchList: [
{ id: 0, title: 5 }, {id: 0, title: 5},
{ id: 1, title: 6 }, {id: 1, title: 6},
{ id: 2, title: 10 }, {id: 2, title: 10},
{ id: 3, title: 20 } {id: 3, title: 20}
] ]
}; };
}, },
components: { page }, components: {page},
methods: { methods: {
periodName(row) { periodName(row) {
//return `【${row.goods_id}】${row.periods_title}${row.watch_num}课时（${row.start_at.slice(5).replace('-', '')}）-d${this.title.has_watch_num}` //return `【${row.goods_id}】${row.periods_title}${row.watch_num}课时（${row.start_at.slice(5).replace('-', '')}）-d${this.title.has_watch_num}`
...@@ -319,7 +319,7 @@ export default { ...@@ -319,7 +319,7 @@ export default {
}, },
exportDataTable() { exportDataTable() {
let json = {}; let json = {};
if(this.searchFrom.sort_value){ if (this.searchFrom.sort_value) {
json.sort_value = this.searchFrom.sort_value; json.sort_value = this.searchFrom.sort_value;
json.sort_key = this.searchFrom.sort_key; json.sort_key = this.searchFrom.sort_key;
} }
...@@ -364,7 +364,7 @@ export default { ...@@ -364,7 +364,7 @@ export default {
// } // }
}, },
handleItemChange(val) { handleItemChange(val) {
getPeriodsApi({ goods_id: val[0], limit: 100 }).then(res => { getPeriodsApi({goods_id: val[0], limit: 100}).then(res => {
res.list.forEach(i => { res.list.forEach(i => {
i.name = i.title; i.name = i.title;
}); });
...@@ -416,12 +416,12 @@ export default { ...@@ -416,12 +416,12 @@ export default {
getTeacherList() { getTeacherList() {
let json = { let json = {
page: 1, page: 1,
limit: 200 limit: 500
}; };
getTeacherListApi(json).then(res => { getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
}); });
getConfigListApi({page:1, limit: 100,key:'code_rule_type'}).then(res=>{ getConfigListApi({page: 1, limit: 100, key: 'code_rule_type'}).then(res => {
this.typeList = res.list this.typeList = res.list
}) })
}, },
...@@ -450,9 +450,9 @@ export default { ...@@ -450,9 +450,9 @@ export default {
}); });
}, },
getPeriodsOtherList() { getPeriodsOtherList() {
let json = { limit: 1000,page:1,max_watch_num:20 }; let json = {limit: 1000, page: 1, max_watch_num: 20};
getPeriodsOtherListApi(json).then(res => { getPeriodsOtherListApi(json).then(res => {
res.list.forEach(val=>{ res.list.forEach(val => {
val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}` val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
}) })
this.periodList = res.list; this.periodList = res.list;
...@@ -467,7 +467,7 @@ export default { ...@@ -467,7 +467,7 @@ export default {
if (this.searchFrom.invite_type) { if (this.searchFrom.invite_type) {
json.invite_type = this.searchFrom.invite_type; json.invite_type = this.searchFrom.invite_type;
} }
if(this.searchFrom.sort_value){ if (this.searchFrom.sort_value) {
json.sort_value = this.searchFrom.sort_value; json.sort_value = this.searchFrom.sort_value;
json.sort_key = this.searchFrom.sort_key; json.sort_key = this.searchFrom.sort_key;
} }
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
if (this.searchFrom.teacher_id) { if (this.searchFrom.teacher_id) {
json.teacher_id = this.searchFrom.teacher_id; json.teacher_id = this.searchFrom.teacher_id;
} }
if (this.searchFrom.payTime&&this.searchFrom.payTime.length > 0) { if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
if ( if (
this.searchFrom.payTime[0] && this.searchFrom.payTime[0] &&
this.searchFrom.payTime[0].length > 0 this.searchFrom.payTime[0].length > 0
...@@ -502,7 +502,7 @@ export default { ...@@ -502,7 +502,7 @@ export default {
json.end_at = this.searchFrom.end_at; json.end_at = this.searchFrom.end_at;
} }
} }
if (this.searchFrom.classTime&&this.searchFrom.classTime.length > 0) { if (this.searchFrom.classTime && this.searchFrom.classTime.length > 0) {
console.log(this.searchFrom.classTime) console.log(this.searchFrom.classTime)
if ( if (
this.searchFrom.classTime[0] && this.searchFrom.classTime[0] &&
...@@ -583,12 +583,12 @@ export default { ...@@ -583,12 +583,12 @@ export default {
this.getPeriodsOtherList(); this.getPeriodsOtherList();
this.getUpdateTime(); this.getUpdateTime();
} }
}; };
</script> </script>
<style lang="less" scope> <style lang="less" scope>
.channel-trans-list { .channel-trans-list {
padding: 20px 0; padding: 20px 0;
} }
</style> </style>
src/components/conversionList/periodsConversionList.vue
View file @ 99540928
...@@ -145,11 +145,18 @@ ...@@ -145,11 +145,18 @@
</div> </div>
</template> </template>
<script> <script>
import { getPeriodsConversionListApi, getGoodsListApi, getPeriodsOtherListApi, getTeacherListApi, getUpdateTimeApi } from "../../service/api"; import {
import page from "../framework/page"; getPeriodsConversionListApi,
import { GOODSTYPE, CLASSSOURCE } from "../../util/wordbook"; getGoodsListApi,
import { tipArr3 } from "../../util/tipArr"; getPeriodsOtherListApi,
export default { getTeacherListApi,
getUpdateTimeApi
} from "../../service/api";
import page from "../framework/page";
import {GOODSTYPE, CLASSSOURCE} from "../../util/wordbook";
import {tipArr3} from "../../util/tipArr";
export default {
name: "periodsConversionList", name: "periodsConversionList",
data() { data() {
return { return {
...@@ -253,7 +260,7 @@ export default { ...@@ -253,7 +260,7 @@ export default {
contentSpanArr: [], contentSpanArr: [],
searchFrom: { searchFrom: {
payTime: [], payTime: [],
classTime:[], classTime: [],
start_at: "", start_at: "",
end_at: "", end_at: "",
invite_type: "", invite_type: "",
...@@ -266,14 +273,14 @@ export default { ...@@ -266,14 +273,14 @@ export default {
}, },
propertyList: [], propertyList: [],
watchList: [ watchList: [
{ id: 0, title: 5 }, {id: 0, title: 5},
{ id: 1, title: 6 }, {id: 1, title: 6},
{ id: 2, title: 10 }, {id: 2, title: 10},
{ id: 3, title: 20 } {id: 3, title: 20}
] ]
}; };
}, },
components: { page }, components: {page},
methods: { methods: {
periodName(val) { periodName(val) {
let str = ''; let str = '';
...@@ -296,7 +303,7 @@ export default { ...@@ -296,7 +303,7 @@ export default {
} }
return str return str
}, },
rendertip(h, { column }) { rendertip(h, {column}) {
// console.log(h) // console.log(h)
return h("span", [ return h("span", [
h("span", column.label), h("span", column.label),
...@@ -318,11 +325,11 @@ export default { ...@@ -318,11 +325,11 @@ export default {
) )
]); ]);
}, },
sortMethod(data){ sortMethod(data) {
this.searchFrom.sort_key = data.prop this.searchFrom.sort_key = data.prop
if(data.order=='ascending'){ if (data.order == 'ascending') {
this.searchFrom.sort_value = 'asc' this.searchFrom.sort_value = 'asc'
}else{ } else {
this.searchFrom.sort_value = 'desc' this.searchFrom.sort_value = 'desc'
} }
this.getChannelTransList() this.getChannelTransList()
...@@ -330,7 +337,7 @@ export default { ...@@ -330,7 +337,7 @@ export default {
getTeacherList() { getTeacherList() {
let json = { let json = {
page: 1, page: 1,
limit: 200 limit: 500
}; };
getTeacherListApi(json).then(res => { getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
...@@ -395,7 +402,7 @@ export default { ...@@ -395,7 +402,7 @@ export default {
// } // }
}, },
handleItemChange(val) { handleItemChange(val) {
getPeriodsApi({ goods_id: val[0], limit: 100 }).then(res => { getPeriodsApi({goods_id: val[0], limit: 100}).then(res => {
res.list.forEach(i => { res.list.forEach(i => {
i.name = i.title; i.name = i.title;
}); });
...@@ -469,9 +476,9 @@ export default { ...@@ -469,9 +476,9 @@ export default {
}); });
}, },
getPeriodsOtherList() { getPeriodsOtherList() {
let json = { limit: 1000,page:1,max_watch_num:20 }; let json = {limit: 1000, page: 1, max_watch_num: 20};
getPeriodsOtherListApi(json).then(res => { getPeriodsOtherListApi(json).then(res => {
res.list.forEach(val=>{ res.list.forEach(val => {
val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}` val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
}) })
this.periodList = res.list; this.periodList = res.list;
...@@ -487,7 +494,7 @@ export default { ...@@ -487,7 +494,7 @@ export default {
if (this.searchFrom.invite_type) { if (this.searchFrom.invite_type) {
json.invite_type = this.searchFrom.invite_type; json.invite_type = this.searchFrom.invite_type;
} }
if(this.searchFrom.sort_value){ if (this.searchFrom.sort_value) {
json.sort_value = this.searchFrom.sort_value; json.sort_value = this.searchFrom.sort_value;
json.sort_key = this.searchFrom.sort_key; json.sort_key = this.searchFrom.sort_key;
} }
...@@ -503,7 +510,7 @@ export default { ...@@ -503,7 +510,7 @@ export default {
if (this.searchFrom.teacher_id) { if (this.searchFrom.teacher_id) {
json.teacher_id = this.searchFrom.teacher_id; json.teacher_id = this.searchFrom.teacher_id;
} }
if (this.searchFrom.payTime&&this.searchFrom.payTime.length > 0) { if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
if ( if (
this.searchFrom.payTime[0] && this.searchFrom.payTime[0] &&
this.searchFrom.payTime[0].length > 0 this.searchFrom.payTime[0].length > 0
...@@ -519,7 +526,7 @@ export default { ...@@ -519,7 +526,7 @@ export default {
json.end_at = this.searchFrom.end_at; json.end_at = this.searchFrom.end_at;
} }
} }
if (this.searchFrom.classTime&&this.searchFrom.classTime.length > 0) { if (this.searchFrom.classTime && this.searchFrom.classTime.length > 0) {
console.log(this.searchFrom.classTime) console.log(this.searchFrom.classTime)
if ( if (
this.searchFrom.classTime[0] && this.searchFrom.classTime[0] &&
...@@ -600,12 +607,12 @@ export default { ...@@ -600,12 +607,12 @@ export default {
this.getTeacherList(); this.getTeacherList();
this.getUpdateTime() this.getUpdateTime()
} }
}; };
</script> </script>
<style lang="less" scope> <style lang="less" scope>
.channel-trans-list { .channel-trans-list {
padding: 20px 0; padding: 20px 0;
} }
</style> </style>
src/components/conversionList/sourceConversionList.vue
View file @ 99540928
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
:style="{width: width+'px'}" :style="{width: width+'px'}"
fixed fixed
> >
<el-table-column prop="out_trade_no" label="订单号" ></el-table-column> <el-table-column prop="out_trade_no" label="订单号"></el-table-column>
<el-table-column <el-table-column
label="购买人" label="购买人"
className="f-c" className="f-c"
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}<br>(ID:{{scope.row.user_id}})<br>手机：{{scope.row.user_mobile}} <img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}<br>(ID:{{scope.row.user_id}})<br>手机：{{scope.row.user_mobile}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goods_name" label="商品名称" ></el-table-column> <el-table-column prop="goods_name" label="商品名称"></el-table-column>
<el-table-column prop="periods_title" label="期数标题" ></el-table-column> <el-table-column prop="periods_title" label="期数标题"></el-table-column>
<el-table-column <el-table-column
prop="duration_over_at" prop="duration_over_at"
label="开课看课时间" label="开课看课时间"
...@@ -151,10 +151,10 @@ ...@@ -151,10 +151,10 @@
<img class="avatar" :src="scope.row.class_invite_user_avatar"/> {{scope.row.class_invite_user_nickname}}<br>(ID:{{scope.row.class_invite_user_id}})<br>手机：{{scope.row.class_invite_user_mobile}} <img class="avatar" :src="scope.row.class_invite_user_avatar"/> {{scope.row.class_invite_user_nickname}}<br>(ID:{{scope.row.class_invite_user_id}})<br>手机：{{scope.row.class_invite_user_mobile}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="money" label="实付金额" ></el-table-column> <el-table-column prop="money" label="实付金额"></el-table-column>
<el-table-column prop="pay_at" label="支付时间" ></el-table-column> <el-table-column prop="pay_at" label="支付时间"></el-table-column>
<el-table-column prop="in_class_at" label="进班时间" ></el-table-column> <el-table-column prop="in_class_at" label="进班时间"></el-table-column>
<el-table-column prop="status" label="支付状态" > <el-table-column prop="status" label="支付状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.status|orderFilter}} {{scope.row.status|orderFilter}}
</template> </template>
...@@ -170,11 +170,18 @@ ...@@ -170,11 +170,18 @@
</div> </div>
</template> </template>
<script> <script>
import { getPeriodsConversionListApi, getSourceConversionListApi, getGoodsListApi, getPeriodsOtherListApi, getTeacherListApi } from "../../service/api"; import {
import page from "../framework/page"; getPeriodsConversionListApi,
import { GOODSTYPE, CLASSSOURCE,ORDERSTATUS } from "../../util/wordbook"; getSourceConversionListApi,
import { tipArr3 } from "../../util/tipArr"; getGoodsListApi,
export default { getPeriodsOtherListApi,
getTeacherListApi
} from "../../service/api";
import page from "../framework/page";
import {GOODSTYPE, CLASSSOURCE, ORDERSTATUS} from "../../util/wordbook";
import {tipArr3} from "../../util/tipArr";
export default {
name: "periodsConversionList", name: "periodsConversionList",
data() { data() {
return { return {
...@@ -278,7 +285,7 @@ export default { ...@@ -278,7 +285,7 @@ export default {
contentSpanArr: [], contentSpanArr: [],
searchFrom: { searchFrom: {
payTime: [], payTime: [],
classTime:[], classTime: [],
start_at: "", start_at: "",
end_at: "", end_at: "",
invite_type: "", invite_type: "",
...@@ -290,16 +297,16 @@ export default { ...@@ -290,16 +297,16 @@ export default {
periods_title: "" periods_title: ""
}, },
watchList: [ watchList: [
{ id: 0, title: 5 }, {id: 0, title: 5},
{ id: 1, title: 6 }, {id: 1, title: 6},
{ id: 2, title: 10 }, {id: 2, title: 10},
{ id: 3, title: 20 } {id: 3, title: 20}
], ],
goodList: [] goodList: []
}; };
}, },
filters:{ filters: {
orderFilter(val){ orderFilter(val) {
return ORDERSTATUS[val] return ORDERSTATUS[val]
}, },
filterGoods(val) { filterGoods(val) {
...@@ -317,7 +324,7 @@ export default { ...@@ -317,7 +324,7 @@ export default {
); );
} }
}, },
components: { page }, components: {page},
methods: { methods: {
getGoodsOption() { getGoodsOption() {
let json = { let json = {
...@@ -330,7 +337,7 @@ export default { ...@@ -330,7 +337,7 @@ export default {
console.log(this.goodList, 176); console.log(this.goodList, 176);
}); });
}, },
rendertip(h, { column }) { rendertip(h, {column}) {
// console.log(h) // console.log(h)
return h("span", [ return h("span", [
h("span", column.label), h("span", column.label),
...@@ -352,11 +359,11 @@ export default { ...@@ -352,11 +359,11 @@ export default {
) )
]); ]);
}, },
sortMethod(data){ sortMethod(data) {
this.searchFrom.sort_key = data.prop this.searchFrom.sort_key = data.prop
if(data.order=='ascending'){ if (data.order == 'ascending') {
this.searchFrom.sort_value = 'asc' this.searchFrom.sort_value = 'asc'
}else{ } else {
this.searchFrom.sort_value = 'desc' this.searchFrom.sort_value = 'desc'
} }
this.getChannelTransList() this.getChannelTransList()
...@@ -364,7 +371,7 @@ export default { ...@@ -364,7 +371,7 @@ export default {
getTeacherList() { getTeacherList() {
let json = { let json = {
page: 1, page: 1,
limit: 200 limit: 500
}; };
getTeacherListApi(json).then(res => { getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
...@@ -389,7 +396,7 @@ export default { ...@@ -389,7 +396,7 @@ export default {
objectSpanMethod(data) { objectSpanMethod(data) {
}, },
handleItemChange(val) { handleItemChange(val) {
getPeriodsApi({ goods_id: val[0], limit: 100 }).then(res => { getPeriodsApi({goods_id: val[0], limit: 100}).then(res => {
res.list.forEach(i => { res.list.forEach(i => {
i.name = i.title; i.name = i.title;
}); });
...@@ -463,9 +470,9 @@ export default { ...@@ -463,9 +470,9 @@ export default {
}); });
}, },
getPeriodsOtherList() { getPeriodsOtherList() {
let json = { limit: 1000,page:1,max_watch_num:20 }; let json = {limit: 1000, page: 1, max_watch_num: 20};
getPeriodsOtherListApi(json).then(res => { getPeriodsOtherListApi(json).then(res => {
res.list.forEach(val=>{ res.list.forEach(val => {
val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}` val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
}) })
this.periodList = res.list; this.periodList = res.list;
...@@ -484,7 +491,7 @@ export default { ...@@ -484,7 +491,7 @@ export default {
if (this.searchFrom.goods_id) { if (this.searchFrom.goods_id) {
json.goods_id = this.searchFrom.goods_id; json.goods_id = this.searchFrom.goods_id;
} }
if(this.searchFrom.sort_value){ if (this.searchFrom.sort_value) {
json.sort_value = this.searchFrom.sort_value; json.sort_value = this.searchFrom.sort_value;
json.sort_key = this.searchFrom.sort_key; json.sort_key = this.searchFrom.sort_key;
} }
...@@ -506,7 +513,7 @@ export default { ...@@ -506,7 +513,7 @@ export default {
if (this.searchFrom.user_id) { if (this.searchFrom.user_id) {
json.user_id = this.searchFrom.user_id; json.user_id = this.searchFrom.user_id;
} }
if (this.searchFrom.payTime&&this.searchFrom.payTime.length > 0) { if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
if ( if (
this.searchFrom.payTime[0] && this.searchFrom.payTime[0] &&
this.searchFrom.payTime[0].length > 0 this.searchFrom.payTime[0].length > 0
...@@ -522,7 +529,7 @@ export default { ...@@ -522,7 +529,7 @@ export default {
json.pay_over_at = this.searchFrom.end_at; json.pay_over_at = this.searchFrom.end_at;
} }
} }
if (this.searchFrom.classTime&&this.searchFrom.classTime.length > 0) { if (this.searchFrom.classTime && this.searchFrom.classTime.length > 0) {
console.log(this.searchFrom.classTime) console.log(this.searchFrom.classTime)
if ( if (
this.searchFrom.classTime[0] && this.searchFrom.classTime[0] &&
...@@ -596,12 +603,12 @@ export default { ...@@ -596,12 +603,12 @@ export default {
this.getTeacherList() this.getTeacherList()
this.getGoodsOption() this.getGoodsOption()
} }
}; };
</script> </script>
<style lang="less" scope> <style lang="less" scope>
.channel-trans-list { .channel-trans-list {
padding: 20px 0; padding: 20px 0;
} }
</style> </style>
src/components/conversionList/teacherPeriodsConversionList.vue
View file @ 99540928
...@@ -151,17 +151,18 @@ ...@@ -151,17 +151,18 @@
</div> </div>
</template> </template>
<script> <script>
import { import {
getTeacherPeriodsConversionListApi, getTeacherPeriodsConversionListApi,
getGoodsListApi, getGoodsListApi,
getPeriodsOtherListApi, getPeriodsOtherListApi,
getTeacherListApi, getTeacherListApi,
getUpdateTimeApi getUpdateTimeApi
} from "../../service/api"; } from "../../service/api";
import page from "../framework/page"; import page from "../framework/page";
import { GOODSTYPE, CLASSSOURCE } from "../../util/wordbook"; import {GOODSTYPE, CLASSSOURCE} from "../../util/wordbook";
import { tipArr3 } from "../../util/tipArr"; import {tipArr3} from "../../util/tipArr";
export default {
export default {
name: "teacherPeriodsConversionList", name: "teacherPeriodsConversionList",
data() { data() {
return { return {
...@@ -268,7 +269,7 @@ export default { ...@@ -268,7 +269,7 @@ export default {
spanArr: [], spanArr: [],
contentSpanArr: [], contentSpanArr: [],
searchFrom: { searchFrom: {
classTime:[], classTime: [],
payTime: [], payTime: [],
start_at: "", start_at: "",
end_at: "", end_at: "",
...@@ -282,14 +283,14 @@ export default { ...@@ -282,14 +283,14 @@ export default {
}, },
propertyList: [], propertyList: [],
watchList: [ watchList: [
{ id: 0, title: 5 }, {id: 0, title: 5},
{ id: 1, title: 6 }, {id: 1, title: 6},
{ id: 2, title: 10 }, {id: 2, title: 10},
{ id: 3, title: 20 } {id: 3, title: 20}
] ]
}; };
}, },
components: { page }, components: {page},
methods: { methods: {
periodName(val) { periodName(val) {
let str = ''; let str = '';
...@@ -314,7 +315,7 @@ export default { ...@@ -314,7 +315,7 @@ export default {
} }
return str return str
}, },
rendertip(h, { column }) { rendertip(h, {column}) {
// console.log(h) // console.log(h)
return h("span", [ return h("span", [
h("span", column.label), h("span", column.label),
...@@ -336,11 +337,11 @@ export default { ...@@ -336,11 +337,11 @@ export default {
) )
]); ]);
}, },
sortMethod(data){ sortMethod(data) {
this.searchFrom.sort_key = data.prop this.searchFrom.sort_key = data.prop
if(data.order=='ascending'){ if (data.order == 'ascending') {
this.searchFrom.sort_value = 'asc' this.searchFrom.sort_value = 'asc'
}else{ } else {
this.searchFrom.sort_value = 'desc' this.searchFrom.sort_value = 'desc'
} }
this.getChannelTransList() this.getChannelTransList()
...@@ -348,7 +349,7 @@ export default { ...@@ -348,7 +349,7 @@ export default {
getTeacherList() { getTeacherList() {
let json = { let json = {
page: 1, page: 1,
limit: 200 limit: 500
}; };
getTeacherListApi(json).then(res => { getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
...@@ -413,7 +414,7 @@ export default { ...@@ -413,7 +414,7 @@ export default {
// } // }
}, },
handleItemChange(val) { handleItemChange(val) {
getPeriodsApi({ goods_id: val[0], limit: 100 }).then(res => { getPeriodsApi({goods_id: val[0], limit: 100}).then(res => {
res.list.forEach(i => { res.list.forEach(i => {
i.name = i.title; i.name = i.title;
}); });
...@@ -487,9 +488,9 @@ export default { ...@@ -487,9 +488,9 @@ export default {
}); });
}, },
getPeriodsOtherList() { getPeriodsOtherList() {
let json = { limit: 1000,page:1,max_watch_num:20 }; let json = {limit: 1000, page: 1, max_watch_num: 20};
getPeriodsOtherListApi(json).then(res => { getPeriodsOtherListApi(json).then(res => {
res.list.forEach(val=>{ res.list.forEach(val => {
val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}` val.label = `【${val.goods_id}】${val.title}${val.watch_num}课时（${val.start_at.slice(5).replace('-', '')}）-d${val.has_watch_num}`
}) })
this.periodList = res.list; this.periodList = res.list;
...@@ -504,7 +505,7 @@ export default { ...@@ -504,7 +505,7 @@ export default {
if (this.searchFrom.invite_type) { if (this.searchFrom.invite_type) {
json.invite_type = this.searchFrom.invite_type; json.invite_type = this.searchFrom.invite_type;
} }
if(this.searchFrom.sort_value){ if (this.searchFrom.sort_value) {
json.sort_value = this.searchFrom.sort_value; json.sort_value = this.searchFrom.sort_value;
json.sort_key = this.searchFrom.sort_key; json.sort_key = this.searchFrom.sort_key;
} }
...@@ -520,7 +521,7 @@ export default { ...@@ -520,7 +521,7 @@ export default {
if (this.searchFrom.teacher_id) { if (this.searchFrom.teacher_id) {
json.teacher_id = this.searchFrom.teacher_id; json.teacher_id = this.searchFrom.teacher_id;
} }
if (this.searchFrom.payTime&&this.searchFrom.payTime.length > 0) { if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
if ( if (
this.searchFrom.payTime[0] && this.searchFrom.payTime[0] &&
this.searchFrom.payTime[0].length > 0 this.searchFrom.payTime[0].length > 0
...@@ -536,7 +537,7 @@ export default { ...@@ -536,7 +537,7 @@ export default {
json.end_at = this.searchFrom.end_at; json.end_at = this.searchFrom.end_at;
} }
} }
if (this.searchFrom.classTime&&this.searchFrom.classTime.length > 0) { if (this.searchFrom.classTime && this.searchFrom.classTime.length > 0) {
console.log(this.searchFrom.classTime) console.log(this.searchFrom.classTime)
if ( if (
this.searchFrom.classTime[0] && this.searchFrom.classTime[0] &&
...@@ -616,12 +617,12 @@ export default { ...@@ -616,12 +617,12 @@ export default {
this.getTeacherList(); this.getTeacherList();
this.getUpdateTime(); this.getUpdateTime();
} }
}; };
</script> </script>
<style lang="less" scope> <style lang="less" scope>
.channel-trans-list { .channel-trans-list {
padding: 20px 0; padding: 20px 0;
} }
</style> </style>
src/components/externalLaunch/index.vue
View file @ 99540928
This diff is collapsed.
src/components/framework/leftMenu.vue
View file @ 99540928
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
&::-webkit-scrollbar { &::-webkit-scrollbar {
background-color: #333333; /* or add it to the track */ background-color: #333333; /* or add it to the track */
&:hover { &:hover {
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background-color: #999; background-color: #999;
......
src/components/monthOrder/index.vue
View file @ 99540928
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
show: false, show: false,
nowPage: 1, nowPage: 1,
total: 0, total: 0,
limit: 100, limit: 500,
teacher_id: '' teacher_id: ''
}, },
teacherList: [], teacherList: [],
......
src/components/monthOrder/newDialog.vue
View file @ 99540928
This diff is collapsed.
src/components/order/index.vue
View file @ 99540928
...@@ -244,37 +244,37 @@ ...@@ -244,37 +244,37 @@
} from "../../util/wordbook"; } from "../../util/wordbook";
import CommonJs from "../../util/common"; import CommonJs from "../../util/common";
export default { export default {
name: "index", name: "index",
data() { data() {
return { return {
nowPage: 1, nowPage: 1,
total: 0, total: 0,
today:{ today: {
text:'今天', text: '今天',
onClick:()=>{ onClick: () => {
this.searchFrom.payTime = [this.formatTime(new Date())+' 00:00:00',this.formatTime(new Date())+' 23:59:59']; this.searchFrom.payTime = [this.formatTime(new Date()) + ' 00:00:00', this.formatTime(new Date()) + ' 23:59:59'];
} }
}, },
yesterday:{ yesterday: {
text:'昨天', text: '昨天',
onClick:()=>{ onClick: () => {
let preDate = this.formatTime(new Date(new Date().getTime() - 24*60*60*1000)); let preDate = this.formatTime(new Date(new Date().getTime() - 24 * 60 * 60 * 1000));
this.searchFrom.payTime = [preDate+' 00:00:00',preDate+' 23:59:59']; this.searchFrom.payTime = [preDate + ' 00:00:00', preDate + ' 23:59:59'];
} }
}, },
last30Day:{ last30Day: {
text:'过去30天', text: '过去30天',
onClick:()=>{ onClick: () => {
let preDate = this.formatTime(new Date(new Date().getTime() - 30*24*60*60*1000)); let preDate = this.formatTime(new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000));
this.searchFrom.payTime = [preDate+' 00:00:00',this.formatTime(new Date())+' 23:59:59']; this.searchFrom.payTime = [preDate + ' 00:00:00', this.formatTime(new Date()) + ' 23:59:59'];
} }
}, },
last7Day:{ last7Day: {
text:'过去7天', text: '过去7天',
onClick:()=>{ onClick: () => {
let preDate = this.formatTime(new Date(new Date().getTime() - 7*24*60*60*1000)); let preDate = this.formatTime(new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000));
this.searchFrom.payTime = [preDate+' 00:00:00',this.formatTime(new Date())+' 23:59:59']; this.searchFrom.payTime = [preDate + ' 00:00:00', this.formatTime(new Date()) + ' 23:59:59'];
} }
}, },
sourceDialog: { sourceDialog: {
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
limit: 10, limit: 10,
searchFrom: { searchFrom: {
nickname: "", nickname: "",
wait_into_course:'', wait_into_course: '',
user_id: "", user_id: "",
invite_type: "", invite_type: "",
invite_id: "", invite_id: "",
...@@ -302,7 +302,7 @@ export default { ...@@ -302,7 +302,7 @@ export default {
out_trade_no: "", out_trade_no: "",
payTime: [], payTime: [],
order_group_id: "", order_group_id: "",
is_captain:"", is_captain: "",
}, },
tableData: [], tableData: [],
dialogObj: { dialogObj: {
...@@ -323,18 +323,18 @@ export default { ...@@ -323,18 +323,18 @@ export default {
buyTypeOption: BUYTYPEOPTION, buyTypeOption: BUYTYPEOPTION,
inviteSearchPlaceholder: "", inviteSearchPlaceholder: "",
rules: { rules: {
value: [{ required: true, message: "请输入备注", trigger: "change" }] value: [{required: true, message: "请输入备注", trigger: "change"}]
}, },
promoterDialog: { promoterDialog: {
show: false, show: false,
nowPage: 1, nowPage: 1,
total: 0, total: 0,
limit: 100, limit: 500,
teacher_id: "" teacher_id: ""
}, },
teacherList: [], teacherList: [],
loading: false, loading: false,
isLeaderOption:ISLEADEROPTION, isLeaderOption: ISLEADEROPTION,
}; };
}, },
methods: { methods: {
...@@ -361,14 +361,14 @@ export default { ...@@ -361,14 +361,14 @@ export default {
} }
return str return str
}, },
formatTime(date){ formatTime(date) {
let year = date.getFullYear(); let year = date.getFullYear();
let Month = date.getMonth()+1; let Month = date.getMonth() + 1;
if(Month < 10){ if (Month < 10) {
Month = `0${Month}` Month = `0${Month}`
} }
let Day = date.getDate(); let Day = date.getDate();
if(Day<10)Day = `0${Day}`; if (Day < 10) Day = `0${Day}`;
return `${year}-${Month}-${Day}`; return `${year}-${Month}-${Day}`;
}, },
showRef(data) { showRef(data) {
...@@ -385,7 +385,7 @@ export default { ...@@ -385,7 +385,7 @@ export default {
}, },
changeRow(data, b) { changeRow(data, b) {
if (b.indexOf(data) > -1) { if (b.indexOf(data) > -1) {
getRefundListApi({ out_trade_no: data.out_trade_no }).then(res => { getRefundListApi({out_trade_no: data.out_trade_no}).then(res => {
data.refundList = res.list; data.refundList = res.list;
}); });
} }
...@@ -436,14 +436,14 @@ export default { ...@@ -436,14 +436,14 @@ export default {
json.wait_into_course = this.searchFrom.wait_into_course json.wait_into_course = this.searchFrom.wait_into_course
} }
json.course_type = 1; //日课 json.course_type = 1; //日课
exportExcelApi("/api/admin/order/export", json,'日课订单列表'); exportExcelApi("/api/admin/order/export", json, '日课订单列表');
}, },
getGoodsOption() { getGoodsOption() {
let json = { let json = {
page: 1, page: 1,
limit: 100, limit: 100,
course_type:1, course_type: 1,
status:"1,2" status: "1,2"
}; };
getGoodsListApi(json).then(res => { getGoodsListApi(json).then(res => {
......
src/components/periods/newDialog.vue
View file @ 99540928
This diff is collapsed.
src/components/userDetail/callBack.vue
View file @ 99540928
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
</el-card> </el-card>
<!--添加回访信息--> <!--添加回访信息-->
<el-card shadow="never" v-if="callbackObj.teacher_id && !$store.state.readonly" class="callback-item callback-input"> <!--<el-card shadow="never" v-if="callbackObj.teacher_id && !$store.state.readonly" class="callback-item callback-input">-->
<el-card shadow="never" v-if="callbackObj.teacher_id" class="callback-item callback-input">
<el-form size="small" inline> <el-form size="small" inline>
<el-form-item required> <el-form-item required>
<el-select v-model="add.method" placeholder="回访方式" style="width: 140px;"> <el-select v-model="add.method" placeholder="回访方式" style="width: 140px;">
...@@ -186,7 +187,8 @@ ...@@ -186,7 +187,8 @@
props: { props: {
callbackObj: { // user_id、teacher_id、timestamp callbackObj: { // user_id、teacher_id、timestamp
type: Object, type: Object,
default: () => {} default: () => {
}
}, },
hasUserInfo: { // 是否传过来用户信息，传来用户信息就不调接口请求用户新，否则请求（防止同时请求用户信息接口报错） hasUserInfo: { // 是否传过来用户信息，传来用户信息就不调接口请求用户新，否则请求（防止同时请求用户信息接口报错）
type: Boolean, type: Boolean,
...@@ -482,6 +484,7 @@ ...@@ -482,6 +484,7 @@
<style lang="less"> <style lang="less">
.callback-container { .callback-container {
border: none; border: none;
.el-divider--horizontal { .el-divider--horizontal {
margin: 20px 0; margin: 20px 0;
} }
......
src/components/userDetail/dialog.vue
View file @ 99540928
...@@ -24,27 +24,28 @@ ...@@ -24,27 +24,28 @@
</template> </template>
<script> <script>
import {getTeacherListApi,addRelatedTeacherApi} from "../../service/api"; import {getTeacherListApi, addRelatedTeacherApi} from "../../service/api";
export default { export default {
props:[ props: [
'dialogObj' 'dialogObj'
], ],
data(){ data() {
return{ return {
form:{ form: {
id: '', id: '',
teacher_id:'', teacher_id: '',
}, },
teacherList:[], teacherList: [],
} }
}, },
methods:{ methods: {
initPage(){ initPage() {
let json ={ let json = {
page:1, page: 1,
limit:200 limit: 500
} }
getTeacherListApi(json).then(res=>{ getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
}); });
this.form = { this.form = {
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : '' teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : ''
}; };
}, },
onSave(){ onSave() {
let json = { let json = {
teacher_id: this.form.teacher_id ? this.form.teacher_id : 0 teacher_id: this.form.teacher_id ? this.form.teacher_id : 0
}; };
...@@ -66,9 +67,9 @@ ...@@ -66,9 +67,9 @@
}) })
} }
}, },
watch:{ watch: {
'dialogObj.show'(value){ 'dialogObj.show'(value) {
if(value){ if (value) {
this.initPage() this.initPage()
} }
} }
......
src/components/yunji/dialog.vue
View file @ 99540928
...@@ -25,27 +25,28 @@ ...@@ -25,27 +25,28 @@
</template> </template>
<script> <script>
import {getTeacherListApi,bindTeacherApi} from "../../service/api"; import {getTeacherListApi, bindTeacherApi} from "../../service/api";
export default { export default {
props:[ props: [
'dialogObj' 'dialogObj'
], ],
data(){ data() {
return{ return {
form:{ form: {
id: '', id: '',
teacher_id:'', teacher_id: '',
}, },
teacherList:[], teacherList: [],
} }
}, },
methods:{ methods: {
initPage(){ initPage() {
let json ={ let json = {
page:1, page: 1,
limit:200 limit: 500
} }
getTeacherListApi(json).then(res=>{ getTeacherListApi(json).then(res => {
this.teacherList = res.list; this.teacherList = res.list;
}); });
this.form = { this.form = {
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : '' teacher_id: this.dialogObj.teacher_id ? this.dialogObj.teacher_id : ''
}; };
}, },
onSave(){ onSave() {
let teacher_id=this.form.teacher_id ? this.form.teacher_id : 0 let teacher_id = this.form.teacher_id ? this.form.teacher_id : 0
bindTeacherApi(this.form.id,teacher_id).then(res => { bindTeacherApi(this.form.id, teacher_id).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '绑定成功!' message: '绑定成功!'
...@@ -64,8 +65,8 @@ ...@@ -64,8 +65,8 @@
}) })
} }
}, },
watch:{ watch: {
'dialogObj'(value){ 'dialogObj'(value) {
this.initPage() this.initPage()
} }
} }
......
src/components/yunji/index.vue
View file @ 99540928
This diff is collapsed.
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