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

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -483,6 +483,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       searchLeaderOptions: {},
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -672,7 +673,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Agent/AgentManage.vue

@@ -451,6 +451,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showOut: false, // 离司
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
@@ -612,7 +613,7 @@ export default {
         pageSize: 10,
         totalSize: 0,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "20",
       },

src/views/PeopleManage/Player/PerformanceManage.vue

@@ -185,7 +185,8 @@ export default {
           showIcon: false,
         },
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      deptId: "99",
       ztreeNodes: [],
       currentTreeNode: null,
       title: "详情",

src/views/PeopleManage/Player/PlayerExamine.vue

@@ -506,6 +506,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       searchLeaderOptions: {},
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -708,7 +709,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Player/PlayerExamineTeam.vue

@@ -472,6 +472,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       activeName: "1",
       pageData: {
@@ -686,7 +687,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Player/PlayerManage.vue

@@ -466,6 +466,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showOut: false, // 离司
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
@@ -614,7 +615,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "19",
       },

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -422,6 +422,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -575,7 +576,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "21",
       },

src/views/PeopleManage/Sales/SalesExamine.vue

@@ -503,6 +503,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -722,7 +723,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Sales/SalesExamineGroup.vue

@@ -503,6 +503,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -718,7 +719,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Sales/SalesManage.vue

@@ -552,6 +552,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片

src/views/PeopleManage/Sales/SalesManageGroup.vue

@@ -552,6 +552,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -458,6 +458,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       activeName: "1",
       //56个民族
@@ -665,7 +666,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Staff/StaffManage.vue

@@ -517,6 +517,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
       logoutImgId: "",

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -457,6 +457,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       //影像资料
       dataForm: {
@@ -648,7 +649,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -516,6 +516,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
       logoutImgId: "",

src/views/Task/DaikeLetter.vue

@@ -137,10 +137,17 @@
         highlight-current-row
         @row-dblclick="reslistCurrentChange"
       >
+        <el-table-column prop="twoDeptName" label="二级机构" align="center"></el-table-column>
+        <el-table-column prop="threeDeptName" label="三级机构" align="center"></el-table-column>
+        <el-table-column prop="fourDeptName" label="四级机构" align="center"></el-table-column>
+        <el-table-column prop="fiveDeptName" label="五级机构" align="center"></el-table-column>
         <el-table-column prop="userId" label="工号" align="center" ></el-table-column>
         <el-table-column prop="name" label="	业务员名称" align="center" ></el-table-column>
         <el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
         <el-table-column prop="identity" label="身份证号" align="center"></el-table-column>
+        <el-table-column prop="weChatAuthenticationFlag" label="是否微信认证" align="center"></el-table-column>
+        <el-table-column prop="alipayCertificationFlag" label="是否支付宝认证" align="center"></el-table-column>
+        <el-table-column prop="bindBankNumberFlag" label="是否绑定银行卡信息" align="center"></el-table-column>
       </el-table>
     </el-dialog>
   </div>