Explorar el Código

1.费用校验管理=>任务池号删除
2.审核中的归属机构按省市县展示
人员管理:
1.团队长,代理人新增及编辑增加领导人,领导人工号输入栏

lihongxiao hace 2 años
padre
commit
60f980e996

+ 2 - 2
config/dev.env.js

@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
-  // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
+  BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 

+ 12 - 3
src/views/Core/components/detailsDialogPro.vue

@@ -39,16 +39,25 @@
         <OpenCloseBox id="gsxx">
           <span slot="title">归属信息</span>
           <div slot="boby">
+            <el-row class="premium-style " :gutter="20" >
+                <el-col :span="6" v-if="orderInfo.province"><span>归属机构省:</span>{{ orderInfo.province }}</el-col>
+                <el-col :span="6" v-if="orderInfo.city"><span>归属机构市:</span>{{ orderInfo.city }}</el-col>
+                <el-col :span="6" v-if="orderInfo.prefecture"><span>归属机构区:</span>{{ orderInfo.prefecture }}</el-col>
+              </el-row>
             <el-row class="premium-style " :gutter="20">
-              <el-col :span="24"><span>归属机构:</span>{{ orderInfo.deptAreaInfo }}</el-col>
               <el-col :span="6"><span>本人工号:</span>{{ orderInfo.userid }}</el-col>
               <el-col :span="6"><span>本人姓名:</span>{{ orderInfo.username }}</el-col>
               <el-col :span="6"><span>联系方式:</span>{{ orderInfo.mobile }}</el-col>
               <el-col :span="6"><span>性别:</span>{{ orderInfo.sex }}</el-col>
             </el-row>
+            <el-row class="premium-style " :gutter="20" >
+                <el-col :span="6" v-if="orderInfo.referrerProvince"><span>推荐人归属机构省:</span>{{ orderInfo.referrerProvince }}</el-col>
+                <el-col :span="6"  v-if="orderInfo.referrerCity"><span>推荐人归属机构市:</span>{{ orderInfo.referrerCity }}</el-col>
+                <el-col :span="6" v-if="orderInfo.referrerPrefecture"><span>推荐人归属机构区:</span>{{ orderInfo.referrerPrefecture }}</el-col>
+              </el-row>
             <el-row class="premium-style " :gutter="20">
-              <el-col v-if="orderInfo.referrerDeptAreaInfo" :span="24"><span>推荐人归属机构:</span>{{
-                orderInfo.referrerDeptAreaInfo }}</el-col>
+              <!-- <el-col v-if="orderInfo.referrerDeptAreaInfo" :span="24"><span>推荐人归属机构:</span>{{
+                orderInfo.referrerDeptAreaInfo }}</el-col> -->
               <el-col :span="6"><span>推荐人工号:</span>{{ orderInfo.userid }}</el-col>
               <el-col :span="6"><span>推荐人姓名:</span>{{ orderInfo.username }}</el-col>
               <el-col :span="6"><span>联系方式:</span>{{ orderInfo.referrerMobile }}</el-col>

+ 5 - 6
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -124,12 +124,11 @@ export default {
           options: []
         },
 
