Browse Source

Merge branch 'master' of http://101.200.220.49:8001/xiuli.gao/playlet

liuxiaona 2 years ago
parent
commit
014903ad7b
37 changed files with 70 additions and 49 deletions
  1. 2 2
      index.html
  2. 12 5
      project/src/components/customManage/customerTransfer.vue
  3. 11 0
      project/src/components/customManage/distributionUser.vue
  4. 5 5
      project/src/components/customManage/lostCustomer.vue
  5. 5 5
      project/src/components/customManage/manage.vue
  6. 2 2
      project/src/components/customManage/transferRecord.vue
  7. 0 1
      static/css/app.aaba61728cc255f965e21bb60292c62e.css
  8. 1 0
      static/css/app.e1530b37883e4ce02bdd113c169b4db5.css
  9. 1 0
      static/js/0.1b20fa512711314200e8.js
  10. 0 1
      static/js/0.ff4647ce8e72c631ebb8.js
  11. 1 0
      static/js/10.aad7cd701e67d697943a.js
  12. 1 1
      static/js/10.f5c9baf43a19ad065b50.js
  13. 0 1
      static/js/11.c843e800a4516d7fe22e.js
  14. 1 0
      static/js/12.f37eabee9a581ec0b886.js
  15. 1 0
      static/js/13.0f18bdc38b473eb15dd1.js
  16. 0 1
      static/js/13.ac6fb087e0fa070c208b.js
  17. 1 1
      static/js/12.8fddea8ec2a439233f53.js
  18. 1 0
      static/js/15.7b42c7e2cf7c06d7d417.js
  19. 0 1
      static/js/15.d0bffadd1f575ff3a6a0.js
  20. 1 0
      static/js/16.8573d1a564f2de406f07.js
  21. 1 1
      static/js/14.733ffad8a0450e86f32a.js
  22. 1 0
      static/js/18.3afcd51d917599ccbd57.js
  23. 1 1
      static/js/16.e5181b939d17a787383b.js
  24. 0 1
      static/js/2.3fa25205cfe8e13a688c.js
  25. 1 1
      static/js/4.68d0738defb8fcc683cf.js
  26. 1 1
      static/js/17.1c1b280ebe10200470b7.js
  27. 1 0
      static/js/3.0845f7ad9f5ded0248d1.js
  28. 0 1
      static/js/3.4be9d02fbd9f85624f6c.js
  29. 1 0
      static/js/4.c6dc360cf86cd5304bcf.js
  30. 1 0
      static/js/6.004eea38579c7a3773ec.js
  31. 0 1
      static/js/6.84d4ef277c985d299bce.js
  32. 1 0
      static/js/7.a21c958fca325e8b1542.js
  33. 0 1
      static/js/7.d574536887c78624a5b2.js
  34. 2 2
      static/js/8.15ea0faa6176bc385663.js
  35. 12 12
      static/js/app.6d2040a64c9511702aad.js
  36. 0 1
      static/js/manifest.0bbc3c9a0b07b9683fd1.js
  37. 1 0
      static/js/manifest.58391197bb133334e258.js

+ 2 - 2
index.html

@@ -5,6 +5,6 @@
5 5
       (function() {
6 6
         var hm = document.createElement("script");
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8
-        var s = document.getElementsByTagName("script")[0]; 
8
+        var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.aaba61728cc255f965e21bb60292c62e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0bbc3c9a0b07b9683fd1.js></script><script type=text/javascript src=./static/js/app.6d2040a64c9511702aad.js></script></body></html>
10
+      })();</script><link href=./static/css/app.e1530b37883e4ce02bdd113c169b4db5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.58391197bb133334e258.js></script><script type=text/javascript src=./static/js/app.2b31eafe4e4fbf84ac3f.js></script></body></html>

+ 12 - 5
project/src/components/customManage/customerTransfer.vue

@@ -78,14 +78,14 @@
78 78
           </div>
79 79
         </template>
80 80
       </el-table-column>
81
-      <el-table-column label="所属客服" width="160" align="center">
81
+      <el-table-column label="所属客服" align="center">
82 82
         <template slot-scope="scope">
83 83
           <div class="customerServiceTagBox">
84 84
             <div class="customerServiceTag"><i class="el-icon-headset"></i>{{ scope.row.user_list.name }}</div>
85 85
           </div>
86 86
         </template>
87 87
       </el-table-column>
88
-      <el-table-column width="160" label="所属部门" show-overflow-tooltip align="center">
88
+      <el-table-column label="所属部门" show-overflow-tooltip align="center">
89 89
         <template slot-scope="scope">
90 90
           <div>{{scope.row.department_list&&scope.row.department_list.join(',')}}</div>
