瀏覽代碼

feat:app独立发课-所有关于绑定客服和客服组的都改成销售和销售公司

caoliqin 1 天之前
父節點
當前提交
82e95f5ec6

+ 1 - 1
src/views/app/courseFinishTemp/index.vue

@@ -530,7 +530,7 @@
                     <div>
                         <el-tag style="margin-left: 5px" size="medium" :key="s.id" v-for="s in customerConfig.selected" closable
                             :disable-transitions="false" @close="handleCloseCustomer(s)">
-                            <span>{{ s.roleName }}</span>
+                            <span>{{ s.memberName }}</span>
                         </el-tag>
                     </div>
                     <div style="

+ 3 - 3
src/views/app/invitationCode/index.vue

@@ -58,7 +58,7 @@
               @close="handleCloseCusForQuery(list)"
               style="margin: 3px;"
             >
-              {{ list.roleName }}
+              {{ list.memberName }}
             </el-tag>
           </div>
         </div>
@@ -229,7 +229,7 @@
     />
 
     <!-- 新增/修改邀请码弹窗 -->
-    <el-dialog :title="dialog.title" :visible.sync="dialog.open" v-loading="dialog.loading" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" :visible.sync="dialog.open" v-loading="dialog.loading" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="所属部门" prop="deptId" v-if="activeName === 'person'">
           <treeselect
@@ -265,7 +265,7 @@
           <div>
             <el-tag style="margin-left: 5px" size="medium" :key="s.id" v-for="s in dialog.selectCustomerForEdit.selected" closable
                    :disable-transitions="false" @close="handleCloseCusForEdit(s)">
-              <span>{{ s.roleName }}</span>
+              <span>{{ s.memberName }}</span>
             </el-tag>
           </div>
         </el-form-item>

+ 1 - 1
src/views/app/sop/info/addSop.vue

@@ -72,7 +72,7 @@
             <div>
               <el-tag style="margin-left: 5px" size="medium" :key="s.id" v-for="s in selected" closable
                 :disable-transitions="false" @close="handleCloseCustomer(s)">
-                <span>{{ s.roleName }}</span>
+                <span>{{ s.memberName }}</span>
               </el-tag>
             </div>
           </el-form-item>

+ 12 - 10
src/views/app/sop/template/updateSopTemp.vue

@@ -974,7 +974,7 @@
                                   </el-row>
                                 </div>
 
-                                <!-- 改状态 -->
+                                <!-- 改状态(已停用,暂注释)
                                 <div v-if="ruleItem.type == 5"
                                   style="
                                     background-color: #fdfdfd;
@@ -1038,6 +1038,7 @@
                                   </el-form-item>
 
                                 </div>
+                                -->
 
                                 <!-- 添加内容节点 -->
                                 <el-link
@@ -1423,7 +1424,8 @@ export default {
         this.sysFsSopWatchStatus = response.data;
       });
       this.getDicts("app_sop_msg_type").then(response => {
-        this.msgTypeOptions = response.data;
+        // 改状态(dictValue=5)已停用,页面过滤掉该选项
+        this.msgTypeOptions = (response.data || []).filter(d => Number(d.dictValue) !== 5);
       });
       this.getDicts("app_normal_disabled_status").then(response => {
         this.statusOptions = response.data;
@@ -1990,14 +1992,14 @@ export default {
             }
           }
         }
-        //规则消息类别-改状态(绑定/解绑-标签/客服)
-        else if (dc.type == 5) {
-          if (this.isEmpty(dc.addTag) && this.isEmpty(dc.delTag)
-            && this.isEmpty(dc?.addCustomer) && this.isEmpty(dc?.delCustomer)) {
-            this.$message.error(`第${j + 1}条规则配置错误,未改动任何状态`);
-            return false;
-          }
-        }
+        //规则消息类别-改状态(绑定/解绑-标签/客服)(已停用,暂注释)
+        // else if (dc.type == 5) {
+        //   if (this.isEmpty(dc.addTag) && this.isEmpty(dc.delTag)
+        //     && this.isEmpty(dc?.addCustomer) && this.isEmpty(dc?.delCustomer)) {
+        //     this.$message.error(`第${j + 1}条规则配置错误,未改动任何状态`);
+        //     return false;
+        //   }
+        // }
       }
       return true;
     },

+ 29 - 16
src/views/app/user/CusRoleList.vue

