fix: 修改添加成员默认部门

e0ea9c0e · 无尘 · 9d0d229c · e0ea9c0e · e0ea9c0e · 9d0d229c
Commit e0ea9c0e authored Mar 05, 2020 by 无尘
14 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.b04d67425bbe96cf3b0ef150ecd47b4e.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.a9cf0b1563b532649b99.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.dfc3e326836812c3a8f9.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.c57c589f87c29cdf4cd112e83a28cdc8.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.e6fb823410d27c9a0f48.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.dfc3e326836812c3a8f9.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.b04d67425bbe96cf3b0ef150ecd47b4e.css
+++ b/dist/static/css/app.b04d67425bbe96cf3b0ef150ecd47b4e.css
--- a/dist/static/js/3.7c207d69ec5bb0b804a3.js
+++ b/dist/static/js/3.7c207d69ec5bb0b804a3.js
--- a/dist/static/js/3.af11de17319ed679fab7.js
+++ b/dist/static/js/3.af11de17319ed679fab7.js
--- a/dist/static/js/5.0da955c9fa041d847549.js
+++ b/dist/static/js/5.0da955c9fa041d847549.js
--- a/dist/static/js/5.2219f2c412ac776ee557.js
+++ b/dist/static/js/5.2219f2c412ac776ee557.js
--- a/dist/static/js/9.24b60dcd1aeb52838879.js
+++ b/dist/static/js/9.24b60dcd1aeb52838879.js
--- a/dist/static/js/manifest.a9cf0b1563b532649b99.js
+++ b/dist/static/js/manifest.a9cf0b1563b532649b99.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={51:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"a88e69cb3f40a09cc852",1:"fe9dec1f31b04053fd7e",2:"12de26f2bb2843b833c3",3:"7c207d69ec5bb0b804a3",4:"30834c96bb9b0077ac40",5:"2219f2c412ac776ee557",6:"676a85c86856ae416c4a",7:"70126efa17de250e8ce6",8:"5e787f5eb2f4bd7cfb7b",9:"24b60dcd1aeb52838879",10:"5a01d23b4652e1814841",11:"358e5934501944eb1f07",12:"b0056c2edf125a389754",13:"3f70345d9260ae04ca59",14:"e5ce7f9d34ad7a77d61f",15:"e780a9302ed89095559c",16:"54e986018dfd2a2e625c",17:"d989413fbdeefb6eb96a",18:"92515663b826f840c422",19:"8b94ea26eb72d7923a08",20:"b3943188c4a0ea6a0bfa",21:"4f7009e36679f7ba6e0d",22:"9e9f2633a52ac4144395",23:"ede27e63ced8a92ab645",24:"60d42c953fd179617b16",25:"ec3a0e5804e399897754",26:"161e48f124bffd6210b1",27:"d9bc2e42a9916006c06a",28:"c73366d4dd88740471c2",29:"9a8a4580e68abe70067b",30:"228a3b991afd830e5824",31:"173a8de29e234a01b5b5",32:"a65d90dc117e6749f106",33:"af03022c94f58809aa77",34:"af72b3c28662a01355c9",35:"8c4d92df9636e2c2e74d",36:"e86539c9400400aeca81",37:"3eb2391aa9beccbe9ff0",38:"530351b3a274a66fe279",39:"73aa34afc46dacb61e9c",40:"f4c33764b5a2a1b1267a",41:"de2058f68d9f54de7db4",42:"090e12fc342f36516246",43:"c87d0f618632e6a1be0c",44:"7cad90fc7e9c2b655b2c",45:"f07b2ac63f2a7cb86072",46:"4cf7eeaa722092397c88",47:"3122f35f8abaa69e82cb",48:"97204bd2fd532b0f15c7"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={51:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"a88e69cb3f40a09cc852",1:"fe9dec1f31b04053fd7e",2:"12de26f2bb2843b833c3",3:"af11de17319ed679fab7",4:"30834c96bb9b0077ac40",5:"0da955c9fa041d847549",6:"676a85c86856ae416c4a",7:"70126efa17de250e8ce6",8:"5e787f5eb2f4bd7cfb7b",9:"7f5286e668263312e53a",10:"5a01d23b4652e1814841",11:"358e5934501944eb1f07",12:"b0056c2edf125a389754",13:"3f70345d9260ae04ca59",14:"e5ce7f9d34ad7a77d61f",15:"e780a9302ed89095559c",16:"54e986018dfd2a2e625c",17:"d989413fbdeefb6eb96a",18:"92515663b826f840c422",19:"8b94ea26eb72d7923a08",20:"b3943188c4a0ea6a0bfa",21:"4f7009e36679f7ba6e0d",22:"9e9f2633a52ac4144395",23:"ede27e63ced8a92ab645",24:"60d42c953fd179617b16",25:"ec3a0e5804e399897754",26:"161e48f124bffd6210b1",27:"d9bc2e42a9916006c06a",28:"c73366d4dd88740471c2",29:"9a8a4580e68abe70067b",30:"228a3b991afd830e5824",31:"173a8de29e234a01b5b5",32:"a65d90dc117e6749f106",33:"af03022c94f58809aa77",34:"af72b3c28662a01355c9",35:"8c4d92df9636e2c2e74d",36:"e86539c9400400aeca81",37:"3eb2391aa9beccbe9ff0",38:"530351b3a274a66fe279",39:"73aa34afc46dacb61e9c",40:"f4c33764b5a2a1b1267a",41:"de2058f68d9f54de7db4",42:"090e12fc342f36516246",43:"c87d0f618632e6a1be0c",44:"7cad90fc7e9c2b655b2c",45:"f07b2ac63f2a7cb86072",46:"4cf7eeaa722092397c88",47:"3122f35f8abaa69e82cb",48:"97204bd2fd532b0f15c7"}[e]+".js";var d=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/common/gic-select-group.vue
+++ b/src/components/common/gic-select-group.vue
--- a/src/components/company/add-member.vue
+++ b/src/components/company/add-member.vue
@@ -2,8 +2,8 @@
 * @Descripttion : 当前组件信息
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-28 17:40:45
+ * @LastEditTime: 2020-03-05 09:57:31
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-member.vue
 -->
 <!--
@@ -76,6 +76,12 @@ export default {
      default() {
        return {};
      }
+    },
+    defaultDepart: {
+      type: [Object, Array],
+      default() {
+        return [];
+      }
    }
  },
  data() {
@@ -193,10 +199,6 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            showMsg.showmsg('邀请成功', 'success');
-            that.multipleSelection = [];
-            that.currentPage = 1;
-            that.getTableList();
-            // 是否需要更新左侧 tree
            return false;
          }
          errMsg.errorMsg(resData);