91 91
         </template>
@@ -98,14 +98,14 @@
98 98
           </div>
99 99
         </template>
100 100
       </el-table-column>
101
-      <el-table-column width="160" label="客户状态" show-overflow-tooltip align="center">
101
+      <el-table-column label="客户状态" show-overflow-tooltip align="center">
102 102
         <template slot-scope="scope">
103 103
           <span v-if="scope.row.customer_enable==0" style="color:#FF0002">禁用</span>
104 104
           <span v-if="scope.row.customer_enable==1">可用</span>
105 105
           <span v-if="scope.row.customer_enable==3" style="color:#00B38A">已流失</span>
106 106
         </template>
107 107
       </el-table-column>
108
-      <el-table-column width="160" label="付费情况" align="center">
108
+      <el-table-column label="付费情况" align="center">
109 109
         <template slot-scope="scope">
110 110
           <div v-if="scope.row.pay_num>0">已付费(<span class="c-00B38A">{{scope.row.pay_num}}次</span>)</div>
111 111
           <div v-else>未付费</div>
@@ -142,6 +142,11 @@
142 142
         user_id:rowPro.user_id
143 143
       }" ref="detial"></detial>
144 144
     </el-drawer>
145
+
146
+    <!-- 分配客户 -->
147
+    <el-dialog title="分配客户" :visible.sync="distributionUserVisible" width="600px" center top="15vh">
148
+      <distribution-user></distribution-user>
149
+    </el-dialog>
145 150
   </div>
146 151
 </template>
147 152
 <script>
@@ -155,8 +160,9 @@ import lossBody from '@/components/assembly/screen/lossBody.vue'
155 160
 import screenPay from '@/components/assembly/screen/pay.vue'
156 161
 import shieldingUser from '@/components/assembly/shieldingUser.vue'
157 162
 import detial from '@/components/detials/index.vue'
