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

src/views/partnerManagement/LevelRule.vue

@@ -347,7 +347,7 @@
                   <div class="flex f-c row">
                     <div class="flex a-c mb-2" v-for="(item, index) in dataList[4].requirement" :key="index">
                       <el-checkbox v-model="item.checked"></el-checkbox>
-                      <span style="margin: 0 10px;">{{ index === 0 ? '邀请合伙人达' : index === 1 ?
+                      <span style="margin: 0 10px;">{{ index === 0 ? '邀请团队长达' : index === 1 ?
                         `${dataList[4].gradeName}下属成员出单保费`
                         : '自己的出单保费达' }}</span>
                       <el-input class="width" v-model="item.min" style="margin: 0 5px;" placeholder="请输入">
@@ -371,7 +371,7 @@
                   <div class="flex f-c row">
                     <div class="flex a-c mb-2" v-for="(item, index) in dataList[4].strategyArray" :key="index">
                       <el-checkbox v-model="item.checked"></el-checkbox>
-                      <span style="margin: 0 10px;">{{ index === 0 ? '邀请合伙人达' : index === 1 ?
+                      <span style="margin: 0 10px;">{{ index === 0 ? '邀请团队长达' : index === 1 ?
                         `${dataList[4].gradeName}下属成员出单保费`
                         : '自己的出单保费达' }}</span>
                       <el-input class="width" v-model="item.min" style="margin: 0 5px;" placeholder="请输入">

src/views/partnerManagement/partner.vue

@@ -116,6 +116,7 @@ const formInline = reactive({
   grade: '',//合伙人等级
   inviter: "",//邀请人
   deptId: '',//机构id
+  typeAttr: '',
 })
 const pageInfo = ref({
   pageNum: 1,
@@ -129,59 +130,29 @@ const typeAttrOptions = ref([
   {
     label: '个代',
     value: '6'
-  }, {
-    label: '渠道',
-    value: '7'
-  }, {
-    label: '团队',
-    value: '5'
-  },
-  {
-    label: '电销组',
-    value: '8'
   },
   {
     label: '合伙人',
     value: '3'
-  },
+  }
 ])
 const statusOptions = ref([
   {
-    label: '未认证',
+    label: '待入职',
     value: '0'
   },
   {
-    label: '实名待认证',
+    label: '入职待审核',
     value: '1'
   },
   {
-    label: '实名认证失败',
+    label: '审核不通过',
     value: '2'
   },
-  {
-    label: '待入职',
-    value: '3'
-  },
-  {
-    label: '入司待审核',
-    value: '4'
-  },
-  {
-    label: '入司审核失败',
-    value: '5'
-  },
   {
     label: '已入职',
-    value: '6'
-  },
-  {
-    label: '离职待审核',
-    value: '7'
-  },
-  {
-    label: '离职',
-    value: '8'
-  },
+    value: '3'
+  }
 
 ])
 const parentIdprops = {
@@ -383,6 +354,7 @@ const addNewGradeSave = () => {
         message: res.msg,
         plain: true,
       })
+      checkList.value = []
       addNewGradeShow.value = false;
       findpage();
     }