@@ -293,7 +295,10 @@ export default {
      const that = this;
      if (Object.keys(newData).length) {
        that.partForm = newData;
+        that.partForm.departmentList = [];
        that.getData();
+      } else {
+        that.partForm.departmentList = that.defaultDepart || [];
      }
    }
  },
@@ -301,7 +306,10 @@ export default {
    const that = this;
    if (Object.keys(that.memberObj).length) {
      that.partForm = that.memberObj;
+      that.partForm.departmentList = [];
      that.getData();
+    } else {
+      that.partForm.departmentList = that.defaultDepart || [];
    }
  }
 };

--- a/src/components/company/depart-member.vue
+++ b/src/components/company/depart-member.vue
@@ -2,8 +2,8 @@
 * @Descripttion : 当前组件信息
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:40
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-27 21:14:25
+ * @LastEditTime: 2020-03-05 09:47:28
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\depart-member.vue
 -->
 <!--
@@ -53,7 +53,7 @@
        </div>
      </div>
    </div>
-    <add-member v-if="memberVisible" :memberObj="memberObj" @refreshData="refreshData"></add-member>
+    <add-member v-if="memberVisible" :defaultDepart="defaultDepart" :memberObj="memberObj" @refreshData="refreshData"></add-member>
    <mod-depart v-if="modVisible" :selectObj="multipleSelection" @modDepartData="modDepartData"></mod-depart>
  </div>
 </template>