-        {
-          name: 'taskNo',
-          label: '任务池号',
-          type: 'input',
-
-        },
+        // {
+        //   name: 'taskNo',
+        //   label: '任务池号',
+        //   type: 'input',
+        // },
         {
           name: 'orderNo',
           label: '订单号',

+ 55 - 0
src/views/PeopleManage/Agent/AgentManage.vue

@@ -196,6 +196,18 @@
                   <el-input v-model="formData.referrerId" disabled></el-input>
                 </el-form-item>
               </el-col>
+              <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-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="领导人工号" prop="leaderName">
+                  <el-input v-model="formData.leaderId" disabled></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="离职时间" prop="logoutTime">
                   <el-date-picker
@@ -471,6 +483,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      leaderOptions: [],
       activeName: "1",
       isShow: true,
       //影像资料
@@ -506,6 +519,12 @@ export default {
           type: "select",
           options: JSON.parse(localStorage.getItem("user_statusoptions")),
         },
+        {
+          label: "领导人",
+          prop: "leaderId",
+          type: "select",
+          options: [],
+        },
       ],
       btnGroup: [
         {
@@ -621,8 +640,24 @@ export default {
     // this.getDictItems("sex");
     // this.getDictItems("user_status");
     this.findPage();
+    this.searchLeaderFun()
   },
   methods: {
+    searchLeaderFun() {
+      this.$api.user
+        .findBackListByDeptId({ deptId: this.deptId })
+        .then((res) => {
+          res.data.forEach(e=>{
+            e.value= e.id
+            e.label= e.name
+          })
+          this.formList.forEach(val=>{
+            if(val.prop=="leaderId"){
+              val.options=res.data;
+            }
+          })
+        });
+    },
     //状态改变时
     statusChange(e) {
       if (e == 0) {
@@ -675,6 +710,7 @@ export default {
       this.deptId = this.currentTreeNode.id;
       this.pageData.pageNum = 1;
       this.findPage();
+      this.searchLeaderFun()
       // this.formData.deptId = [];
       // this.platform(treeId);
     },
@@ -690,12 +726,18 @@ export default {
     handleChange(val) {
       if (val && val.length !== 0) {
         this.formData.referrerId = "";
+        this.formData.leaderId = "";
         this.formData.deptId = val.at(-1);
         this.$api.user
           .selectfindByreferrerId({ deptId: this.formData.deptId })
           .then((res) => {
             this.recommenderOptions = res.data;
           });
+          this.$api.user
+          .findListByDeptId({ deptId: this.formData.deptId, })
+          .then((res) => {
+            this.leaderOptions = res.data;
+          });
       }
     },
     // 右侧列表的方法Start
@@ -754,6 +796,11 @@ export default {
       this.activeName = "1";
       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 })
+          .then((res) => {
+            this.leaderOptions = res.data;
+          });
         this.$api.user
           .selectfindByreferrerId({ deptId: res.data.sysUser.deptId })
           .then((res) => {
@@ -811,6 +858,11 @@ export default {
         .then((res) => {
           this.recommenderOptions = res.data;
         });
+        this.$api.user
+        .findListByDeptId({ deptId: this.formData.deptId })
+        .then((res) => {
+          this.leaderOptions = res.data;
+        });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
@@ -859,6 +911,9 @@ export default {
             if(this.formData.positionId){
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
               }
+              if (this.formData.leaderId) {
+                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
+              }
             if (this.dialogTitle == "新增代理人") {
               if (!this.formDataDetail.password) {
                 this.formDataDetail.password =

+ 1 - 1
src/views/PeopleManage/Staff/StaffManage.vue

@@ -54,7 +54,7 @@
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="领导人">
-                    <el-select  style="width:215px" clearable filterable  v-model="pageData.leaderId" placeholder="请选择">
+                    <el-select size="small" style="width:215px" clearable filterable  v-model="pageData.leaderId" placeholder="请选择">
                       <el-option v-for="item in searchLeaderOptions" :key="item.id" :label="item.name" :value="item.name">
                       </el-option>
                     </el-select>

+ 53 - 1
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -86,6 +86,14 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="5">
+                  <el-form-item label="领导人">
+                    <el-select  size="small" style="width:215px" clearable filterable  v-model="pageData.leaderId" placeholder="请选择">
+                      <el-option v-for="item in searchLeaderOptions" :key="item.id" :label="item.name" :value="item.name">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="4">
                   <el-form-item label="">
                     <el-button
@@ -236,6 +244,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <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-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="领导人工号" prop="leaderName">
+                  <el-input v-model="formData.leaderId" disabled></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="离职时间" prop="logoutTime">
                   <el-date-picker
@@ -485,6 +505,8 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      leaderOptions: [],
+      searchLeaderOptions: {},
       activeName: "1",
       isShow: true,
       pageData: {
@@ -580,8 +602,17 @@ export default {
     };
   },
   created() {
+    this.searchLeaderFun()
   },
   methods: {
+   
+    searchLeaderFun() {
+      this.$api.user
+        .findBackListByDeptId({ deptId: this.deptId })
+        .then((res) => {
+          this.searchLeaderOptions = res.data;
+        });
+    },
     managementSourceFormatter(row){
       const managementSource=row.managementSource=='2'?"个代":"渠道"
       return managementSource;
@@ -611,13 +642,21 @@ export default {
       this.deptId = this.currentTreeNode.id;
       this.pageData.pageNum = 1;
       this.findPage();
+      this.searchLeaderFun()
       // this.formData.deptId = [];
       // this.platform(treeId);
     },
     //联级选择器触发事件
     handleChange(val) {
-      if (val.length !== 0) {
+      if (val && val.length !== 0) {
+        this.formData.leaderId = "";
         this.formData.deptId = val.at(-1);
+        console.log( this.formData.deptId,val,222222222);
+        this.$api.user
+          .findListByDeptId({ deptId: this.formData.deptId, })
+          .then((res) => {
+            this.leaderOptions = res.data;
+          });
       }
     },
     isShowFun() {
@@ -736,6 +775,11 @@ export default {
       this.activeName = "1";
       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 })
+          .then((res) => {
+            this.leaderOptions = res.data;
+          });
         res.data.sysUser.status += "";
         this.formData = res.data.sysUser;
         if (this.formData.status == 0) {
@@ -773,6 +817,11 @@ export default {
     },
     //添加人员
     handleAddButton() {
+      this.$api.user
+        .findListByDeptId({ deptId: this.formData.deptId })
+        .then((res) => {
+          this.leaderOptions = res.data;
+        });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
@@ -852,6 +901,9 @@ export default {
             if(this.formData.positionId){
                 this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
               }
+              if (this.formData.leaderId) {
+                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
+              }
             if (this.dialogTitle == "新增团队长") {
               this.$api.user
                 .saveUserInfo({