Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/user.js

@@ -348,6 +348,15 @@ export const findBackUserList = (data) => {
     data
   })
 }
+
+// 后弦人员管理列表1
+export const findBackUserList1 = (data) => {
+  return axios({
+    url: '/user/findBackUserList1',
+    method: 'post',
+    data
+  })
+}
 // 渠道数据统计
 export const quTeamNum = (data) => {
   return axios({

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -79,7 +79,7 @@ export default {
                         type: "text"
                     },
                     {
-                        prop: "jqPolicyno",
+                        prop: "policyno",
                         label: "交强保单号",
                         type: "text"
                     },

src/views/PeopleManage/Agent/AgentManage.vue

@@ -199,7 +199,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -797,7 +797,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.userId);
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Player/PlayerManage.vue

@@ -176,8 +176,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.id"
-                      :key="val.id"
+                      :value="val.userId"
+                      :key="val.userId"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -479,7 +479,7 @@ export default {
             this.recommenderOptions = res.data;
           });
           this.$api.user
-          .findBackListByDeptId({ deptId: res.data.sysUser.deptId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -190,8 +190,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.id"
-                      :key="val.id"
+                      :value="val.userId"
+                      :key="val.userId"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -727,7 +727,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.userId);
       if (res.code == 200) {
         this.$api.user
-          .findBackListByDeptId({ deptId: res.data.sysUser.deptId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/Staff/StaffManage.vue

@@ -156,7 +156,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -628,13 +628,15 @@ export default {
         agentFlag: 0,
         leaderName: this.pageData.leaderId,
         roleId: '22',
+        pageNum: this.pageData.pageNum,
+        pageSize: this.pageData.pageSize
       }
       // .findUserList({
       //     ...this.pageData,
       //     dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
       //   })
       this.$api.user
-        .findBackUserList({ dto, pageNum: this.pageData.pageNum, pageSize: this.pageData.pageSize })
+        .findBackUserList(dto)
         .then((res) => {
           res.data.records.forEach(val => {
             if (val.sex && val.sex !== '' && val.sex !== null) {
@@ -682,7 +684,7 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId)
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -247,7 +247,7 @@
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -776,7 +776,8 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId);
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+          // .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+        .findBackUserList1({agentFlag: 0})
           .then((res) => {
             this.leaderOptions = res.data;
           });