|
@@ -1340,6 +1340,7 @@
|
|
|
@change="submissionTimePickerChange"
|
|
|
type="daterange"
|
|
|
range-separator="▼"
|
|
|
+ :picker-options="pickerOptions([])"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</div>
|
|
@@ -2358,10 +2359,9 @@ export default {
|
|
|
pickerOptions(){
|
|
|
return (dataList)=>{
|
|
|
let _result = {
|
|
|
- // shortcuts:[]
|
|
|
+ shortcuts:[]
|
|
|
}
|
|
|
if(dataList && dataList.length>0){
|
|
|
- _result.shortcuts = [];
|
|
|
for(let i = 0;i<dataList.length;i++){
|
|
|
if(dataList[i].time.length<=0)continue;
|
|
|
_result.shortcuts.push({
|
|
@@ -2373,7 +2373,9 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- if(this.sortTime.length>0){
|
|
|
+
|
|
|
+ }
|
|
|
+ if(this.sortTime.length>0){
|
|
|
this.sortTime.forEach(i=>{
|
|
|
_result.shortcuts.push({
|
|
|
text:i.title?i.title:"-",
|
|
@@ -2383,7 +2385,6 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
- }
|
|
|
return _result;
|
|
|
}
|
|
|
}
|
|
@@ -4602,7 +4603,7 @@ ${JSON.stringify(item.array)}
|
|
|
// this.getClass2()
|
|
|
this.changeHeight();
|
|
|
});
|
|
|
- // this.getClassSortTime();
|
|
|
+ this.getClassSortTime();
|
|
|
},
|
|
|
};
|
|
|
</script>
|