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

src/views/BindUser/Dx.vue

@@ -70,7 +70,6 @@
 
           <kt-common-table
             ref="ktcommonTable"
-            permsEdit="sys:backline:edit"
             :data="pageResult"
             :columns="columns"
             editButtonName="绑定人员"
@@ -78,6 +77,7 @@
             @handleEdit="handleTableEdit"
             :button7Name="'清空'"
             @handleButton7="handleTableDeleteFlag"
+            @findPage="findPage"
           >
           </kt-common-table>
         </SplitArea>
@@ -123,7 +123,7 @@
           <el-table-column prop="mobile" label="电话">
           </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="refreshPageRequest"
+      <el-pagination @size-change="handleSizeChangeAdd" @current-change="refreshPageRequestAdd"
           :current-page="addListDataPage.pageNum" :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
           :page-size="addListDataPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
           :total="addListDataPage.total">
@@ -166,10 +166,10 @@ export default {
       userId: "",
       pageData: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 10,
         deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
         userId: "",
-        realName: "",
+        name: "",
         mobile: "",
         status:"1"
       },
@@ -182,7 +182,8 @@ export default {
       teamleaderid: "",
       // 右侧列表查询数据Start
       queryFrom: {},
-      pageResult: {},
+      pageResult: {
+      },
       containsSubDeptChecked: true, //是否包含下级机构
       columns: [
         // 数据列
@@ -200,7 +201,8 @@ export default {
       deptInfo: {}, //选中机构的基本信息
       option: [], //机构列表
       showOut: false,
-      isRadioMode: true
+      isRadioMode: true,
+      isQueryStaff :false,
     };
   },
   created() {
@@ -250,8 +252,8 @@ export default {
           content: res.data.content,
           pageNum: res.data.current,
           pageSize: res.data.size,
-          totalPages: res.data.pages,
-          totalSize: res.data.total,
+          totalPages: res.data.totalPages,
+          totalSize: res.data.totalSize,
         };
       });
     },
