Merge branches 'dev' and 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/operationManagement/channel.vue

@@ -48,7 +48,8 @@
           <el-table-column label="工号" prop="userId" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ typeAttrMap(scope.row.typeAttr) }}
+              <span>{{ typeMatch(scope.row.typeAttr) }}</span>
+
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="organizationName" width="200"></el-table-column>
@@ -179,18 +180,18 @@ const cascaderProps = {
     children: 'children'
 }
 let options = ref([])
-const typeAttrMap=(value)=>{
-  const map = {
-    "1": '前线人员',
-    "2": '后线人员',
-    "3": '合伙人',
-    "4": '工作是管理员',
-    "5": '团队',
-    "6": '个代',
-    "7": '渠道',
-    "8": '电销',
+// 人员类型匹配
+const typeMatch = (typeAttr: string) => {
+  const map: any = {
+    '6': '个代',
+    '7': '渠道',
+    '5': '团队',
+    '8': '电销组',
+    '3': '合伙人',
   }
-  return map[value]
+  return typeAttr?.split(',')
+    .map((typeId: any) => map[typeId] || typeId)
+    .join(',') || '未知'
 }
 const statusMap = (value: any) => {
   const map = {

src/views/operationManagement/operation.vue

@@ -519,7 +519,7 @@ const handleCurrentChange = (page) => {
 // 详情
 const showDetail = (scope) => {
   myRouter.push({
-    path: '/operationManagement/operationDetail',
+    path: '/operationManagement/operation/operationDetail',
     query: {
       id: scope.row.userId,
       ids: scope.row.id

src/views/operationManagement/team.vue

@@ -47,7 +47,7 @@
           <el-table-column label="工号" prop="workNumber" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ typeAttrMap(scope.row.typeAttr) }}
+              <span>{{ typeMatch(scope.row.typeAttr) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="organizationName" width="200"></el-table-column>
@@ -179,18 +179,18 @@ const statusMap = (value: any) => {
   }
   return map[value]
 }
-const typeAttrMap=(value)=>{
-  const map = {
-    "1": '前线人员',
-    "2": '后线人员',
-    "3": '合伙人',
-    "4": '工作是管理员',
-    "5": '团队',
-    "6": '个代',
-    "7": '渠道',
-    "8": '电销',
+// 人员类型匹配
+const typeMatch = (typeAttr: string) => {
+  const map: any = {
+    '6': '个代',
+    '7': '渠道',
+    '5': '团队',
+    '8': '电销组',
+    '3': '合伙人',
   }
-  return map[value]
+  return typeAttr?.split(',')
+    .map((typeId: any) => map[typeId] || typeId)
+    .join(',') || '未知'
 }
 // 团队
 let treeValue = ref('')

src/views/operationManagement/telemarketing.vue

@@ -48,7 +48,7 @@
           <el-table-column label="工号" prop="workNumber" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ typeAttrMap(scope.row.typeAttr) || '--'}}
+              <span>{{ typeMatch(scope.row.typeAttr) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="organizationName" width="200"></el-table-column>
@@ -180,18 +180,18 @@ const cascaderProps = {
 }
 let options = ref([])
 
-const typeAttrMap=(value)=>{
-  const map = {
-    "1": '前线人员',
-    "2": '后线人员',
-    "3": '合伙人',
-    "4": '工作是管理员',
-    "5": '团队',
-    "6": '个代',
-    "7": '渠道',
-    "8": '电销',
+// 人员类型匹配
+const typeMatch = (typeAttr: string) => {
+  const map: any = {
+    '6': '个代',
+    '7': '渠道',
+    '5': '团队',
+    '8': '电销组',
+    '3': '合伙人',
   }
-  return map[value]
+  return typeAttr?.split(',')
+    .map((typeId: any) => map[typeId] || typeId)
+    .join(',') || '未知'
 }
 const statusMap = (value: any) => {
   const map = {