|
|
@@ -94,7 +94,22 @@
|
|
|
<el-table-column label="任务类型" align="center" prop="taskType">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag v-if="scope.row.taskType == 1">普通任务</el-tag>
|
|
|
- <el-tag v-if="scope.row.taskType == 2">场景任务</el-tag>
|
|
|
+ <el-tag v-if="scope.row.taskType == 2">场景任务 - {{scope.row.sceneTypeName}}</el-tag>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="生效时间段" align="center" prop="taskType" width="250">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div v-if="scope.row.taskType == 1">
|
|
|
+ {{scope.row.runtimeRangeStart}} ~ {{scope.row.runtimeRangeEnd}}
|
|
|
+ </div>
|
|
|
+ <div v-if="scope.row.taskType == 2" >
|
|
|
+ <div v-if="!!scope.row.availableStartTime && !!scope.row.availableEndTime ">
|
|
|
+ 适用:{{scope.row.availableStartTime}} ~ {{scope.row.availableEndTime}}
|
|
|
+ </div>
|
|
|
+ <div v-if="!!scope.row.runtimeRangeStart && !!scope.row.runtimeRangeEnd">
|
|
|
+ 运行:{{scope.row.runtimeRangeStart}} ~ {{scope.row.runtimeRangeEnd}}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务状态" align="center">
|
|
|
@@ -270,6 +285,40 @@
|
|
|
<el-option v-for="opt in sceneList" :key="opt.dictValue" :label="opt.dictLabel" :value="opt.dictValue"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="运行时间" required>
|
|
|
+ <el-col :span="11">
|
|
|
+ <el-form-item prop="runtimeRangeStart">
|
|
|
+ <el-time-select
|
|
|
+ placeholder="任务运行开始时间"
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="form.runtimeRangeStart"
|
|
|
+ key="runtimeRangeStart"
|
|
|
+ :picker-options="{
|
|
|
+ start: '07:00',
|
|
|
+ step: '00:30',
|
|
|
+ end: '22:00'
|
|
|
+ }">
|
|
|
+ </el-time-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col class="line" :span="2" style="text-align: center">-</el-col>
|
|
|
+ <el-col :span="11">
|
|
|
+ <el-form-item prop="runtimeRangeEnd">
|
|
|
+ <el-time-select
|
|
|
+ style="width: 100%;"
|
|
|
+ placeholder="任务运行结束时间"
|
|
|
+ v-model="form.runtimeRangeEnd"
|
|
|
+ key="runtimeRangeEnd"
|
|
|
+ :picker-options="{
|
|
|
+ start: '07:00',
|
|
|
+ step: '00:30',
|
|
|
+ end: '22:00',
|
|
|
+ minTime: form.runtimeRangeStart
|
|
|
+ }">
|
|
|
+ </el-time-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="适用时间" required>
|
|
|
<el-col :span="11">
|
|
|
<el-form-item prop="availableStartTime">
|
|
|
@@ -281,7 +330,7 @@
|
|
|
:picker-options="{
|
|
|
start: '00:00',
|
|
|
step: '00:30',
|
|
|
- end: '24:00'
|
|
|
+ end: '23:30'
|
|
|
}">
|
|
|
</el-time-select>
|
|
|
</el-form-item>
|
|
|
@@ -297,7 +346,7 @@
|
|
|
:picker-options="{
|
|
|
start: '00:00',
|
|
|
step: '00:30',
|
|
|
- end: '24:00'
|
|
|
+ end: '23:30'
|
|
|
}">
|
|
|
</el-time-select>
|
|
|
</el-form-item>
|
|
|
@@ -714,7 +763,7 @@ import {
|
|
|
getCurrentCompanyId
|
|
|
} from "@/api/company/companyVoiceRobotic";
|
|
|
import draggable from 'vuedraggable'
|
|
|
-import { listAll } from '@/api/company/wxDialog';
|
|
|
+// import { listAll } from '@/api/company/wxDialog';
|
|
|
import customerSelect from '@/views/crm/components/CustomerSelect.vue';
|
|
|
import qwUserSelect from '@/views/components/QwUserSelect.vue';
|
|
|
import qwUserSelectTwo from '@/views/components/QwUserSelectTwo.vue';
|
|
|
@@ -887,9 +936,9 @@ export default {
|
|
|
this.robotList = e.robot;
|
|
|
this.dialogList = e.dialog;
|
|
|
})
|
|
|
- listAll().then(e => {
|
|
|
- this.wxDialogList = e.data;
|
|
|
- })
|
|
|
+ // listAll().then(e => {
|
|
|
+ // this.wxDialogList = e.data;
|
|
|
+ // })
|
|
|
companyUserList().then(e => {
|
|
|
this.qwUserList = e.data;
|
|
|
})
|