@@ -300,7 +302,7 @@ export default {
       //调用添加接口
       this.$api.bindUser.addOrUpdateDx({
         userId:  this.userId,
-        linkUserId: this.selectedRow[0].id,
+        linkUserId: this.selectedRow[0].name,
       }).then((res) => {
         if (res.code == 200) {
               this.$message({
@@ -342,11 +344,11 @@ export default {
         return 'hideCheckbox'
       }
     },
-    refreshPageRequest: function (pageNum) {
+    refreshPageRequestAdd: function (pageNum) {
       this.addListDataPage.pageNum = pageNum;
       this.handleAddButton()
     },
-    handleSizeChange(pageSize) {
+    handleSizeChangeAdd(pageSize) {
       this.addListDataPage.pageSize = pageSize;
       this.handleAddButton()
     },

src/views/BindUser/Zgd.vue

@@ -70,7 +70,6 @@
 
           <kt-common-table
             ref="ktcommonTable"
-            permsEdit="sys:backline:edit"
             :data="pageResult"
             :columns="columns"
             editButtonName="绑定人员"
@@ -78,6 +77,7 @@
             @handleEdit="handleTableEdit"
             :button7Name="'清空'"
             @handleButton7="handleTableDeleteFlag"
+            @findPage="findPage"
           >
           </kt-common-table>
         </SplitArea>
@@ -123,7 +123,7 @@
           <el-table-column prop="phoneNumber" label="电话">
           </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="refreshPageRequest"
+      <el-pagination @size-change="handleSizeChangeAdd" @current-change="refreshPageRequestAdd"
           :current-page="addListDataPage.pageNum" :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
           :page-size="addListDataPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
           :total="addListDataPage.total">
@@ -166,10 +166,10 @@ export default {
       userId: "",
       pageData: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 10,
         deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
         userId: "",
-        realName: "",
+        name: "",
         mobile: "",
         status:"1"
       },
@@ -182,7 +182,8 @@ export default {
       teamleaderid: "",
       // 右侧列表查询数据Start
       queryFrom: {},
-      pageResult: {},
+      pageResult: {
+      },
       containsSubDeptChecked: true, //是否包含下级机构
       columns: [
         // 数据列
@@ -200,7 +201,8 @@ export default {
       deptInfo: {}, //选中机构的基本信息
       option: [], //机构列表
       showOut: false,
-      isRadioMode: true
+      isRadioMode: true,
+      isQueryStaff :false,
     };
   },
   created() {
@@ -250,8 +252,8 @@ export default {
           content: res.data.content,
           pageNum: res.data.current,
           pageSize: res.data.size,
-          totalPages: res.data.pages,
-          totalSize: res.data.total,
+          totalPages: res.data.totalPages,
+          totalSize: res.data.totalSize,
         };
       });
     },
@@ -343,11 +345,11 @@ export default {
         return 'hideCheckbox'
       }
     },
-    refreshPageRequest: function (pageNum) {
+    refreshPageRequestAdd: function (pageNum) {
       this.addListDataPage.pageNum = pageNum;
       this.handleAddButton()
     },
-    handleSizeChange(pageSize) {
+    handleSizeChangeAdd(pageSize) {
       this.addListDataPage.pageSize = pageSize;
       this.handleAddButton()
     },

src/views/BindUser/Zzb.vue

@@ -70,7 +70,6 @@
 
           <kt-common-table
             ref="ktcommonTable"
-            permsEdit="sys:backline:edit"
             :data="pageResult"
             :columns="columns"
             editButtonName="绑定人员"
@@ -78,6 +77,7 @@
             @handleEdit="handleTableEdit"
             :button7Name="'清空'"
             @handleButton7="handleTableDeleteFlag"
+            @findPage="findPage"
           >
           </kt-common-table>
         </SplitArea>
@@ -123,7 +123,7 @@
           <el-table-column prop="phoneNumber" label="电话">
           </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="refreshPageRequest"
+      <el-pagination @size-change="handleSizeChangeAdd" @current-change="refreshPageRequestAdd"
           :current-page="addListDataPage.pageNum" :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
           :page-size="addListDataPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
           :total="addListDataPage.total">
@@ -166,10 +166,10 @@ export default {
       userId: "",
       pageData: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 10,
         deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
         userId: "",
-        realName: "",
+        name: "",
         mobile: "",
         status:"1"
       },
@@ -182,7 +182,8 @@ export default {
       teamleaderid: "",
       // 右侧列表查询数据Start
       queryFrom: {},
-      pageResult: {},
+      pageResult: {
+      },
       containsSubDeptChecked: true, //是否包含下级机构
       columns: [
         // 数据列
@@ -200,7 +201,8 @@ export default {
       deptInfo: {}, //选中机构的基本信息
       option: [], //机构列表
       showOut: false,
-      isRadioMode: true
+      isRadioMode: true,
+      isQueryStaff :false,
     };
   },
   created() {
@@ -229,6 +231,7 @@ export default {
     findPage(data) {
       // 获取分页数据
       if (data && data.pageRequest) {
+        console.log(data);
         this.pageData.pageNum = data.pageRequest.pageNum;
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
@@ -246,12 +249,14 @@ export default {
       };
      
       this.$api.bindUser.queryUserZZBPage(dto).then((res) => {
+        console.log(res.data.totalSize);
+        console.log(res.data.totalPages);
         this.pageResult = {
           content: res.data.content,
           pageNum: res.data.current,
           pageSize: res.data.size,
-          totalPages: res.data.pages,
-          totalSize: res.data.total,
+          totalPages: res.data.totalPages,
+          totalSize: res.data.totalSize,
         };
       });
     },
@@ -342,11 +347,11 @@ export default {
         return 'hideCheckbox'
       }
     },
-    refreshPageRequest: function (pageNum) {
+    refreshPageRequestAdd: function (pageNum) {
       this.addListDataPage.pageNum = pageNum;
       this.handleAddButton()
     },
-    handleSizeChange(pageSize) {
+    handleSizeChangeAdd(pageSize) {
       this.addListDataPage.pageSize = pageSize;
       this.handleAddButton()
     },

src/views/BindUser/mixin.js

@@ -5,148 +5,6 @@ export default (params) => { // 导出混入对象
   return {
     data() {
       return {
-        nationalList: [
-          "汉族",
-          "壮族",
-          "满族",
-          "回族",
-          "苗族",
-          "维吾尔族",
-          "土家族",
-          "彝族",
-          "蒙古族",
-          "藏族",
-          "布依族",
-          "侗族",
-          "瑶族",
-          "朝鲜族",
-          "白族",
-          "哈尼族",
-          "哈萨克族",
-          "黎族",
-          "傣族",
-          "畲族",
-          "傈僳族",
-          "仡佬族",
-          "东乡族",
-          "高山族",
-          "拉祜族",
-          "水族",
-          "佤族",
-          "纳西族",
-          "羌族",
-          "土族",
-          "仫佬族",
-          "锡伯族",
-          "柯尔克孜族",
-          "达斡尔族",
-          "景颇族",
-          "毛南族",
-          "撒拉族",
-          "布朗族",
-          "塔吉克族",
-          "阿昌族",
-          "普米族",
-          "鄂温克族",
-          "怒族",
-          "京族",
-          "基诺族",
-          "德昂族",
-          "保安族",
-          "俄罗斯族",
-          "裕固族",
-          "乌兹别克族",
-          "门巴族",
-          "鄂伦春族",
-          "独龙族",
-          "塔塔尔族",
-          "赫哲族",
-          "珞巴族",
-        ],
-        sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-        postOption: [],
-        bloodOption: [
-          {
-            label: 'A型',
-            value: 'A型'
-          }, {
-            label: 'B型',
-            value: 'B型'
-          }, {
-            label: 'O型',
-            value: 'O型'
-          }, {
-            label: 'AB型',
-            value: 'AB型'
-          },
-        ],
-        educationOption: [
-          {
-            label: '小学',
-            value: '小学'
-          }, {
-            label: '初中',
-            value: '初中'
-          }, {
-            label: '高中',
-            value: '高中'
-          }, {
-            label: '专科',
-            value: '专科'
-          }, {
-            label: '本科',
-            value: '本科'
-          }, {
-            label: '硕士',
-            value: '硕士'
-          }, {
-            label: '博士',
-            value: '博士'
-          },
-        ],
-        healthOption: [
-          {
-            label: '健康',
-            value: '健康'
-          }, {
-            label: '亚健康',
-            value: '亚健康'
-          }, {
-            label: '疾病',
-            value: '疾病'
-          },
-        ],
-        politicsStatusOption: [
-          {
-            label: '群众',
-            value: '群众'
-          }, {
-            label: '共青团员',
-            value: '共青团员'
-          }, {
-            label: '中共党员',
-            value: '中共党员'
-          },
-        ],
-        maritalStatusOption: [
-          {
-            label: '未婚',
-            value: '未婚'
-          }, {
-            label: '已婚',
-            value: '已婚'
-          }, {
-            label: '离异',
-            value: '离异'
-          }, {
-            label: '再婚',
-            value: '再婚'
-          },
-        ],
-        user_statusoptions: JSON.parse(
-          localStorage.getItem("user_statusoptions")
-        ),
-        roles: JSON.parse(localStorage.getItem("find_all")),
         /**Split 开始 */
         ztreeNodes: [],
         leftSplitWidth: 20,
@@ -171,12 +29,6 @@ export default (params) => { // 导出混入对象
       }
     },
     created() {
-      this.$api.role.postViewAll().then((res) => {
-        res.data.forEach(ele => {
-          ele.postId = ele.postId + ''
-        })
-        this.postOption = res.data
-      })
       this.findLeftTreeData(); // 获取机构树的数据
 
     },