Kaynağa Gözat

禅道bug修改

liuzhen 5 yıl önce
ebeveyn
işleme
2b887bd8f9

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

@@ -61,7 +61,7 @@
61 61
                     class="form_select"
62 62
                     value-key="F_ProductId"
63 63
                     clearable
64
-                    placeholder="请选择商品类型"
64
+                    placeholder="请选择商品"
65 65
                     @change="commodityListChange"
66 66
                   >
67 67
                     <el-option

+ 10 - 2
CallCenterWeb.UI/src/views/customerServiceManagement/afterSaleRefundList/index.vue

@@ -41,10 +41,10 @@
41 41
       <el-table-column prop="F_Money" label="变动金额" align="center" />
42 42
       <el-table-column prop="F_Remark" label="售后备注" align="center" />
43 43
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
44
-      <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
44
+      <el-table-column prop="F_AboutName" label="下单员工" align="center" />
45 45
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
46 46
         <template slot-scope="scope">
47
-          <el-button v-permission="'HY_refund'" type="text" @click="btn_refund(scope.row.F_Id)">退款</el-button>
47
+          <el-button v-permission="'HY_refund'" v-if="isrefund(scope.row.F_State)" type="text" @click="btn_refund(scope.row.F_Id)">退款</el-button>
48 48
         </template>
49 49
       </el-table-column>
50 50
     </el-table>
