miaofuhao лет назад: 5
Родитель
Сommit
a9cc1f2ab2

+ 9 - 6
CallCenterWeb.UI/src/views/callScreen/components/AddOrEditCustomer.vue

@@ -142,9 +142,9 @@
142 142
           </el-form-item>
143 143
         </el-col>
144 144
         <el-col :xl="24" :md="24">
145
-          <el-form-item>
145
+          <el-form-item v-show="resulBtn">
146 146
             <el-button type="primary" @click="submitForm">保存</el-button>
147
-            <el-button v-show="resulBtn" @click="resetForm">重置</el-button>
147
+            <el-button @click="resetForm">重置</el-button>
148 148
           </el-form-item>
149 149
         </el-col>
150 150
       </el-row>
@@ -200,7 +200,7 @@ export default {
200 200
         pid: 1
201 201
       },
202 202
       isPlaceholderAreaClass: true,
203
-      placeholderArea: '',//地区默认值
203
+      placeholderArea: '请选择地区',//地区默认值
204 204
       level: 0, //城市等级
205 205
       pickerOptions,// 日期数据
206 206
       ruleForm: {
@@ -233,14 +233,14 @@ export default {
233 233
           {
234 234
             required: true,
235 235
             trigger: "blur",
236
-            message: "请输入客户名"
236
+            message: "请输入客户名"
237 237
           }
238 238
         ],
239 239
         F_Phone: [
240 240
           {
241 241
             required: true,
242 242
             trigger: "blur",
243
-            message: "请输入固定电话"
243
+            message: "请输入联系方式"
244 244
           }
245 245
         ]
246 246
       },
