|
|
@@ -509,9 +509,11 @@
|
|
|
>
|
|
|
<el-form :model="maskForm" label-position="right" label-width="150px">
|
|
|
<el-form-item label="开课时间">
|
|
|
+ <!-- :picker-options="pickerOptions" -->
|
|
|
<el-date-picker
|
|
|
v-model.trim="maskForm.courseStartOnline"
|
|
|
type="date"
|
|
|
+
|
|
|
:picker-options="courseOption"
|
|
|
placeholder="请选择开课时间"
|
|
|
/>
|
|
|
@@ -585,7 +587,7 @@
|
|
|
<div class="planTop">
|
|
|
<p>已排课程</p>
|
|
|
</div>
|
|
|
- <div class="planCore" v-if="this.lookList.length>0">
|
|
|
+ <div class="planCore" v-if="this.lookList.length > 0">
|
|
|
<div v-for="(item, index) in this.lookList" class="row" :key="index">
|
|
|
<div class="name">{{ item.type }}</div>
|
|
|
<div class="week">{{ item.week }}</div>
|
|
|
@@ -597,9 +599,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="nomore" v-else>
|
|
|
- 暂无数据
|
|
|
- </div>
|
|
|
+ <div class="nomore" v-else>暂无数据</div>
|
|
|
<div slot="footer" style="margin-top: 20px" class="dialog-footer">
|
|
|
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="setTimeTable">确 定</el-button>
|
|
|
@@ -910,7 +910,9 @@ export default {
|
|
|
disabledDate: (time) => {
|
|
|
if (self.leftForm.courseStart) {
|
|
|
let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
|
|
|
- return time.getTime() < date.getTime();
|
|
|
+ let nowDate = new Date()
|
|
|
+ let changeDate = date.getTime()-nowDate.getTime() >0?date:nowDate
|
|
|
+ return time.getTime() < changeDate.getTime();
|
|
|
}
|
|
|
return;
|
|
|
},
|
|
|
@@ -1537,25 +1539,50 @@ export default {
|
|
|
educationalTeacherId: this.leftForm.educationalTeacherId,
|
|
|
organId: this.leftForm.classOrganId,
|
|
|
};
|
|
|
+ // 新增
|
|
|
+ createVip(obj).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ if (res.data == "ING") {
|
|
|
+ this.$confirm(
|
|
|
+ "课程提交成功，已提交运营主管审批,审批通过后，课程创建成功！",
|
|
|
+ "提示",
|
|
|
+ {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ type: "warning",
|
|
|
+ }
|
|
|
+ ).then(() => {
|
|
|
+ this.$message.success("提交成功");
|
|
|
+ this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
+ this.$router.push({
|
|
|
+ path: "/vipManager/vipList",
|
|
|
+ query: {
|
|
|
+ rules: this.rules,
|
|
|
+ searchForm: this.searchForm,
|
|
|
+ },
|
|
|
+ });
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$message.success("恭喜您创建成功");
|
|
|
+ this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
+ this.$router.push({
|
|
|
+ path: "/vipManager/vipList",
|
|
|
+ query: {
|
|
|
+ rules: this.rules,
|
|
|
+ searchForm: this.searchForm,
|
|
|
+ },
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ console.log(res)
|
|
|
+ if (res.code == 206) {
|
|
|
|
|
|
- // 调接前判断是新增还是修改
|
|
|
- if (!this.id) {
|
|
|
- // 新增
|
|
|
- createVip(obj).then((res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- if (res.data == "ING") {
|
|
|
- this.$confirm(
|
|
|
- "课程提交成功，已提交运营主管审批,审批通过后，课程创建成功！",
|
|
|
- "提示",
|
|
|
- {
|
|
|
- confirmButtonText: "确定",
|
|
|
- type: "warning",
|
|
|
- }
|
|
|
- ).then(() => {
|
|
|
- // this.$message({
|
|
|
- // type: 'success',
|
|
|
- // message: '提交成功!'
|
|
|
- // });
|
|
|
+ this.$confirm(res.msg, "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ type: "warning",
|
|
|
+ }).then(() => {
|
|
|
+ obj.allowOverstepActivityStudentNum = 1;
|
|
|
+ createVip(obj).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
this.$message.success("提交成功");
|
|
|
this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
this.$router.push({
|
|
|
@@ -1565,25 +1592,11 @@ export default {
|
|
|
searchForm: this.searchForm,
|
|
|
},
|
|
|
});
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.$message.success("恭喜您创建成功");
|
|
|
- this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
- this.$router.push({
|
|
|
- path: "/vipManager/vipList",
|
|
|
- query: {
|
|
|
- rules: this.rules,
|
|
|
- searchForm: this.searchForm,
|
|
|
- },
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- } else {
|
|
|
- // 修改
|
|
|
- obj.vipGroupApplyBaseInfo.id = this.id;
|
|
|
- updateVipBaseInfo(obj.vipGroupApplyBaseInfo).then((res) => {});
|
|
|
- }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
setSection(val) {
|
|
|
this.leftForm.section = "";
|
|
|
@@ -1661,7 +1674,7 @@ export default {
|
|
|
|
|
|
// this.leftForm.courseType = null;
|
|
|
if (val) {
|
|
|
- this.getOrganStudentList(val)
|
|
|
+ this.getOrganStudentList(val);
|
|
|
vipGroupCategory({
|
|
|
organId: val,
|
|
|
}).then((res) => {
|
|
|
@@ -1767,7 +1780,7 @@ export default {
|
|
|
if (organId) {
|
|
|
queryOrganStudentList({
|
|
|
rows: 50,
|
|
|
- organId:organId,
|
|
|
+ organId: organId,
|
|
|
}).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
this.studentList = res.data.rows;
|
mo