禅道bug修改

fuwaiCallCenterWeb.UI/src/views/order/orderCreate/index.vue

@@ -139,6 +139,11 @@ export default {
           required: true,
           trigger: 'blur',
           validator: validateTelRule
+        }],
+        content: [{
+          required: true,
+          message: '请输入工单内容',
+          trigger: 'blur'
         }]
       },
       loading: false

fuwaiCallCenterWeb.UI/src/views/outbound/allot/index.vue

@@ -20,7 +20,7 @@
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
     </div>
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName" @tab-click="handleClick" v-if="flag">
       <el-tab-pane v-for="item in tabMapOptions" :key="item.key" :name="item.key">
         <span slot="label">{{ item.label }}<span :class="item.listclass">({{ item.num }})</span></span>
         <tabAllot v-if="activeName===item.key" ref="tabtask" :search-datas="searchDatas" @getTotalNums="getTotalNum"/>
@@ -35,7 +35,9 @@ import {
   pickerOptions
 } from '@/utils'
 import tabAllot from './components/tabAllot'
-
+import {
+  getPlanLists
+} from '@/api/outbound/plan'
 export default {
   name: 'Allot',
   components: {
@@ -75,6 +77,12 @@ export default {
         keyword: '', // 计划名称
         isallot: ''
       },
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      flag:false,//表头数据展示
       activeName: 'first',
       tabMapOptions: [{
         label: '全部',
@@ -97,6 +105,9 @@ export default {
       ]
     }
   },
+  created() {
+    this.getCurrentList()
+  },
   mounted() {
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
@@ -131,7 +142,52 @@ export default {
       this.tabMapOptions[0].num = value.totalcount // 全部
       this.tabMapOptions[1].num = value.wfpcount // 待分配
       this.tabMapOptions[2].num = value.fpcount // 已分配
-    }
+    },
+    getCurrentList() {
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          key: this.searchDatas.keyword.replace(/\s+/g, ""), //	否	string	任务名称，可模糊查询
+          taskstate: this.searchDatas.sc_state, //	否	int	任务状态 （不传值时查询所有状态）
+          stime: this.searchDatas.searchDate && this.searchDatas.searchDate[0], //	否	string	开始时间
+          etime: this.searchDatas.searchDate && this.searchDatas.searchDate[1], //	否	string	结束时间
+          isallot: this.searchDatas.isallot //	否	int	分配状态 （不传值时查询所有状态）
+        }
+        getPlanLists(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            switch (this.searchDatas.isallot) {
+              case '':
+                this.pageParams.total = response.totalcount
+                break
+              case 0:
+                this.pageParams.total = response.wfpcount
+                break
+              case 1:
+                this.pageParams.total = response.fpcount
+                break
+              default:
+                break
+            }
+            console.log(this.dataLists)
+            if (response.total >= 100) {
+              response.total = '99+'
+            }
+            if (response.wfpcount >= 100) {
+              response.wfpcount = '99+'
+            }
+            if (response.fpcount >= 100) {
+              response.fpcount = '99+'
+            }
+            this.tabMapOptions[0].num = response.totalcount // 全部
+            this.tabMapOptions[1].num = response.wfpcount // 待分配
+            this.tabMapOptions[2].num = response.fpcount // 已分配
+            this.flag = true
+          }
+        })
+        resolve()
+      })
+    },
   }
 }
 </script>

fuwaiCallCenterWeb.UI/src/views/outbound/myTask/index.vue

@@ -19,7 +19,7 @@
       <el-input v-model="searchDatas.keyword" placeholder="请输入计划名称" class="filter-item"/>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName" @tab-click="handleClick" v-if="flag">
       <el-tab-pane v-for="item in tabMapOptions" :key="item.key" :name="item.key">
         <span slot="label">{{ item.label }}<span :class="item.listclass">({{ item.num }})</span></span>
         <tabMyTask v-if="activeName===item.key" ref="tabtask" :search-datas="searchDatas" @getTotalNums="getTotalNum"/>
@@ -38,6 +38,7 @@ import {
   getSeatLists
 } from '@/api/telCall/seatMonitor'
 import tabMyTask from './components/tabMyTask'
+import {getTaskLists} from '@/api/outbound/tasks'
 
 export default {
   name: 'MyTask',
@@ -78,6 +79,12 @@ export default {
         keyword: '', // 计划名称
         ishistory: 0
       },
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      flag:false,//表头数据展示
       activeName: 'first',
       tabMapOptions: [{
         label: '全部',
@@ -100,6 +107,9 @@ export default {
       ]
     }
   },
+  created() {
+    this.getCurrentList()
+  },
   mounted() {
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
@@ -134,7 +144,52 @@ export default {
       this.tabMapOptions[0].num = value.totalcount // 全部
       this.tabMapOptions[1].num = value.wfpcount // 当前任务
       this.tabMapOptions[2].num = value.fpcount // 历史任务
-    }
+    },
+    getCurrentList() {
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          infokind: this.searchDatas.ishistory, // 否	int	查询类型（为0或不传时获取全部，为1时获取当前任务，为2时获取历史任务）
+          isstart: this.searchDatas.sc_state, //	否	int	任务状态 （不传值时查询所有状态）
+          stime: this.searchDatas.searchDate && this.searchDatas.searchDate[0], //	否	string	开始时间
+          etime: this.searchDatas.searchDate && this.searchDatas.searchDate[1], //	否	string	结束时间
+          agentid: this.usercode, // 否	string	坐席工号（不传值查询全部坐席）
+          taskname: this.searchDatas.keyword //	否	string	计划名称，可模糊查询
+        }
+        getTaskLists(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            switch (this.searchDatas.ishistory) {
+              case 0:
+                this.pageParams.total = response.total
+                break
+              case 1:
+                this.pageParams.total = response.dqnum
+                break
+              case 2:
+                this.pageParams.total = response.lsnum
+                break
+              default:
+                break
+            }
+            if (response.total >= 100) {
+              response.total = '99+'
+            }
+            if (response.dqnum >= 100) {
+              response.dqnum = '99+'
+            }
+            if (response.lsnum >= 100) {
+              response.lsnum = '99+'
+            }
+            this.tabMapOptions[0].num = response.total // 全部
+            this.tabMapOptions[1].num = response.dqnum // 当前任务
+            this.tabMapOptions[2].num = response.lsnum // 历史任务
+            this.flag = true
+          }
+        })
+        resolve()
+      })
+    },
   }
 }
 </script>

fuwaiCallCenterWeb.UI/src/views/telCall/blackList/addOrEditBlackList.vue

@@ -126,7 +126,8 @@ export default {
       })
     },
     resetForm() {
-      this.$refs.ruleForm.resetFields()
+      this.$refs.ruleForm.resetFields();
+      this.ruleForm.rangTimes='';
     },
     // 获取详情
     getDetail(rid) {

fuwaiCallCenterWeb.UI/src/views/telCall/restDay/addOrEdit.vue

@@ -152,6 +152,7 @@ export default {
     },
     resetForm() {
       this.$refs.ruleForm.resetFields()
+      this.ruleForm.rangeTime='';
     },
     // 获取详情
     getDetail() {