Selaa lähdekoodia

人员管理添加推荐人字段、审核状态去掉在职和离职选项

lihongxiao 1 vuosi sitten
vanhempi
commit
c619d0fae6

+ 2 - 2
config/dev.env.js

@@ -10,14 +10,14 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"', //凯森
   // BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
-  BASE_URL: '"http://192.168.0.253:8080/"',//田智
+  // BASE_URL: '"http://192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // 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.250:8080/"',//
   //  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
-  // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
+  BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
   // BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   CONSOLE_KHGX_URL: '"http://192.168.0.103:8081/login"', //跳转客户服务平台地址

+ 4 - 2
src/views/PeopleManage/Agent/AgentExamine.vue

@@ -680,7 +680,8 @@ export default {
         status: this.pageData.status,
         leaderName: this.queryFrom.leaderId,
         roleId: "20",
-        agentFlag: "2"
+        agentFlag: "2",
+        examine:1,
       };
       this.$api.user
         // .findPage({
@@ -722,7 +723,8 @@ export default {
       this.$api.dict
         .findByLableName(typeName)
         .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+          let arr=response.data.filter(e=>(e.value!=='0' &&  e.value!=='1'))
+          this[typeName + "options"] = arr; // 把获取到的数据赋给this.data
         })
         .catch((error) => {
           this[typeName + "options"] = [];

+ 3 - 1
src/views/PeopleManage/Player/PlayerExamineTeam.vue

@@ -604,7 +604,8 @@ export default {
       this.$api.dict
         .findByLableName(typeName)
         .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+          let arr=response.data.filter(e=>(e.value!=='0' &&  e.value!=='1'))
+          this[typeName + "options"] = arr; // 把获取到的数据赋给this.data
         })
         .catch((error) => {
           this[typeName + "options"] = [];
@@ -696,6 +697,7 @@ export default {
         leaderName: this.queryFrom.leaderId,
         agentFlag: "1",
         roleId: "21",
+        examine:1,
       };
       this.$api.user
         .findUserList({

+ 35 - 1
src/views/PeopleManage/Staff/StaffExamine.vue

@@ -311,6 +311,22 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人" prop="referrerName">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formData.referrerName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人工号" prop="referrerId">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formData.referrerId"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div  class="footerHandle" style="text-align: right">
@@ -516,6 +532,11 @@ export default {
           isSex: true
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
+        {
+          prop: "type",
+          label: "类型",
+          formatter:this.typeFormatter
+        },
         {
           prop: "roleId",
           label: "角色",
@@ -528,6 +549,14 @@ export default {
           type: "text",
           minWidth: 100,
         },
+        {
+          prop: "referrerName",
+          label: "推荐人",
+        }, {
+          prop: "referrerId",
+          label: "推荐人工号",
+          minWidth: 100,
+        },
         {
           prop: "approveTime",
           label: "审核时间",
@@ -590,6 +619,9 @@ export default {
         }
       });
     },
+    typeFormatter(row) {
+      return row.type==1?'合伙人':row.type==2?'工作室':'普通用户'
+    },
     closeDialogOut() {
       this.showRemark = false;
     },
@@ -674,6 +706,7 @@ export default {
         leaderName: this.pageData.leaderId,
         agentFlag: 0,
         roleId: "22",
+        examine:1,
         pageNum: this.pageData.pageNum,
         pageSize: this.pageData.pageSize,
       };
@@ -735,7 +768,8 @@ export default {
       this.$api.dict
         .findByLableName(typeName)
         .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+          let arr=response.data.filter(e=>(e.value!=='0' &&  e.value!=='1'))
+          this[typeName + "options"] = arr; // 把获取到的数据赋给this.data
         })
         .catch((error) => {
           this[typeName + "options"] = [];

+ 15 - 4
src/views/PeopleManage/Staff/StaffManage.vue

@@ -601,6 +601,11 @@ export default {
           isSex: true,
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
+        {
+          prop: "type",
+          label: "类型",
+          formatter:this.typeFormatter
+        },
         {
           prop: "roleId",
           label: "角色",
@@ -612,6 +617,14 @@ export default {
           label: "岗位",
           minWidth: 120,
         },
+        {
+          prop: "referrerName",
+          label: "推荐人",
+        }, {
+          prop: "referrerId",
+          label: "推荐人工号",
+          minWidth: 100,
+        },
         {
           prop: "submitTime",
           label: "提交时间",
@@ -815,10 +828,8 @@ export default {
       this.isQueryStaff = true;
       this.findPage();
     },
-    sexFormatter(row) {
-      // return this.sexoptions[row.sex]
-      // return row.sex+'1'
-      // console.log(val,1)
+    typeFormatter(row) {
+      return row.type==1?'合伙人':row.type==2?'工作室':'普通用户'
     },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件

+ 27 - 1
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -311,6 +311,22 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人" prop="referrerName">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formData.referrerName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人工号" prop="referrerId">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formData.referrerId"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div class="footerHandle" style="text-align: right">
@@ -527,6 +543,14 @@ export default {
           type: "text",
           minWidth: 100,
         },
+        {
+          prop: "referrerName",
+          label: "推荐人",
+        }, {
+          prop: "referrerId",
+          label: "推荐人工号",
+          minWidth: 100,
+        },
         {
           prop: "approveTime",
           label: "审核时间",
@@ -657,6 +681,7 @@ export default {
         leaderName: this.queryFrom.leaderId,
         agentFlag: "2",
         roleId: "21",
+        examine:1
       };
       this.$api.user
         // .findPage({
@@ -706,7 +731,8 @@ export default {
       this.$api.dict
         .findByLableName(typeName)
         .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+          let arr=response.data.filter(e=>(e.value!=='0' &&  e.value!=='1'))
+          this[typeName + "options"] = arr; // 把获取到的数据赋给this.data
         })
         .catch((error) => {
           this[typeName + "options"] = [];

+ 8 - 0
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -608,6 +608,14 @@ export default {
           type: "text",
           minWidth: 100,
         },
+        {
+          prop: "referrerName",
+          label: "推荐人",
+        }, {
+          prop: "referrerId",
+          label: "推荐人工号",
+          minWidth: 100,
+        },
         {
           prop: "approveTime",
           label: "审核时间",