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

src/assets/styles/globals.css

@@ -28,6 +28,9 @@
 
   /* 元素字体基础值 */
   --el-font-family: pingfang sc, pingfang sc;
+
+  --el-text-color-primary:#666;
+  --el-text-color-regular:#333;
 }
 
 /* 明暗模式 CSS 变量 */

src/views/operationManagement/modules/addOperation.vue

@@ -8,9 +8,9 @@
               <el-col :span="10">
                 <el-form-item prop="typeAttr" label="业务员类型">
                   <el-select v-model="operationForm.typeAttr" placeholder="请选择业务员类型" @change="typeAttrChange">
+                    <el-option key="5" value="5" label="团队"></el-option>
                     <el-option key="6" value="6" label="个代"></el-option>
                     <el-option key="7" value="7" label="渠道"></el-option>
-                    <el-option key="5" value="5" label="团队"></el-option>
                     <el-option key="8" value="8" label="电销组"></el-option>
                   </el-select>
                 </el-form-item>

src/views/operationManagement/modules/addTeam.vue

@@ -110,7 +110,8 @@ const deptIdChange = (e) => {
 let userList = ref([])
 const getUser = (id) => {
   api.operationApi.getUser({
-    id: id
+    id: id,
+    typeAttr:2,
   }).then(res => {
     if(res?.code == 200) {
       userList.value = res.data

src/views/operationManagement/team.vue

@@ -182,11 +182,14 @@ const statusMap = (value: any) => {
 // 人员类型匹配
 const typeMatch = (typeAttr: string) => {
   const map: any = {
-    '6': '个代',
-    '7': '渠道',
-    '5': '团队',
-    '8': '电销组',
-    '3': '合伙人',
+    "1": '前线人员',
+    "2": '后线人员',
+    "3": '合伙人',
+    "4": '工作是管理员',
+    "5": '团队',
+    "6": '个代',
+    "7": '渠道',
+    "8": '电销',
   }
   return typeAttr?.split(',')
     .map((typeId: any) => map[typeId] || typeId)

src/views/personnel/memberManagement.vue

@@ -64,7 +64,7 @@
                   </el-col>
                 </el-row>
             </el-form>
-            <div style="margin: 6px 0 24px;border-top: 1px dashed #EEEEEE; ;"></div>
+            <div style="margin: 6px 0 24px;border-top: 1px dashed #EEEEEE;"></div>
             <div >
               <el-button type="primary" @click="add(ruleFormRef)">
                 <el-icon>
@@ -403,15 +403,12 @@ const getUserList = () => {
   })
 };
 const editor = (item: any) => {
-  console.log(item)
   router.push({
     path: "/personnel/member/memberMessage",
     query: {
       id: item.userId
     }
   })
-  // pageInfo.pageNum=item.pageNum
-  // pageInfo.pageSize=item.pageSize
 };
 const router = useRouter()
 const add = (formEl: FormInstance | undefined) => {

src/views/personnel/modules/addOperation.vue

@@ -45,10 +45,10 @@
               <el-col :span="12" v-if="operationForm.isAddSalesman == '1'">
                 <el-form-item prop="typeAttr" label="业务员类型">
                   <el-select v-model="operationForm.typeAttr" placeholder="请选择业务员类型" @change="typeAttrChange">
-                    <el-option key="1" value="6" label="个代"></el-option>
-                    <el-option key="2" value="8" label="渠道"></el-option>
                     <el-option key="3" value="5" label="团队"></el-option>
-                    <el-option key="4" value="7" label="电销组"></el-option>
+                    <el-option key="1" value="6" label="个代"></el-option>
+                    <el-option key="4" value="7" label="渠道"></el-option>
+                    <el-option key="2" value="8" label="电销组"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>