163
+import distributionUser from './distributionUser.vue'
158 164
 export default {
159
-  components: { detial, selfInput, selfCustomerservice, enterpriseTag, datePicker, selfChannel, selfGender, lossBody, screenPay, shieldingUser },
165
+  components: { distributionUser, detial, selfInput, selfCustomerservice, enterpriseTag, datePicker, selfChannel, selfGender, lossBody, screenPay, shieldingUser },
160 166
   data () {
161 167
     return {
162 168
       type: 1,
@@ -194,6 +200,7 @@ export default {
194 200
       exclude_multiple_selection: {},
195 201
       multipleArr: [],
196 202
       isAll: false,//是否选择全部
203
+      distributionUserVisible: false
197 204
     }
198 205
   },
199 206
   created () {

+ 11 - 0
project/src/components/customManage/distributionUser.vue

@@ -0,0 +1,11 @@
1
+<template>
2
+  <div>
3
+    <div class="self-hint" style="border:none;margin-top:-10px">
4
+      <i class="el-icon-message-solid"></i>
5
+      <div>
6
+        <p>可将选中的客户转接给其他员工,进行后续服务</p>
7
+        <p>注意:90天内客户只能被转移一次,一个客户最多只能被转接两次</p>
8
+      </div>
9
+    </div>
10
+  </div>
11
+</template>

+ 5 - 5
project/src/components/customManage/lostCustomer.vue

@@ -55,33 +55,33 @@
55 55
           </div>
56 56
         </template>
57 57
       </el-table-column>
58
-      <el-table-column label="性别" width="100" show-overflow-tooltip align="center">
58
+      <el-table-column label="性别" show-overflow-tooltip align="center">
59 59
         <template slot-scope="scope">
60 60
           <span v-if="scope.row.gender==0">未知</span>
61 61
           <span v-if="scope.row.gender==1">男</span>
62 62
           <span v-if="scope.row.gender==2">女</span>
63 63
         </template>
64 64
       </el-table-column>
65
-      <el-table-column label="所属客服" width="120" align="center">
65
+      <el-table-column label="所属客服" align="center">
66 66
         <template slot-scope="scope">
67 67
           <div class="customerServiceTagBox">
68 68
             <div class="customerServiceTag"><i class="el-icon-headset"></i>{{ scope.row.user_list.name }}</div>
69 69
           </div>
70 70
         </template>
71 71
       </el-table-column>
72
-      <el-table-column label="客服所属部门" width="120" show-overflow-tooltip align="center">
72
+      <el-table-column label="客服所属部门" width="130" show-overflow-tooltip align="center">
73 73
         <template slot-scope="scope">
74 74
           <span>{{scope.row.user_list.department}}</span>
75 75
         </template>
76 76
       </el-table-column>
77
-      <el-table-column label="标签" width="150" align="center">
77
+      <el-table-column label="标签" align="center">
78 78
         <template slot-scope="scope">
79 79
           <div class="customerServiceTagBox biaoqian">
80 80
             <div class="customerServiceTag" v-for="(item) in scope.row.tag_list" :key="item">{{item}}</div>
81 81
           </div>
82 82
         </template>
83 83
       </el-table-column>
84
-      <el-table-column label="客户状态" width="100" show-overflow-tooltip align="center">
84
+      <el-table-column label="客户状态" show-overflow-tooltip align="center">
85 85
         <template slot-scope="scope">
86 86
           <span v-if="scope.row.customer_enable==0" style="color:#FF0002">禁用</span>
87 87
           <span v-if="scope.row.customer_enable==1">可用</span>

+ 5 - 5
project/src/components/customManage/manage.vue

@@ -68,14 +68,14 @@
68 68
           </div>
69 69
         </template>
70 70
       </el-table-column>
71
-      <el-table-column label="所属客服" width="160" align="center">
71
+      <el-table-column label="所属客服" align="center">
72 72
         <template slot-scope="scope">
73 73
           <div class="customerServiceTagBox">
74 74
             <div class="customerServiceTag"><i class="el-icon-headset"></i>{{ scope.row.user_list.name }}</div>
75 75
           </div>
76 76
         </template>
77 77
       </el-table-column>
78
-      <el-table-column width="160" label="所属部门" show-overflow-tooltip align="center">
78
+      <el-table-column label="所属部门" show-overflow-tooltip align="center">
79 79
         <template slot-scope="scope">
80 80
           <div>{{scope.row.department_list&&scope.row.department_list.join(',')}}</div>
81 81
         </template>
@@ -88,14 +88,14 @@
88 88
           </div>
89 89
         </template>
90 90
       </el-table-column>
91
-      <el-table-column width="160" label="客户状态" show-overflow-tooltip align="center">
91
+      <el-table-column label="客户状态" show-overflow-tooltip align="center">
92 92
         <template slot-scope="scope">
93 93
           <span v-if="scope.row.customer_enable==0" style="color:#FF0002">禁用</span>
94 94
           <span v-if="scope.row.customer_enable==1">可用</span>
95 95
           <span v-if="scope.row.customer_enable==3" style="color:#00B38A">已流失</span>
96 96
         </template>
97 97
       </el-table-column>
98
-      <el-table-column width="160" label="付费情况" align="center">
98
+      <el-table-column label="付费情况" align="center">
99 99
         <template slot-scope="scope">
100 100
           <div v-if="scope.row.pay_num>0">已付费(<span class="c-00B38A">{{scope.row.pay_num}}次</span>)</div>
101 101
           <div v-else>未付费</div>
@@ -103,7 +103,7 @@
103 103
       </el-table-column>
104 104
       <el-table-column prop="createtime" width="160" label="添加时间" show-overflow-tooltip align="center"></el-table-column>
105 105
       <!-- <el-table-column prop="address" width="160" label="上次对话时间" show-overflow-tooltip align="center"></el-table-column> -->
106
-      <el-table-column width="160" label="添加渠道" show-overflow-tooltip align="center">
106
+      <el-table-column label="添加渠道" show-overflow-tooltip align="center">
107 107
         <template slot-scope="scope">
108 108
           <div>{{scope.row.add_way}}</div>
109 109
         </template>

+ 2 - 2
project/src/components/customManage/transferRecord.vue

@@ -47,7 +47,7 @@
47 47
       <el-table-column label="操作" align="center">
48 48
         <template slot-scope="scope">
49 49
           <div class="flex" style="justify-content:center">
50
-            <div class="c-00B38A pointer" style="margin:0 6px" @click="showDetial(scope.row)">详情</div>
50
+            <div class="c-00B38A pointer" style="margin:0 6px" v-if="scope.row.status==1" @click="showDetial(scope.row)">详情</div>
51 51
           </div>
52 52
         </template>
53 53
       </el-table-column>
@@ -60,7 +60,7 @@
60 60
     <el-drawer :size="drawerSize" :visible.sync="detialDrawer" :with-header="false">
61 61
       <detial @changeDrawerSize="changeDrawerSize" @closeDrawer="closeDrawer" :rowProp="{
62 62
         customer_id:rowPro.customer_id,
63
-        user_id:rowPro.user_id
63
+        user_id:rowPro.takeover_userid
64 64
       }" ref="detial"></detial>
65 65
     </el-drawer>
66 66
   </div>

File diff suppressed because it is too large
+ 0 - 1
static/css/app.aaba61728cc255f965e21bb60292c62e.css


File diff suppressed because it is too large
+ 1 - 0
static/css/app.e1530b37883e4ce02bdd113c169b4db5.css


File diff suppressed because it is too large
+ 1 - 0
static/js/0.1b20fa512711314200e8.js


File diff suppressed because it is too large
+ 0 - 1
static/js/0.ff4647ce8e72c631ebb8.js


File diff suppressed because it is too large
+ 1 - 0
static/js/10.aad7cd701e67d697943a.js


File diff suppressed because it is too large
+ 1 - 1
static/js/10.f5c9baf43a19ad065b50.js


File diff suppressed because it is too large
+ 0 - 1
static/js/11.c843e800a4516d7fe22e.js


File diff suppressed because it is too large
+ 1 - 0
static/js/12.f37eabee9a581ec0b886.js


File diff suppressed because it is too large
+ 1 - 0
static/js/13.0f18bdc38b473eb15dd1.js


File diff suppressed because it is too large
+ 0 - 1
static/js/13.ac6fb087e0fa070c208b.js


File diff suppressed because it is too large
+ 1 - 1
static/js/12.8fddea8ec2a439233f53.js


File diff suppressed because it is too large
+ 1 - 0
static/js/15.7b42c7e2cf7c06d7d417.js


File diff suppressed because it is too large
+ 0 - 1
static/js/15.d0bffadd1f575ff3a6a0.js


File diff suppressed because it is too large
+ 1 - 0
static/js/16.8573d1a564f2de406f07.js


File diff suppressed because it is too large
+ 1 - 1
static/js/14.733ffad8a0450e86f32a.js


File diff suppressed because it is too large
+ 1 - 0
static/js/18.3afcd51d917599ccbd57.js


File diff suppressed because it is too large
+ 1 - 1
static/js/16.e5181b939d17a787383b.js


File diff suppressed because it is too large
+ 0 - 1
static/js/2.3fa25205cfe8e13a688c.js


+ 1 - 1
static/js/4.68d0738defb8fcc683cf.js

@@ -1,4 +1,4 @@
1
-webpackJsonp([4],{"+rHW":function(e,t){e.exports=function(e){function t(e){"undefined"!=typeof console&&(console.error||console.log)("[Script Loader]",e)}try{"undefined"!=typeof execScript&&"undefined"!=typeof attachEvent&&"undefined"==typeof addEventListener?execScript(e):"undefined"!=typeof eval?eval.call(null,e):t("EvalError: No eval function available")}catch(e){t(e)}}},"5zde":function(e,t,r){r("zQR9"),r("qyJz"),e.exports=r("FeBl").Array.from},"7t+N":function(e,t,r){var n;
1
+webpackJsonp([2],{"+rHW":function(e,t){e.exports=function(e){function t(e){"undefined"!=typeof console&&(console.error||console.log)("[Script Loader]",e)}try{"undefined"!=typeof execScript&&"undefined"!=typeof attachEvent&&"undefined"==typeof addEventListener?execScript(e):"undefined"!=typeof eval?eval.call(null,e):t("EvalError: No eval function available")}catch(e){t(e)}}},"5zde":function(e,t,r){r("zQR9"),r("qyJz"),e.exports=r("FeBl").Array.from},"7t+N":function(e,t,r){var n;
2 2
 /*!
3 3
  * jQuery JavaScript Library v3.6.0
4 4
  * https://jquery.com/

File diff suppressed because it is too large
+ 1 - 1
static/js/17.1c1b280ebe10200470b7.js


File diff suppressed because it is too large
+ 1 - 0
static/js/3.0845f7ad9f5ded0248d1.js


File diff suppressed because it is too large
+ 0 - 1
static/js/3.4be9d02fbd9f85624f6c.js


File diff suppressed because it is too large
+ 1 - 0
static/js/4.c6dc360cf86cd5304bcf.js


File diff suppressed because it is too large
+ 1 - 0
static/js/6.004eea38579c7a3773ec.js


File diff suppressed because it is too large
+ 0 - 1
static/js/6.84d4ef277c985d299bce.js


File diff suppressed because it is too large
+ 1 - 0
static/js/7.a21c958fca325e8b1542.js


File diff suppressed because it is too large
+ 0 - 1
static/js/7.d574536887c78624a5b2.js


File diff suppressed because it is too large
+ 2 - 2
static/js/8.15ea0faa6176bc385663.js


File diff suppressed because it is too large
+ 12 - 12
static/js/app.6d2040a64c9511702aad.js


File diff suppressed because it is too large
+ 0 - 1
static/js/manifest.0bbc3c9a0b07b9683fd1.js


File diff suppressed because it is too large
+ 1 - 0
static/js/manifest.58391197bb133334e258.js