@@ -359,7 +359,10 @@ export default {
359 359
             if (response.data.F_Province && response.data.F_City) {
360 360
               this.placeholderArea = response.data.F_Province + '/'
361 361
             } else {
362
-              this.placeholderArea = response.data.F_Province
362
+              if (response.data.F_Province) {
363
+                this.placeholderArea = '请选择地区'
364
+              }
365
+
363 366
             }
364 367
             if (response.data.F_City && response.data.F_Area) {
365 368
               this.placeholderArea += response.data.F_City + '/'

+ 87 - 19
CallCenterWeb.UI/src/views/callScreen/components/OrderList.vue

@@ -1,7 +1,7 @@
1 1
 <template>
2
-  <div v-loading="loading" >
2
+  <div v-loading="loading">
3 3
     <el-table :data="dataLists" border stripe>
4
-      <el-table-column type="index" label="编号" align="center" fixed width="80"/>
4
+      <el-table-column type="index" label="编号" align="center" fixed width="80" />
5 5
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="140">
6 6
         <template slot-scope="scope">
7 7
           <!-- <el-tooltip content="点击查看工单详情" placement="top"> -->
@@ -12,20 +12,34 @@
12 12
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
13 13
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
14 14
       <el-table-column label="订购商品" align="center" min-width>
15
-        <template slot-scope="scope">
16
-          {{ scope.row.OrderDetailList | judgmentOrderGoods }}
17
-        </template>
15
+        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
18 16
       </el-table-column>
19 17
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
20
-      <el-table-column label="订单状态" align="center" >
21
-        <template slot-scope="scope">
22
-          {{ scope.row.F_State | judgmentStateName }}
23
-        </template>
18
+      <el-table-column label="订单状态" align="center">
19
+        <template slot-scope="scope">{{ scope.row.F_State | judgmentStateName }}</template>
24 20
       </el-table-column>
25 21
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
26 22
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
27 23
       <el-table-column prop="F_Type" label="订单类型" align="center" />
28 24
       <el-table-column prop="F_Express" label="快递公司" align="center" />
25
+      <el-table-column label="物流状态" align="center">
26
+        <template slot-scope="scope">{{ scope.row.F_Status | judgmentStatusName }}</template>
27
+      </el-table-column>
28
+      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
29
+        <template slot-scope="scope">
30
+          <el-button
31
+            type="text"
32
+            v-show="orderTrue"
33
+            v-if="authority_afterSale(scope.row.F_Status)"
34
+            @click="btn_afterSale(scope.row.F_Id)"
35
+          >售后</el-button>
36
+          <el-button
37
+            type="text"
38
+            v-if="authority_collection(scope.row.F_Status)"
39
+            @click="btn_collection(scope.row.F_Id)"
40
+          >改代收</el-button>
41
+        </template>
42
+      </el-table-column>
29 43
     </el-table>
30 44
     <pagination
31 45
       v-show="pageParams.total > 0"
@@ -34,8 +48,8 @@
34 48
       :pagesize.sync="pageParams.pagesize"
35 49
       :auto-scroll="false"
36 50
       class="pagination"
37
-      @pagination="getList" />
38
-
51
+      @pagination="getList"
52
+    />
39 53
   </div>
40 54
 </template>
41 55
 <script>
@@ -43,6 +57,7 @@
43 57
 import { orderStateFilter, orderStateTypeFilter, formatterContent } from '@/filters'
44 58
 import { getOrderLists } from '@/api/orderManagement/orderList'
45 59
 import detail from '@/views/orderManagement/orderList/detail'
60
+import afterSale from './afterSale'
46 61
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
47 62
 
48 63
 export default {
@@ -51,7 +66,7 @@ export default {
51 66
     Pagination
52 67
   },
53 68
   filters: {
54
-    judgmentStateName(status) {
69
+    judgmentStateName (status) {
55 70
       const statusMap = {
56 71
         '-1': '无效',
57 72
         '0': '暂存',
@@ -64,14 +79,24 @@ export default {
64 79
       }
65 80
       return statusMap[status]
66 81
     },
67
-    judgmentOrderGoods(status) {
82
+    judgmentOrderGoods (status) {
68 83
       let orderGoodsNameQuantity = ''
69 84
       for (let i = 0; i < status.length; i++) {
70 85
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
71 86
       }
72 87
       orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
73 88
       return orderGoodsNameQuantity
74
-    }
89
+    },
90
+    judgmentStatusName (status) {
91
+      const statusMap = {
92
+        '0': '未发出',
93
+        '1': '未签收',
94
+        '2': '签收',
95
+        '3': '改代收',
96
+        '4': '拒收',
97
+      }
98
+      return statusMap[status]
99
+    },
75 100
   },
76 101
   props: {
77 102
     callinNum: {
@@ -83,9 +108,11 @@ export default {
83 108
       default: ''
84 109
     }
85 110
   },
86
-  data() {
111
+  data () {
87 112
     return {
88 113
       loading: false,
114
+      activeName: "-2", //标签切换首页
115
+      orderTrue: false,
89 116
       pageParams: {
90 117
         pageindex: 1, // 当前第几页
91 118
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
@@ -94,14 +121,18 @@ export default {
94 121
       dataLists: [] // 列表数据
95 122
     }
96 123
   },
97
-  created() {
124
+  created () {
98 125
     this.getList()
126
+    if (window.localStorage.getItem("roleCode") === 'SH') {
127
+      this.orderTrue = true
128
+    }
99 129
   },
100 130
   methods: {
101
-    getList() {
131
+    getList () {
102 132
       this.loading = true
103 133
       return new Promise(resolve => {
104 134
         const params = {
135
+          F_State: this.activeName, //订单状态
105 136
           pageindex: this.pageParams.pageindex, // int 第几页
106 137
           pagesize: this.pageParams.pagesize, // int 每页几条信息
107 138
           phone: this.callinNum //	否	string	模糊查询(号码)
@@ -116,7 +147,7 @@ export default {
116 147
         resolve()
117 148
       })
118 149
     },
119
-    btn_detail(editId) {
150
+    btn_detail (editId) {
120 151
       this.$layer.iframe({
121 152
         content: {
122 153
           content: detail, // 传递的组件对象
@@ -129,11 +160,48 @@ export default {
129 160
           this.getList()
130 161
         }
131 162
       })
163
+    },
164
+    //售后
165
+    btn_afterSale (afterSalesId) {
166
+      this.$layer.iframe({
167
+        content: {
168
+          content: afterSale, // 传递的组件对象
169
+          parent: this, // 当前的vue对象
170
+          data: { rowid: afterSalesId } // props
171
+        },
172
+        area: ["80%", "80%"],
173
+        title: "售后内容"
174
+      });
175
+    },
176
+    //改代收
177
+    btn_collection (collectionId) {
178
+      this.$layer.iframe({
179
+        content: {
180
+          content: afterSale, // 传递的组件对象
181
+          parent: this, // 当前的vue对象
182
+          data: { rowid: collectionId, collectionAfterSalesReasonType: '改代收' } // props
183
+        },
184
+        area: ["80%", "80%"],
185
+        title: "改代收"
186
+      });
187
+    },
188
+    authority_collection (status) {
189
+      if (status == 1 && this.orderTrue) {
190
+        return true
191
+      } else {
192
+        return false
193
+      }
194
+    },
195
+    authority_afterSale (status) {
196
+      if (status == 2 && this.orderTrue) {
197
+        return true
198
+      } else {
199
+        return false
200
+      }
132 201
     }
133 202
   }
134 203
 }
135 204
 </script>
136 205
 
137 206
 <style rel="stylesheet/scss" lang="scss" scoped>
138
-
139 207
 </style>

+ 7 - 7
CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -81,13 +81,13 @@
81 81
             </el-row>
82 82
             <el-row>
83 83
               <el-col :span="8">
84
-                <el-form-item label="库存(一)" prop="stockQuantity">
84
+                <el-form-item label="山西仓" prop="stockQuantity">
85 85
                   <span>{{ stockQuantity.stockOne }}</span>
86 86
                   <!-- <el-input v-model="" placeholder="库存(一)" disabled/> -->
87 87
                 </el-form-item>
88 88
               </el-col>
89 89
               <el-col :span="8">
90
-                <el-form-item label="库存(二)" prop="stockQuantity">
90
+                <el-form-item label="新乡仓" prop="stockQuantity">
91 91
                   <span>{{ stockQuantity.stockTwo }}</span>
92 92
                 </el-form-item>
93 93
               </el-col>
@@ -201,7 +201,7 @@
201 201
                     value-key="id"
202 202
                     filterable
203 203
                     clearable
204
-                    placeholder="请选择订单类型"
204
+                    placeholder="请选择"
205 205
                     @change="getCity"
206 206
                   >
207 207
                     <el-option
@@ -223,7 +223,7 @@
223 223
                     value-key="id"
224 224
                     filterable
225 225
                     clearable
226
-                    placeholder="请选择订单类型"
226
+                    placeholder="请选择"
227 227
                     @change="getArea"
228 228
                   >
229 229
                     <el-option
@@ -243,7 +243,7 @@
243 243
                     value-key="id"
244 244
                     filterable
245 245
                     clearable
246
-                    placeholder="请选择订单类型"
246
+                    placeholder="请选择区/县"
247 247
                     @change="getTown"
248 248
                   >
249 249
                     <el-option
@@ -265,7 +265,7 @@
265 265
                     value-key="id"
266 266
                     filterable
267 267
                     clearable
268
-                    placeholder="请选择订单类型"
268
+                    placeholder="请选择乡镇/街道"
269 269
                     @change="sleectTown"
270 270
                   >
271 271
                     <el-option
@@ -367,7 +367,7 @@
367 367
                     reserve-keyword
368 368
                     clearable
369 369
                     value-key="F_ID"
370
-                    placeholder="请输入电话号码"
370
+                    placeholder="请输入推荐人"
371 371
                     @change="recommendChangeSelect"
372 372
                   >
373 373
                     <el-option

+ 4 - 4
CallCenterWeb.UI/src/views/telCall/seatMonitor/index.vue

@@ -527,10 +527,10 @@ export default {
527 527
         return
528 528
       }
529 529
 
530
-      if (item.usercode === this.usercode) {
531
-        this.$message.warning('您不能在坐席监控中对自己进行操作!')
532
-        return
533
-      }
530
+      // if (item.usercode === this.usercode) {
531
+      //   this.$message.warning('您不能在坐席监控中对自己进行操作!')
532
+      //   return
533
+      // }
534 534
       if (this.telLineState === 6) {
535 535
         this.$message.warning('您当前在通话中不能对坐席进行操作!')
536 536
         return

+ 10 - 10
CallCenterWeb.UI/src/views/trafficData/callRecord/index.vue

@@ -34,7 +34,7 @@
34 34
       <el-table-column label="呼叫类型" align="center" min-width>
35 35
         <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
36 36
       </el-table-column>
37
-      <el-table-column label="呼叫状态" align="center" min-width>
37
+      <!-- <el-table-column label="呼叫状态" align="center" min-width>
38 38
         <template slot-scope="scope">
39 39
           <el-tag
40 40
             :type="scope.row.CallState === 1 ? 'success' : 'danger'"
@@ -42,13 +42,13 @@
42 42
             disable-transitions
43 43
           >{{ scope.row.CallState | statusFilter }}</el-tag>
44 44
         </template>
45
-      </el-table-column>
46
-      <el-table-column label="处理方式" align="center" min-width>
45
+      </el-table-column>-->
46
+      <!-- <el-table-column label="处理方式" align="center" min-width>
47 47
         <template slot-scope="scope">{{ scope.row.DealType | dealtypeFilter }}</template>
48
-      </el-table-column>
49
-      <el-table-column label="满意度" align="center" min-width>
48
+      </el-table-column>-->
49
+      <!-- <el-table-column label="满意度" align="center" min-width>
50 50
         <template slot-scope="scope">{{ scope.row.MYD | evaluationFilter }}</template>
51
-      </el-table-column>
51
+      </el-table-column>-->
52 52
       <el-table-column label="录音" align="center" min-width>
53 53
         <template slot-scope="scope">
54 54
           <svg-icon
@@ -70,11 +70,11 @@
70 70
           <span>{{ scope.row.TalkStartTime | timesFilter }}</span>
71 71
         </template>
72 72
       </el-table-column>
73
-      <el-table-column label="通话结束时间" align="center" min-width="110">
73
+      <!-- <el-table-column label="通话结束时间" align="center" min-width="110">
74 74
         <template slot-scope="scope">
75 75
           <span>{{ scope.row.TalkEndTime | timesFilter }}</span>
76 76
         </template>
77
-      </el-table-column>
77
+      </el-table-column>-->
78 78
       <el-table-column label="挂机时间" align="center" min-width="110">
79 79
         <template slot-scope="scope">
80 80
           <span>{{ scope.row.EndTime | timesFilter }}</span>
@@ -82,9 +82,9 @@
82 82
       </el-table-column>
83 83
       <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
84 84
       <el-table-column prop="RelayNumber" label="中继号码" align="center" min-width />
85
-      <el-table-column label="外呼类型" align="center" min-width>
85
+      <!-- <el-table-column label="外呼类型" align="center" min-width>
86 86
         <template slot-scope="scope">{{ scope.row.callopttype | callopttypeFilter }}</template>
87
-      </el-table-column>
87
+      </el-table-column>-->
88 88
     </el-table>
89 89
     <pagination
90 90
       v-show="pageParams.total > 0"