bug修改

CallCenterWeb.UI/src/components/Teloperation/index.vue

@@ -226,6 +226,11 @@ export default {
     // 签入
     signIn () {
       console.log(this.groupcode)
+      console.log(this.extension)
+      // if(!this.groupcode){
+      //   this.$message.error('分机号不存在')
+      //   return false
+      // }
       if (!this.extension) {
         this.$confirm('如果您想进行话务操作，请重新登录并且输入分机号, 是否重新登录？', '提示', {
           confirmButtonText: '是',
@@ -235,7 +240,8 @@ export default {
           this.$store.dispatch('FedLogOut').then(() => {
             location.reload() // 为了重新实例化vue-router对象 避免bug
           })
-        }).catch(() => { })
+        }).catch(() => {
+         })
         return
       }
       this.scoketDatas = {

CallCenterWeb.UI/src/utils/telWebsocket.js

@@ -222,7 +222,7 @@ function dealMsg (msgData) {
         //console.log(msgData)
         updateSeatMonitorlists(msgData)
       } else {
-        Message.error(`telWebsocket错误信息: ${rlt} !`)
+        Message.error(`${rlt} !`)
       }
       // Message.error(`telWebsocket错误信息: ${rlt} !`)
     }

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleListCustodian/index.vue

@@ -2,7 +2,6 @@
   <div class="app-container">
     <div class="filter-container">
       <el-select v-model="searchData.checkState" class="filter-item" filterable clearable placeholder="请选择售后审核状态">
-        <el-option label="全部" value="-2"></el-option>
         <el-option label="未审核" value="0"></el-option>
         <el-option label="收到货" value="1"></el-option>
         <el-option label="货物不符" value="2"></el-option>
@@ -47,7 +46,7 @@
 
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_review'" type="text" @click="btn_review(scope.row.F_Id)">售后审核</el-button>
+          <el-button v-permission="'HY_review'" v-if="aftersales(scope.row.F_CheckStateSH)" type="text" @click="btn_review(scope.row.F_Id)">售后审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -109,9 +108,10 @@ export default {
     return {
       loading: false,
       searchData: {
-        checkState: '-2', //售后审核状态
+        checkState: '', //售后审核状态
         type: '', //售后类型
       },
+      checkState:'',
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -135,8 +135,13 @@ export default {
     getList() {
       this.loading = true;
       return new Promise(resolve => {
+        if(this.searchData.checkState==null||this.searchData.checkState==''){
+          this.checkState='-2'
+        }else{
+          this.checkState=this.searchData.checkState
+        }
         const params = {
-          F_CheckStateKG: this.searchData.checkState, //售后审核状态
+          F_CheckStateKG: this.checkState, //售后审核状态
           F_Type: this.searchData.type, //售后类型
           F_State: -2, //订单状态
           F_Id: '',
@@ -180,6 +185,14 @@ export default {
         title: '订单详情'
       })
     },
+    //售后审核设置
+    aftersales(state){
+      if(state==1){
+        return false
+      }else{
+        return true
+      }
+    },
     //选择多个
     handleSelectionChange(val) {
       const ids = []

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -19,7 +19,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="F_CustomerPhone">
-            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone"/>
+            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -56,7 +56,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="收件人手机号" >
-            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号"/>
+            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -100,7 +100,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="邮编" >
-            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编"/>
+            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/index.vue

@@ -179,6 +179,7 @@ export default {
           F_TrackingNo: this.searchData.trackingNo, //运单号
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
+          F_PayState:'-2',
         };
         getAfterSaleOrderList(params).then(response => {
           this.loading = false;

CallCenterWeb.UI/src/views/autoCallScreen/components/callRecord.vue

@@ -171,6 +171,7 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
+          CallType:'',
           keyword: this.callinNum //	否	string	模糊查询（呼叫号码）
         }
         getCallRecords(params).then(response => {

CallCenterWeb.UI/src/views/callScreen/components/CallRecordList.vue

@@ -8,7 +8,7 @@
       <el-table-column label="呼叫类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
       </el-table-column>
-      <!-- <el-table-column label="呼叫状态" align="center" min-width>
+      <el-table-column label="呼叫状态" align="center" min-width>
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.CallState === 1 ? 'success' : 'danger'"
@@ -17,12 +17,12 @@
           >{{ scope.row.CallState | statusFilter }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="处理方式" align="center" min-width>
+      <!-- <el-table-column label="处理方式" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.DealType | dealtypeFilter }}</template>
       </el-table-column>
       <el-table-column label="满意度" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.MYD | evaluationFilter }}</template>
-      </el-table-column>-->
+      </el-table-column> -->
       <el-table-column label="录音" align="center" min-width>
         <template slot-scope="scope">
           <svg-icon
@@ -167,6 +167,7 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
+          CallType:'',
           keyword: this.callinNum //	否	string	模糊查询（呼叫号码）
         }
         getCallRecords(params).then(response => {

CallCenterWeb.UI/src/views/callScreen/components/OrderList.vue

@@ -25,7 +25,7 @@
       <el-table-column label="物流状态" align="center">
         <template slot-scope="scope">{{ scope.row.F_Status | judgmentStatusName }}</template>
       </el-table-column>
-      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+      <!-- <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -39,7 +39,7 @@
             @click="btn_collection(scope.row.F_Id)"
           >改代收</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <pagination
       v-show="pageParams.total > 0"

CallCenterWeb.UI/src/views/custodianManagement/orderListCustodian/index.vue

@@ -55,11 +55,11 @@
           {{ scope.row.F_Status | judgmentStatusName }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+      <el-table-column label="操作" width="170" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_sorting'" type="text" @click="btn_sorting(scope.row.F_Id)">分拣</el-button>
-          <el-button v-permission="'HY_ship'" type="text" @click="btn_ship(scope.row.F_Id)">发货</el-button>
-          <el-button v-permission="'HY_sold_out'" type="text" @click="btn_sold_out(scope.row.F_Id)">无货</el-button>
+          <el-button v-permission="'HY_sorting'" v-if="issorting(scope.row.F_State)" type="text" @click="btn_sorting(scope.row.F_Id)">分拣</el-button>
+          <el-button v-permission="'HY_ship'" v-if="isship(scope.row.F_State)" type="text" @click="btn_ship(scope.row.F_Id)">发货</el-button>
+          <el-button v-permission="'HY_sold_out'" v-if="issold_out(scope.row.F_State)" type="text" @click="btn_sold_out(scope.row.F_Id)">无货</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -169,6 +169,7 @@ export default {
           F_TrackingNo: this.searchData.trackingNo, //运单号
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
+          F_PayState:'-2'
         };
         getOrderListCustodian(params).then(response => {
           this.loading = false;
@@ -180,6 +181,30 @@ export default {
         resolve();
       });
     },
+    //分拣权限设置
+    issorting(state){
+      if(state==6||state==5){
+        return false
+      }else{
+        return true
+      }
+    },
+    //发货权限设置
+    isship(state){
+      if(state==6){
+        return false
+      }else{
+        return true
+      }
+    },
+    //无货权限设置
+    issold_out(state){
+      if(state==6||state==5||state==4){
+        return false
+      }else{
+        return true
+      }
+    },
     // 获取订单类型
     getOrderType() {
       return new Promise(resolve=>{
@@ -316,7 +341,7 @@ export default {
         checkOrderCustodian(data).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.getList()
-            this.$message.success('发货成功!')
+            this.$message.success('分拣成功!')
           }
         })
       }

CallCenterWeb.UI/src/views/orderManagement/orderList/detail.vue

@@ -195,7 +195,7 @@ export default {
           this.orderDetailData.F_VipId = res.F_VipId //关联会员id
           this.orderDetailData.F_Score = res.F_UseScore //使用积分
           this.orderDetailData.F_AddTime = res.F_AddTime //添加时间
-          this.orderDetailData.F_FlowNum = res.F_FlowNum //运单号
+          this.orderDetailData.F_FlowNum = res.F_TrackingNo  //运单号
           this.orderDetailData.F_RecommendName = res.F_RecommendName//推荐人名称
           this.orderDetailData.F_AddUserName = res.F_AddUserName //下单员工
           this.orderDetailData.F_BelongName = res.F_BelongName //归属员工

CallCenterWeb.UI/src/views/orderManagement/orderList/index.vue

@@ -255,6 +255,7 @@ export default {
           F_TrackingNo: this.searchData.trackingNo, //运单号
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
+          F_PayState:'-2',
         };
         getOrderLists(params).then(response => {
           this.loading = false;

CallCenterWeb.UI/src/views/reportFormManagement/teamPerformance/index.vue

@@ -223,7 +223,7 @@ export default {
       });
     },
     btn_delete(editId) {
-      this.$confirm("您确定要将此待办信息删除吗?", "提示", {
+      this.$confirm("您确定要将此绩效信息删除吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

CallCenterWeb.UI/src/views/trafficData/callRecord/index.vue

@@ -44,7 +44,7 @@
       <el-table-column label="呼叫类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
       </el-table-column>
-      <!-- <el-table-column label="呼叫状态" align="center" min-width>
+      <el-table-column label="呼叫状态" align="center" min-width>
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.CallState === 1 ? 'success' : 'danger'"
@@ -52,7 +52,7 @@
             disable-transitions
           >{{ scope.row.CallState | statusFilter }}</el-tag>
         </template>
-      </el-table-column>-->
+      </el-table-column>
       <!-- <el-table-column label="处理方式" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.DealType | dealtypeFilter }}</template>
       </el-table-column>-->
@@ -214,7 +214,7 @@ export default {
           pagesize: this.pageParams.pagesize, // 每页几条信息
           CallNumber: this.keyword.replace(/\s*/g, ""), //	否	string	模糊查询（呼叫号码）
           UserCode: this.roleId, //	否	string	模糊查询（呼叫号码） CallNumber
-          CallType: this.CallType, //呼叫类型
+          CallType: this.CallType==null?'':this.CallType, //呼叫类型
           CallState: this.CallState, //呼叫状态
           SearchStartTime: this.searchDate && this.searchDate[0],
           SearchEndTime: this.searchDate && this.searchDate[1]