@@ -3,8 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px"
       @submit.prevent="handleQuery">
 
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable size="small"
+      <el-form-item label="销售名称" prop="memberName">
+        <el-input v-model="queryParams.memberName" placeholder="请输入销售名称" clearable size="small"
+          @keydown.enter.native="handleQueryEnter" />
+      </el-form-item>
+      <el-form-item label="所属公司" prop="roleName">
+        <el-input v-model="queryParams.roleName" placeholder="请输入所属公司" clearable size="small"
           @keydown.enter.native="handleQueryEnter" />
       </el-form-item>
 
@@ -14,9 +18,9 @@
       </el-form-item>
     </el-form>
 
-    <el-table 
-      v-loading="loading" 
-      :data="roleList" 
+    <el-table
+      v-loading="loading"
+      :data="roleList"
       ref="roleList"
       :row-key="row => String(row.id)"
       :class="{ 'cus-role-single': !multiple }"
@@ -24,16 +28,17 @@
       @select-all="allSelectHandler"
      >
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="角色id" align="center" prop="id"/>
-      <el-table-column label="角色名称" align="center" prop="roleName"/>
-      <el-table-column label="角色备注" align="center" prop="remark"/>
+      <el-table-column label="销售id" align="center" prop="id" min-width="100"/>
+      <el-table-column label="销售名称" align="center" prop="memberName" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="所属公司" align="center" prop="roleName" min-width="140" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="remark" min-width="160" show-overflow-tooltip/>
     </el-table>
 
     <div style="margin-top: 30px;display: flex;justify-content: center">
       <el-button type="warning" icon="el-icon-search" @click="confirmSelect">确定选择</el-button>
     </div>
 
-    <pagination 
+    <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -65,10 +70,12 @@ export default {
       type: Boolean,
       default: true,
     },
+    // 排除的销售id
     ignoreIds: {
       type: Array,
       default: () => [],
     },
+    // 仅查询指定销售id
     ids: {
       type: Array,
       default: () => [],
@@ -80,12 +87,13 @@ export default {
       loading: true,
       // 总条数
       total: 0,
-      // 客服角色表格数据
+      // 客服成员表格数据
       roleList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        memberName: null,
         roleName: null
       },
     };
@@ -105,16 +113,20 @@ export default {
   },
   methods: {
     /**
-     * 查询用户列表
+     * 查询客服成员列表
      */
     getList() {
       this.loading = true;
       let qp = this.queryParams;
-      if (this.ignoreIds) {
+      if (this.ignoreIds && this.ignoreIds.length) {
         qp['ignoreIds'] = this.ignoreIds;
+      } else {
+        delete qp.ignoreIds;
       }
-       if (this.ids) {
+      if (this.ids && this.ids.length) {
         qp['ids'] = this.ids;
+      } else {
+        delete qp.ids;
       }
       listRole(qp).then(response => {
         this.roleList = response.rows;
@@ -151,6 +163,7 @@ export default {
       this.queryParams = {
         pageNum: this.defaultPageNum,
         pageSize: this.defaultPageSize,
+        memberName: null,
         roleName: null,
       }
       this.resetForm("form");
@@ -188,8 +201,8 @@ export default {
     },
     /**
      * 单选
-     * @param selection 
-     * @param row 
+     * @param selection
+     * @param row
      */
     singleSelectHandler(selection, row) {
       // 单选模式:只保留当前行
@@ -230,7 +243,7 @@ export default {
     },
     /**
      * 全选
-     * @param selection 
+     * @param selection
      */
     allSelectHandler(selection) {
       // 单选模式不允许全选

+ 2 - 2
src/views/app/welcome/index.vue

@@ -12,7 +12,7 @@
                             :key="list.id"
                             @close="handleCloseCustomer(list, 0)"
                             style="margin: 3px;"
-                        >{{ list.roleName }}
+                        >{{ list.memberName }}
                         </el-tag>
                     </div>
                 </div>
@@ -126,7 +126,7 @@
                         <div>
                             <el-tag style="margin-left: 5px" size="medium" :key="s.id" v-for="s in appCustomerBindConfig.selected" closable
                                 :disable-transitions="false" @close="handleCloseCustomer(s, 1)">
-                                <span>{{ s.roleName }}</span>
+                                <span>{{ s.memberName }}</span>
                             </el-tag>
                         </div>
                     </el-form-item>