@@ -113,6 +113,7 @@ export default {
      // 新增
      memberVisible: false,
      memberObj: {},
+      defaultDepart: [],
      multipleSelection: [], //勾选数据
      // 调整部门
      modVisible: false
@@ -251,6 +252,8 @@ export default {
     */
    addMember() {
      const that = this;
+      // 默认当前部门
+      that.defaultDepart = [that.departObj];
      that.memberVisible = true;
      that.memberObj = {};
    },

--- a/src/components/company/select-department.vue
+++ b/src/components/company/select-department.vue
@@ -3,8 +3,8 @@
 * @version: 1.0.0
 * @Author: 无尘
 * @Date: 2020-02-08 10:27:21
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-28 16:43:15
+ * @LastEditTime: 2020-03-05 09:48:54
 -->
 <!--
  添加成员选择部门组件：
@@ -26,7 +26,7 @@
      <el-input placeholder="请输入内容" v-model="searchSelect" style="width: 100%;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
    </div>
    <div class="select-tree-wrap m-t-10">
-      <el-tree :filter-node-method="filterNode" clearable :data="groupData" :load="loadNode" node-key="departmentId" ref="groupTree" check-strictly lazy show-checkbox default-expand-all :props="defaultProps" :expand-on-click-node="false" @check="checkGroup">
+      <el-tree :filter-node-method="filterNode" clearable :data="groupData" :load="loadNode" :default-checked-keys="checkedKeys" node-key="departmentId" ref="groupTree" check-strictly lazy show-checkbox default-expand-all :props="defaultProps" :expand-on-click-node="false" @check="checkGroup">
        <span class="custom-tree-node" slot-scope="{ node, data }">
          <span :class="['font-14 p-r-10 iconfont', data.isStore == 1 ? 'icondianpu-kuai' : 'iconqiye-tianchong', data.bindFlag == 1 ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ node.label }}</span>
        </span>
@@ -83,7 +83,8 @@ export default {
      defaultProps: {
        children: 'children',
        label: 'departmentName'
-      }
+      },
+      checkedKeys: this.selectData.length ? this.selectData.map(ele => ele.departmentId) : []
    };
  },
@@ -256,6 +257,10 @@ export default {
  },
  mounted() {
    const that = this;
+    console.log(that.selectData);
+    if (!!that.selectData.length) {
+      that.groupIds = that.selectData;
+    }
    that.getGroup();
  }
 };

--- a/src/components/company/store-member.vue
+++ b/src/components/company/store-member.vue
@@ -2,8 +2,8 @@
 * @Descripttion : 当前组件信息
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:40
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-27 21:14:39
+ * @LastEditTime: 2020-03-05 09:50:33
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\store-member.vue
 -->
 <!--
@@ -67,7 +67,7 @@
        </div>
      </div>
    </div>
-    <add-member v-if="memberVisible" :memberObj="memberObj" @refreshData="refreshData"></add-member>
+    <add-member v-if="memberVisible" :defaultDepart="defaultDepart" :memberObj="memberObj" @refreshData="refreshData"></add-member>
    <mod-depart v-if="modVisible" :selectObj="multipleSelection" @modDepartData="modDepartData"></mod-depart>
  </div>
 </template>
@@ -127,6 +127,7 @@ export default {
      // 新增
      memberVisible: false,
      memberObj: {},
+      defaultDepart: [],
      multipleSelection: [], //勾选数据
      // 调整部门
      modVisible: false
@@ -334,6 +335,8 @@ export default {
     */
    addMember() {
      const that = this;
+      // 默认当前部门
+      that.defaultDepart = [that.departObj];
      that.memberVisible = true;
      that.memberObj = {};
    },

--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,8 +3,8 @@
 * @version: 1.0.0
 * @Author: 无尘
 * @Date: 2018-10-10 14:44:45
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-26 19:11:31
+ * @LastEditTime: 2020-03-05 09:22:25
 -->
 <template>
  <div class="login-wrap">