|
|
@@ -66,6 +66,11 @@
|
|
|
<el-date-picker v-model="updateTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="updateChange"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="完课时间" prop="finishTime">
|
|
|
+ <el-date-picker v-model="finishTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
+ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="finishTimeChange"></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
|
|
|
|
|
|
<el-form-item>
|
|
|
@@ -174,6 +179,7 @@ export default {
|
|
|
activeName:"00",
|
|
|
createTime:null,
|
|
|
updateTime:null,
|
|
|
+ finishTime:null,
|
|
|
courseLists:[],
|
|
|
videoList:[],
|
|
|
logTypeOptions:[],
|
|
|
@@ -221,6 +227,8 @@ export default {
|
|
|
eTime:null,
|
|
|
upSTime:null,
|
|
|
upETime:null,
|
|
|
+ finishSTime:null,
|
|
|
+ finishETime:null,
|
|
|
scheduleStartTime: null,
|
|
|
scheduleEndTime: null,
|
|
|
sourceType: 1
|
|
|
@@ -401,6 +409,23 @@ export default {
|
|
|
this.queryParams.upETime = null;
|
|
|
}
|
|
|
},
|
|
|
+ finishTimeChange(finishTime){
|
|
|
+ if (finishTime && finishTime.length >= 2) {
|
|
|
+ if(!this.checkDateRangeLimit(finishTime)){
|
|
|
+ this.finishTime = null;
|
|
|
+ this.queryParams.finishSTime=null;
|
|
|
+ this.queryParams.finishETime=null;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ this.queryParams.finishSTime = finishTime[0] || null;
|
|
|
+ this.queryParams.finishETime = finishTime[1] || null;
|
|
|
+ } else {
|
|
|
+ this.finishTime = [];
|
|
|
+ this.queryParams.finishSTime = null;
|
|
|
+ this.queryParams.finishETime = null;
|
|
|
+ }
|
|
|
+ },
|
|
|
handleClickX(tab,event){
|
|
|
this.activeName=tab.name;
|
|
|
if(tab.name=="00"){
|
|
|
@@ -416,8 +441,9 @@ export default {
|
|
|
// xgb 看课数据量太大必须限制时间if (this.isEmptyArray(this.createTime) &&
|
|
|
if (this.isEmptyArray(this.createTime) &&
|
|
|
this.isEmptyArray(this.updateTime) &&
|
|
|
- this.isEmptyArray(this.scheduleTime)) {
|
|
|
- this.$message.warning('请选择创建时间或营期时间或最新更新时间');
|
|
|
+ this.isEmptyArray(this.scheduleTime) &&
|
|
|
+ this.isEmptyArray(this.finishTime)) {
|
|
|
+ this.$message.warning('请选择创建时间或营期时间或最新更新时间或完课时间');
|
|
|
return;
|
|
|
}
|
|
|
this.loading = true;
|
|
|
@@ -448,6 +474,7 @@ export default {
|
|
|
logType: null,
|
|
|
createTime: null,
|
|
|
updateTime: null,
|
|
|
+ finishTime:null,
|
|
|
qwExternalContactId: null,
|
|
|
externalUserName:null,
|
|
|
duration: null,
|
|
|
@@ -475,10 +502,13 @@ export default {
|
|
|
// this.queryParams.eTime = null;
|
|
|
this.queryParams.upSTime = null;
|
|
|
this.queryParams.upETime = null;
|
|
|
+ this.queryParams.finishSTime = null;
|
|
|
+ this.queryParams.finishETime = null;
|
|
|
this.queryParams.scheduleStartTime = null;
|
|
|
this.queryParams.scheduleEndTime = null;
|
|
|
this.scheduleTime=null;
|
|
|
this.updateTime=null;
|
|
|
+ this.finishTime=null;
|
|
|
// 重置时间当天
|
|
|
this.setToday();
|
|
|
|
|
|
@@ -550,8 +580,9 @@ export default {
|
|
|
// xgb 看课数据量太大必须限制时间
|
|
|
if (this.isEmptyArray(this.createTime) &&
|
|
|
this.isEmptyArray(this.updateTime) &&
|
|
|
- this.isEmptyArray(this.scheduleTime)) {
|
|
|
- this.$message.warning('请选择创建时间或营期时间或最新更新时间');
|
|
|
+ this.isEmptyArray(this.scheduleTime) &&
|
|
|
+ this.isEmptyArray(this.finishTime)) {
|
|
|
+ this.$message.warning('请选择创建时间或营期时间或最新更新时间或完课时间');
|
|
|
return;
|
|
|
}
|
|
|
const queryParams = this.queryParams;
|