Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_UI_V6.0

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

@@ -1,6 +1,5 @@
 <template>
-  <div class="topNotice">
-    <el-button type="text">点击打开 Message Box</el-button>
+  <div>
   </div>
 </template>
 
@@ -29,7 +28,7 @@ export default {
   methods: {
     callOut () {
       if (this.telIsLogin == 1) {
-        clearInterval(this.timer);
+        clearInterval(this.timer)
         this.scoketDatas = {
           'Type': 'AutoCall',
           'AgentID': this.usercode,
@@ -110,63 +109,4 @@ export default {
   bottom: 0 !important;
   right: 0 !important;
 }
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.topNoticePop {
-  .topNotice {
-    .header {
-      padding: 20px;
-      background-color: #fff;
-      border-bottom: 1px solid #e4eaec;
-      .title {
-        margin: 0;
-        color: #37474f;
-        font-weight: 400;
-        font-size: 1em;
-        text-shadow: rgba(0, 0, 0, 0.05) 0 0 1px;
-      }
-    }
-    .content {
-      list-style: none;
-      padding: 0 20px;
-      margin: 0;
-      .proitem {
-        border-bottom: 1px solid #e4eaec;
-        &:last-child {
-          border-bottom: none;
-        }
-        padding: 10px 0;
-        .proname {
-          margin: 0;
-          padding: 0;
-          font-weight: 400;
-          font-size: 14px;
-        }
-        .orderendtime {
-          display: inline-block;
-          font-size: 12px;
-          width: 260px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          cursor: pointer;
-        }
-      }
-    }
-    .nomsg {
-      min-height: 270px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-    .footer_menu {
-      background-color: #f3f7f9;
-      border-top: 1px solid #e4eaec;
-    }
-  }
-}
-.unread {
-  float: right;
-}
-</style>
+</style>

CallCenterWeb.UI/src/store/modules/user.js

@@ -80,7 +80,7 @@ const user = {
           commit('SET_ROLE_CODE', data.role_code)
           commit('SET_ROLE_NAME', data.role_name)
           commit('SET_GROUPCODE', data.group.toLowerCase()) // 用户的坐席组code
-          window.localStorage.setItem('groupCode', data.group.toLowerCase()) // 用户的坐席组code
+          window.localStorage.setItem('groupCode', data.group) // 用户的坐席组code
           window.localStorage.setItem('roleCode', data.role_code) // 用户的坐席组code
           resolve()
         }).catch(error => {

CallCenterWeb.UI/src/views/outbound/automaticOutbound/components/addOrEdit.vue

@@ -93,9 +93,19 @@ export default {
         }],
         F_State: [{
           required: true,
-          trigger: 'blur',
-          message: '请输入任务状态',
-        }]
+          trigger: 'change',
+          message: '请选择任务状态',
+        }],
+        F_Name: [{
+            required: true,
+            trigger: "blur",
+            message: "请输入任务名称",
+        }],
+        F_Type: [{
+            required: true,
+            trigger: "change",
+            message: "请选择外呼类型",
+        }],
       },
       loading: false
     }

CallCenterWeb.UI/src/views/outbound/automaticOutbound/components/editOutboundNumber.vue

@@ -1,9 +1,6 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
-      <el-form-item label="外呼人" prop="F_CallUser">
-        <el-input v-model="ruleForm.F_CallUser" placeholder="请输入外呼人"/>
-      </el-form-item>
       <el-form-item label="外呼号码" prop="F_Tel">
         <el-input v-model="ruleForm.F_Tel" placeholder="请输入外呼号码"/>
       </el-form-item>
@@ -89,16 +86,10 @@ export default {
       ruleForm: {
         F_ID: '', //外呼号码id
         F_Parentid: '', //任务id
-        F_CallUser: '', //外呼人
         F_LastCallid: '', //通话记录id
         F_Tel: '', //外呼号码
       },
       rules: {
-        F_CallUser: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入外呼人',
-        }],
         F_Tel: [{
           required: true,
           trigger: 'blur',
@@ -149,7 +140,6 @@ export default {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
             this.ruleForm.F_Parentid = res.F_Parentid //任务id
-            this.ruleForm.F_CallUser = res.F_CallUser //外呼人
             this.ruleForm.F_LastCallid = res.F_LastCallid //通话记录id
             this.ruleForm.F_Tel = res.F_Tel //外呼号码
         }

CallCenterWeb.UI/src/views/systemSetup/roleSetting/baseNumberManagement/addOrEdit.vue

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="坐席组" prop="F_ZXZCode" >
         <el-select v-model="ruleForm.F_ZXZCode" class="form_select" filterable clearable placeholder="请选择坐席组">
-          <el-option v-for="item in agentGroupDataLists" :key="item.F_ZXZCode" :label="item.F_ZXZCode" :value="item.F_ZXZCode"/>
+          <el-option v-for="item in agentGroupDataLists" :key="item.F_ZXZCode" :label="item.F_ZXZName" :value="item.F_ZXZCode"/>
         </el-select>
       </el-form-item>
       <el-form-item label="底号" prop="F_Tel">
@@ -28,7 +28,7 @@ export default {
   name: "AddOrEdit",
   props: {
     rowid: {
-      type: String,
+      type: Number,
       default: ""
     },
     layerid: {

CallCenterWeb.UI/src/views/systemSetup/roleSetting/baseNumberManagement/index.vue

@@ -6,7 +6,7 @@
         <el-option
           v-for="item in agentGroupDataLists"
           :key="item.F_ZXZCode"
-          :label="item.F_ZXZCode"
+          :label="item.F_ZXZName"
           :value="item.F_ZXZCode"
         />
       </el-select>

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

@@ -184,8 +184,22 @@ export default {
         F_State: [
           {
             required: true,
+            trigger: "change",
+            message: "请选择任务状态",
+          },
+        ],
+        F_Name: [
+          {
+            required: true,
             trigger: "blur",
-            message: "请输入任务状态",
+            message: "请输入任务名称",
+          },
+        ],
+        F_Type: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择外呼类型",
           },
         ],
       },