1

590fdf30 · 毛细亚 · 4b93aa38 · 590fdf30 · 590fdf30 · 590fdf30
--- a/company_app/index.html
+++ b/company_app/index.html
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.72a90e47.js"></script><script defer="defer" src="static/js/app.003145b5.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.8a15faf7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.b6398f5b.js"></script><script defer="defer" src="static/js/app.839ed8fb.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.8a15faf7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
--- a/src/App.vue
+++ b/src/App.vue
@@ -97,10 +97,10 @@ export default {
          label: '快捷发送',
          path: '/quickSendGame'
        },
-        // {
+        {
-        //   label: '任务列表',
+          label: '任务列表',
-        //   path: '/taskList'
+          path: '/taskList'
-        // },
+        },
        // {
        //   label: '通讯录',
        //   path: '/addressBook'

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ import violationRecord from '../views/ViolationRecord.vue'
 import taskRecord from '../views/taskRecord.vue'
 import mailList from '@/views/mailList.vue'
 import quickSendGame from '@/views/quickSendGame.vue'
-// import taskList from '@/views/taskList.vue'
+import taskList from '@/views/taskList.vue'
 import Cookies from 'js-cookie'
 import store from '@/store'
 Vue.use(VueRouter)
@@ -78,11 +78,11 @@ const routes = [
    name: 'quickSendGame',
    component: quickSendGame
  },
-  // {
+  {
-  //   path: '/taskList',
+    path: '/taskList',
-  //   name: 'taskList',
+    name: 'taskList',
-  //   component: taskList
+    component: taskList
-  // },
+  },
  {
    path: '/login',
    name: 'login',

--- a/src/views/components/taskList/uesrTask.vue
+++ b/src/views/components/taskList/uesrTask.vue
@@ -35,13 +35,13 @@
                        </div>
                      </div>
                    </template>
-                    <div class="item rowFlex columnCenter spaceBetween">
+                    <div class="taskItem rowFlex columnCenter spaceBetween">
                      <div class="rowFlex columnCenter">
                        <span class="label">跟进客服</span>
                        <p class="text">{{ item.tracer_name }}</p>
                      </div>
                    </div>
-                    <div class="item rowFlex columnCenter spaceBetween">
+                    <div class="taskItem rowFlex columnCenter spaceBetween">
                      <div class="rowFlex">
                        <span class="label">待维护日期</span>
                        <p class="text">{{ item.assignment_time }}</p>
@@ -56,11 +56,9 @@
                          v-if="taskInfo.plan_type && taskInfo.plan_type==5"
                          label="异常原因"
                          prop="abnormal_types"
-                          label-width="100px"
                        >
                          <el-select
                            v-model="webForm.abnormal_types"
-                            style="width: 90%"
                            placeholder="请选择"
                            multiple
                            collapse-tags
@@ -77,11 +75,9 @@
                        <el-form-item
                          label="跟进结果:"
                          prop="trace_result"
-                          label-width="100px"
                        >
                          <el-select
                            v-model="webForm.trace_result"
-                            style="width: 90%"
                            placeholder="请选择"
                          >
                            <el-option
@@ -259,13 +255,13 @@
            total: 0
            }
            this.orderList = []
-            this.requestOrderList()
+            this.requestOrderList('msg')
        }
      }
    },
    mounted() {
      // this.gameMemberView()
-      this.requestOrderList()
+      this.requestOrderList('msg')
      this.searchcondition()
      this.searchTrackList()
      this.searchconditionError()
@@ -405,7 +401,7 @@
          no_trouble: 0
        }
      },
-      requestOrderList() {
+      requestOrderList(msg = '') {
        if (this.accountSelect == '') {
          this.$message.warning('暂无关联的账号，请先去关联账号!')
          return false
@@ -431,7 +427,7 @@
            this.orderList.map((item) => {
              !item.remarks || item.remarks.length === 0 ? (item.remarks = [{ remark: '' }]) : ''
            })
-            if (res.status_code == 1) {
+            if (res.status_code == 1 && !msg) {
              this.$message.success(res.msg)
            }
          },
@@ -481,7 +477,7 @@
          color: #999999;
        }
      }
-      .item {
+      .taskItem {
        width: 100%;
        height: auto;
        font-size: 14px;
@@ -489,7 +485,6 @@
        color: #333333;
        transition: all 0.5s;
        position: relative;
-        cursor: pointer;
        div {
          width: 100%;
          margin-bottom: 5px;
@@ -733,7 +728,6 @@
      padding:  10px;
    }
    .editLayer {
-      margin-left: -20px;
    .noDisturb{
      // 换行
      white-space: wrap;