@@ -170,6 +170,14 @@ export default {
170 170
     handleTabClick(tab, event) {
171 171
       this.getList()
172 172
     },
173
+    //设置退款展示
174
+    isrefund(state){
175
+      if(state==1){
176
+        return false
177
+      }else{
178
+        return true
179
+      }
180
+    },
173 181
     //合并订单审核
174 182
     btn_refund(auditId) {
175 183
       this.$layer.iframe({

+ 13 - 27
CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/edit.vue

@@ -19,7 +19,7 @@
19 19
         </el-col>
20 20
         <el-col :span="12">
21 21
           <el-form-item label="手机号码" prop="F_CustomerPhone">
22
-            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone"/>
22
+            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
23 23
           </el-form-item>
24 24
         </el-col>
25 25
       </el-row>
@@ -61,7 +61,7 @@
61 61
         </el-col>
62 62
         <el-col :span="12">
63 63
           <el-form-item label="收件人手机号" >
64
-            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号"/>
64
+            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
65 65
           </el-form-item>
66 66
         </el-col>
67 67
         <el-col :span="12">
@@ -105,7 +105,7 @@
105 105
         </el-col>
106 106
         <el-col :span="12">
107 107
           <el-form-item label="邮编" >
108
-            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编"/>
108
+            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
109 109
           </el-form-item>
110 110
         </el-col>
111 111
         <el-col :span="12">
@@ -164,7 +164,7 @@
164 164
         <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注"/>
165 165
       </el-form-item>
166 166
       <el-form-item>
167
-        <el-button type="primary" @click="submitForm(3)">保存</el-button>
167
+        <el-button type="primary" @click="submitForm(1)">保存</el-button>
168 168
       </el-form-item>
169 169
     </el-form>
170 170
   </div>
@@ -172,7 +172,7 @@
172 172
 
173 173
 <script>
174 174
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
175
-import { getOrder, getActivityAccount } from "@/api/orderManagement/orderList";
175
+import { getOrder, getActivityAccount,getintegral } from "@/api/orderManagement/orderList";
176 176
 import { editOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
177 177
 import { validateTel } from '@/utils/validate'
178 178
 import { delFiles, filterContent, pickerOptions } from '@/utils'
@@ -454,33 +454,19 @@ export default {
454 454
     },
455 455
     //获取已有积分
456 456
     getAlreadyPoints(phone) {
457
-      this.loading = true
458
-      return new Promise(resolve => {
459
-        const params = {
460
-          pageindex: "", // int 第几页
461
-          pagesize: "", // int 每页几条信息
462
-          name: "", //客户姓名
463
-          phone: phone, //手机号码
464
-          type: "", //会员类型
465
-          province: "", //省份
466
-          city: "", //市
467
-          area: "", //县区
468
-          town: "", //乡镇
469
-          address: "", //详细地址
470
-          birthday: "", //会员生日
471
-          recommender: "", //推荐人
472
-          saleperson: "", //销售负责人
457
+      const params = {
458
+          phone: phone, 
473 459
         }
474
-        getOrderLists(params).then(response => {
475
-          this.loading = false
476
-          if (response.state.toLowerCase() === 'success') {
477
-            if (response.rows.Rows.length > 1) {
460
+        getintegral(params).then(response=>{
461
+          if(response.state=='success'){
462
+            if(response.rows.Rows.length>0){
478 463
               this.alreadyPoints = response.rows.Rows[0].F_Score
464
+            }else{
465
+              this.alreadyPoints = ''
479 466
             }
467
+            
480 468
           }
481 469
         })
482
-        resolve()
483
-      })
484 470
     },
485 471
     changeCustomerPhone(value) {
486 472
       this.getAlreadyPoints(value)

+ 10 - 6
CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

@@ -81,7 +81,7 @@
81 81
           <el-button v-permission="'HY_goback'" v-if="authority_goback(scope.row.F_State)" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
82 82
           <el-button v-permission="'HY_through'" v-if="authority_through(scope.row.F_State)" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
83 83
           <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
84
-          <el-button v-permission="'HY_logistics_status'" v-if="authority_logistics_status(scope.row.F_Status)" type="text" @click="btn_logistics_status(scope.row.F_Id)">物流状态</el-button>
84
+          <el-button v-permission="'HY_logistics_status'" v-if="authority_logistics_status(scope.row.F_Status,scope.row.F_State)" type="text" @click="btn_logistics_status(scope.row.F_Id)">物流状态</el-button>
85 85
         </template>
86 86
       </el-table-column>
87 87
     </el-table>
@@ -355,7 +355,7 @@ export default {
355 355
     },
356 356
     //编辑权限
357 357
     authority_edit(state) {
358
-      if (state == 6) {
358
+      if (state == 6||state==3) {
359 359
         return false
360 360
       } else {
361 361
         return true
@@ -371,16 +371,20 @@ export default {
371 371
     },
372 372
     //通过权限
373 373
     authority_through(state) {
374
-      if (state == 6) {
374
+      if (state == 6||state==3) {
375 375
         return false
376 376
       } else {
377 377
         return true
378 378
       }
379 379
     },
380 380
     //物流状态权限
381
-    authority_logistics_status(status) {
382
-      if (status == 0 || status == 1 ) {
383
-        return true
381
+    authority_logistics_status(status,state) {
382
+      if (status == 0 || status == 1) {
383
+        if(state==6){
384
+          return true
385
+        }else{
386
+          return false
387
+        }
384 388
       } else {
385 389
         return false
386 390
       }

+ 10 - 1
CallCenterWeb.UI/src/views/customerServiceManagement/orderTransactionList/index.vue

@@ -59,7 +59,7 @@
59 59
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
60 60
         <template slot-scope="scope">
61 61
           <el-button v-permission="'HY_refund_entry'" v-if="authority_refund_entry(scope.row.F_PayState)" type="text" @click="btn_refund_entry(scope.row.F_Id)">录入</el-button>
62
-          <el-button v-permission="'HY_audit'" type="text" @click="btn_audit(scope.row.F_Id)">审核</el-button>
62
+          <el-button v-permission="'HY_audit'" v-if="isexamine(scope.row.F_PayState)" type="text" @click="btn_audit(scope.row.F_Id)">审核</el-button>
63 63
         </template>
64 64
       </el-table-column>
65 65
     </el-table>
@@ -167,6 +167,7 @@ export default {
167 167
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
168 168
           F_PayState: this.activeName, //交易状态
169 169
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
170
+          PayState:1
170 171
         };
171 172
         getOrderListCustomerService(params).then(response => {
172 173
           this.loading = false;
@@ -195,6 +196,14 @@ export default {
195 196
     handleTabClick(tab, event) {
196 197
       this.getList()
197 198
     },
199
+    //设置审核权限
200
+    isexamine(state){
201
+      if(state==1){
202
+        return false
203
+      }else{
204
+        return true
205
+      }
206
+    },
198 207
     btn_audit(ordercode){
199 208
        this.$layer.iframe({
200 209
         content: {

+ 6 - 1
CallCenterWeb.UI/src/views/orderManagement/createOrder/index.vue

@@ -608,7 +608,12 @@ export default {
608 608
         }
609 609
         getintegral(params).then(response=>{
610 610
           if(response.state=='success'){
611
-            this.alreadyPoints = response.rows.Rows[0].F_Score
611
+            if(response.rows.Rows.length>0){
612
+              this.alreadyPoints = response.rows.Rows[0].F_Score
613
+            }else{
614
+              this.alreadyPoints = ''
615
+            }
616
+            
612 617
           }
613 618
         })
614 619
     },

+ 8 - 4
CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -19,7 +19,7 @@
19 19
         </el-col>
20 20
         <el-col :span="12">
21 21
           <el-form-item label="手机号码" prop="F_CustomerPhone">
22
-            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone"/>
22
+            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
23 23
           </el-form-item>
24 24
         </el-col>
25 25
       </el-row>
@@ -122,7 +122,7 @@
122 122
         </el-col>
123 123
         <el-col :span="12">
124 124
           <el-form-item label="收件人手机号" >
125
-            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号"/>
125
+            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
126 126
           </el-form-item>
127 127
         </el-col>
128 128
         <el-col :span="12">
@@ -166,7 +166,7 @@
166 166
         </el-col>
167 167
         <el-col :span="12">
168 168
           <el-form-item label="邮编" >
169
-            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编"/>
169
+            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
170 170
           </el-form-item>
171 171
         </el-col>
172 172
         <el-col :span="12">
@@ -573,7 +573,11 @@ export default {
573 573
         }
574 574
         getintegral(params).then(response=>{
575 575
           if(response.state=='success'){
576
-            this.alreadyPoints = response.rows.Rows[0].F_Score
576
+            if(response.rows.Rows.length>0){
577
+              this.alreadyPoints = response.rows.Rows[0].F_Score
578
+            }else{
579
+              this.alreadyPoints = ''
580
+            }
577 581
           }
578 582
         })
579 583
         // getOrderLists(params).then(response => {

+ 9 - 9
CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/component/addOrEdit.vue

@@ -16,18 +16,18 @@
16 16
       <el-form-item label="分类名称" prop="deptname">
17 17
         <el-input v-model="ruleForm.deptname" placeholder="请输入分类名称"/>
18 18
       </el-form-item>
19
-      <el-form-item v-if="addEditLock" label="是否锁定:" prop="islock" >
19
+      <!-- <el-form-item v-if="addEditLock" label="是否锁定:" prop="islock" >
20 20
         <el-radio-group v-model="ruleForm.islock">
21 21
           <el-radio label="0">否</el-radio>
22 22
           <el-radio label="1">是</el-radio>
23 23
         </el-radio-group>
24
-      </el-form-item>
24
+      </el-form-item> -->
25 25
       <el-form-item label="任务额:" prop="targetmoney">
26 26
         <el-input v-model="ruleForm.targetmoney" type="text" autosize placeholder="请输入任务额"/>
27 27
       </el-form-item>
28
-      <el-form-item label="排列序号" prop="sort">
28
+      <!-- <el-form-item label="排列序号" prop="sort">
29 29
         <el-input v-model.number="ruleForm.sort" maxlength="20" placeholder="请输入排列序号"/>
30
-      </el-form-item>
30
+      </el-form-item> -->
31 31
       <el-form-item>
32 32
         <el-button type="primary" @click="submitForm">保存</el-button>
33 33
       </el-form-item>
@@ -56,9 +56,9 @@ export default{
56 56
       ruleForm: {
57 57
         parentid: '', // 父节点id
58 58
         deptid: '', // 当前节点id
59
-        sort: '', // 序号
59
+        // sort: '', // 序号
60 60
         deptname: '', // 分类名称
61
-        islock: '', //是否锁定
61
+        // islock: '', //是否锁定
62 62
         targetmoney: '', //任务额
63 63
       },
64 64
       rules: {
@@ -109,9 +109,9 @@ export default{
109 109
         if (response.state.toLowerCase() === 'success') {
110 110
           const res = response.data.model
111 111
           this.ruleForm.deptname = res.F_DeptName // 分类名称
112
-          this.ruleForm.sort = res.F_Sort // 排序
113
-          this.ruleForm.islock = res.F_Lock + '' // 排序
114
-          this.ruleForm.sort = res.F_TargetMoney // 排序
112
+          // this.ruleForm.sort = res.F_Sort // 排序
113
+          // this.ruleForm.islock = res.F_Lock + '' // 排序
114
+          this.ruleForm.targetmoney = res.F_TargetMoney // 排序
115 115
           this.ruleForm.parentid = res.F_ParentId // 父节点id
116 116
           const len = response.data.levelid.length
117 117
           const levelid = response.data.levelid

+ 2 - 2
CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/index.vue

@@ -20,11 +20,11 @@
20 20
         @selection-change="changeSelects">
21 21
           <el-table-column type="selection" width="40" fixed></el-table-column>
22 22
           <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width=""/>
23
-          <el-table-column prop="F_Lock" label="锁定" align="center" min-width="">
23
+          <!-- <el-table-column prop="F_Lock" label="锁定" align="center" min-width="">
24 24
             <template slot-scope="scope">
25 25
               {{ scope.row.F_Lock | judgmentLockName }}
26 26
             </template>
27
-          </el-table-column>
27
+          </el-table-column> -->
28 28
           <el-table-column prop="F_TargetMoney" label="任务额" align="center" min-width="">
29 29
             <template slot-scope="scope">
30 30
               {{ scope.row.F_TargetMoney | judgmentTargetMoney }}

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

@@ -90,7 +90,7 @@
90 90
           <span>{{ scope.row.EndTime | timesFilter }}</span>
91 91
         </template>
92 92
       </el-table-column>
93
-      <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
93
+      <el-table-column prop="TalkLongTime" label="录音时长" align="center" min-width />
94 94
       <el-table-column prop="RelayNumber" label="中继号码" align="center" min-width />
95 95
       <!-- <el-table-column label="外呼类型" align="center" min-width>
96 96
         <template slot-scope="scope">{{ scope.row.callopttype | callopttypeFilter }}</template>