fix: 修改组织架构状态

2191cbd1 · 无尘 · 4dfa117b · 2191cbd1 · 4dfa117b · 2191cbd1
Commit 2191cbd1 authored Apr 14, 2020 by 无尘
12 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.28.css><link href=./static/css/app.15262fa56ced9d9b29e0d0c61d0602fb.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.5dd0a929970cb7fc5563.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.434458b8b99a8b7a4326.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.28.css><link href=./static/css/app.ff88d56b75c86cc041f42b20303e0526.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.4d12e2b4db8029c6dc3f.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.9f7749cd27c6e4876251.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.15262fa56ced9d9b29e0d0c61d0602fb.css
+++ b/dist/static/css/app.15262fa56ced9d9b29e0d0c61d0602fb.css
--- a/dist/static/css/app.ff88d56b75c86cc041f42b20303e0526.css
+++ b/dist/static/css/app.ff88d56b75c86cc041f42b20303e0526.css
--- a/dist/static/js/2.18e2a75903d8bf803840.js
+++ b/dist/static/js/2.18e2a75903d8bf803840.js
--- a/dist/static/js/2.62d761dff608db5d6f11.js
+++ b/dist/static/js/2.62d761dff608db5d6f11.js
--- a/dist/static/js/app.434458b8b99a8b7a4326.js
+++ b/dist/static/js/app.434458b8b99a8b7a4326.js
--- a/dist/static/js/app.9f7749cd27c6e4876251.js
+++ b/dist/static/js/app.9f7749cd27c6e4876251.js
--- a/dist/static/js/manifest.5dd0a929970cb7fc5563.js
+++ b/dist/static/js/manifest.5dd0a929970cb7fc5563.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={63:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"937e457e590c16cf534f",1:"06c4e42e62c1f75191f0",2:"18e2a75903d8bf803840",3:"7ac2e1c035738da79fbe",4:"5f936eb8d206fb69c117",5:"bf21cfa1832c94ed8d4c",6:"aadb949ab3bea612d805",7:"e7e90ccf15b4adeeb944",8:"f0aaea381f42e366fef6",9:"137db58ca2c95df58b06",10:"db882a097f8319f562cc",11:"0fa0133322188250d3c7",12:"59db86ef512a3a65e1ce",13:"ebba5b82c2826c9ba6e1",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"36f27d68f0c8268f26a7",17:"a315ec3bb42a1a5f0ab3",18:"aac9552544b8aaf4d59f",19:"5c01b5259828e3c1889f",20:"0f96177cb5fd1bb77419",21:"d3de2ecd37f4d39cc396",22:"51720c0f417d0769d604",23:"fcfcc69624fb3566c12f",24:"aa192ffeba0868f01959",25:"97a04658f628dc5e71ed",26:"8a50cce733d418f3c0e9",27:"627b44e864332d27c872",28:"7757024ddaf6e330e6f3",29:"d734549d6d2fd380b0ed",30:"982ba0cc111b49ebed95",31:"032c054ea5ca1ae95138",32:"c1c0d91f0f5cea383f92",33:"17b587ea836e40e85f6c",34:"fe5fa10071f728bce540",35:"58646980a26370faba20",36:"11a1a313d8ff29508d13",37:"4eb8995550564944b43d",38:"ac6e21ea5cd441ae16e1",39:"aaba1f49ea8d5a1de7a1",40:"5c88eb3d24b8c0c5c765",41:"754895d6e8968f855a79",42:"43bbedbec5d68a86dac1",43:"87c1782754b0b05f7608",44:"aa371b07acf3ccb8cf7b",45:"67d74a26606b9aaaaf36",46:"533788c46e1defe672d3",47:"12481e6bfc90de853c84",48:"31977b1cfef3f8807123",49:"15bc78cea887de215d32",50:"c2932bcd17cb7bb00ef7",51:"6ecd1c76f129643c28a8",52:"763413fcd4e918278c7c",53:"63a56532e0b00a60682a",54:"5953756da77aa423a0f0",55:"507e3a26f9dc9383df97",56:"9c4b8dca813872ab009e",57:"2924dfc4951df20d68f9",58:"948ebad0a0b9bdeb97c9",59:"657138e5fe73d98f9dbb",60:"697a90eb946d7a033d35"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={63:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"937e457e590c16cf534f",1:"06c4e42e62c1f75191f0",2:"62d761dff608db5d6f11",3:"7ac2e1c035738da79fbe",4:"5f936eb8d206fb69c117",5:"bf21cfa1832c94ed8d4c",6:"aadb949ab3bea612d805",7:"e7e90ccf15b4adeeb944",8:"f0aaea381f42e366fef6",9:"137db58ca2c95df58b06",10:"db882a097f8319f562cc",11:"0fa0133322188250d3c7",12:"59db86ef512a3a65e1ce",13:"ebba5b82c2826c9ba6e1",14:"2c29119d13dc5fff8f2b",15:"b646de33eca64e94b02c",16:"36f27d68f0c8268f26a7",17:"a315ec3bb42a1a5f0ab3",18:"aac9552544b8aaf4d59f",19:"5c01b5259828e3c1889f",20:"0f96177cb5fd1bb77419",21:"d3de2ecd37f4d39cc396",22:"51720c0f417d0769d604",23:"fcfcc69624fb3566c12f",24:"aa192ffeba0868f01959",25:"97a04658f628dc5e71ed",26:"8a50cce733d418f3c0e9",27:"627b44e864332d27c872",28:"7757024ddaf6e330e6f3",29:"d734549d6d2fd380b0ed",30:"982ba0cc111b49ebed95",31:"032c054ea5ca1ae95138",32:"c1c0d91f0f5cea383f92",33:"17b587ea836e40e85f6c",34:"fe5fa10071f728bce540",35:"58646980a26370faba20",36:"11a1a313d8ff29508d13",37:"4eb8995550564944b43d",38:"ac6e21ea5cd441ae16e1",39:"aaba1f49ea8d5a1de7a1",40:"5c88eb3d24b8c0c5c765",41:"754895d6e8968f855a79",42:"43bbedbec5d68a86dac1",43:"87c1782754b0b05f7608",44:"aa371b07acf3ccb8cf7b",45:"67d74a26606b9aaaaf36",46:"533788c46e1defe672d3",47:"12481e6bfc90de853c84",48:"31977b1cfef3f8807123",49:"15bc78cea887de215d32",50:"c2932bcd17cb7bb00ef7",51:"6ecd1c76f129643c28a8",52:"763413fcd4e918278c7c",53:"63a56532e0b00a60682a",54:"5953756da77aa423a0f0",55:"507e3a26f9dc9383df97",56:"9c4b8dca813872ab009e",57:"2924dfc4951df20d68f9",58:"948ebad0a0b9bdeb97c9",59:"657138e5fe73d98f9dbb",60:"697a90eb946d7a033d35"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/company/depart-list.vue
+++ b/src/components/company/depart-list.vue
@@ -3,7 +3,7 @@
 * @Author       : 无尘
 * @Date         : 2020-02-13 14:02:22
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-23 17:16:16
+ * @LastEditTime: 2020-04-14 13:56:32
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\depart-list.vue
 -->
 <!--
@@ -13,18 +13,25 @@
 <template>
  <div class="depart-list-body">
    <div class="depart-name-wrap m-b-20">
-      <div class="depart-name">
+      <div class="flex flex-space-between">
-        <span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span>
+        <div>
-        <el-popover v-if="!departObj.bindFlag" placement="top" style="min-width: 192px" v-model="nameVisible">
+          <div class="depart-name">
-          <limitInput :inputWidth="180" :inputValue.sync="departmentName" :holder="'请输入部门名称'" :getByType="'char'" :maxLength="32"> </limitInput>
+            <span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span>
-          <div style="text-align: right; margin: 12px 0 0 0">
+            <el-popover v-if="!departObj.bindFlag" placement="top" style="min-width: 192px" v-model="nameVisible">
-            <el-button size="mini" type="text" @click="cancelMod">取消</el-button>
+              <limitInput :inputWidth="180" :inputValue.sync="departmentName" :holder="'请输入部门名称'" :getByType="'char'" :maxLength="32"> </limitInput>
-            <el-button type="primary" size="mini" @click="toMod">确定</el-button>
+              <div style="text-align: right; margin: 12px 0 0 0">
+                <el-button size="mini" type="text" @click="cancelMod">取消</el-button>
+                <el-button type="primary" size="mini" @click="toMod">确定</el-button>
+              </div>
+              <span slot="reference"><span class="cursor-pointer iconfont iconchangyongicon- color-909399"></span></span>
+            </el-popover>
          </div>
-          <span slot="reference"><span class="cursor-pointer iconfont iconchangyongicon- color-909399"></span></span>
+          <div class="depart-id font-12 color-909399">ID：{{ departObj.departmentId }}</div>
-        </el-popover>
+        </div>
+        <div class="to-log">
+          <div class="to-log-btn font-12 color-2f54eb" @click="toShowTip">查看帮助提示</div>
+        </div>
      </div>
-      <div class="depart-id font-12 color-909399">ID：{{ departObj.departmentId }}</div>
    </div>
    <div class="depart-children-list border-box m-t-18">
      <div class="depart-children-title"><span class="iconfont iconbumen color-303133"></span><span class="font-16 color-303133 font-w-600 p-l-5">下级部门</span></div>
@@ -67,9 +74,11 @@
        <el-button type="primary" @click="submitForm('form')">确定</el-button>
      </div>
    </el-dialog>
+    <help-tip v-if="tipShow" @toCloseTip="toCloseTip"></help-tip>
  </div>
 </template>
 <script>
+import helpTip from '@/components/company/help-tip.vue';
 import { _debounce } from '@/common/js/public';
 import { getRequest, postRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
@@ -78,7 +87,8 @@ import limitInput from '@/components/limit-input.vue';
 export default {
  name: 'depart-list',
  components: {
-    limitInput
+    limitInput,
+    helpTip
  },
  props: {
    departObj: {
@@ -119,10 +129,19 @@ export default {
      },
      partForm: {
        departmentName: ''
-      }
+      },
+      tipShow: false
    };
  },
  methods: {
+    toShowTip() {
+      const that = this;
+      that.tipShow = true;
+    },
+    toCloseTip() {
+      const that = this;
+      that.tipShow = false;
+    },
    /**
     * 取消
     */
@@ -330,6 +349,11 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.to-log-btn {
+  width: 102px;
+  height: 28px;
+  background: rgba(245, 247, 250, 1);
+}
 .w-274 {
  width: 274px;
 }

--- a/src/components/company/help-dialog.vue
+++ b/src/components/company/help-dialog.vue
@@ -4,10 +4,10 @@
 * @Author: 无尘
 * @Date: 2020-04-14 09:50:16
 * @LastEditors: 无尘
- * @LastEditTime: 2020-04-14 12:29:55
+ * @LastEditTime: 2020-04-14 13:53:28
 -->
 <!--
-  <help-dialog : @closeHelp="closeHelp"></help-dialog>
+  <help-dialog  @closeHelp="closeHelp"></help-dialog>
  import helpDialog from '@/components/company/help-dialog.vue';
 -->
 <template>
@@ -29,7 +29,6 @@ export default {
  methods: {
    handleClose(done) {
      const that = this;
-      done();
      that.$emit('closeHelp');
    }
  }

--- a/src/components/company/help-tip.vue
+++ b/src/components/company/help-tip.vue
+<!--
+ * @Descripttion: 当前组件信息
+ * @version: 1.0.0
+ * @Author: 无尘
+ * @Date: 2020-04-14 09:50:16
+ * @LastEditors: 无尘
+ * @LastEditTime: 2020-04-14 13:57:45
+ -->
+<!--
+  <help-tip : @toCloseTip="toCloseTip"></help-tip>
+  import helpTip from '@/components/company/help-tip.vue';
+ -->
+<template>
+  <el-dialog title="查看帮助提示" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
+    <div class="p-l-18">
+      <div class="m-b-20">1. 邀请人员每日最多可邀请一次，批量邀请请在企业微信中操作</div>
+      <div class="m-b-20">2. 【店长导购】添加，可在GIC中操作，因企业微信添加成员无法输入导购code</div>
+      <div class="m-b-20">3. 【普通成员】添加（非店长导购），可在企业微信/好办通讯中操作</div>
+      <div class="m-b-20">4. 如需同步通讯录或添加导购，请在&lt;企业微信/管理工具/API同步&gt;中关闭其他同步 后，在此页面右上角提示中选择安装【通讯录同步助手】</div>
+      <div class="m-b-20">5. 在与企业微信第三方对接通讯录同步，同时会冻结好办端的通讯录操作。为此给用户 带来的不变敬请谅解。</div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      dialogVisible: true
+    };
+  },
+  methods: {
+    handleClose(done) {
+      const that = this;
+      that.$emit('toCloseTip');
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.m-b-20 {
+  margin-bottom: 20px;
+}
+.p-l-18 {
+  padding-left: 18px;
+}
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2018-10-10 14:44:45
 * @LastEditors: 无尘
- * @LastEditTime: 2020-04-14 12:39:42
+ * @LastEditTime: 2020-04-14 13:44:29
 */
 import Vue from 'vue';
 import Router from 'vue-router';
@@ -78,8 +78,8 @@ export const constantRouterMap = [
      },
      {
        path: '/syncLog',
-        name: '组织架构管理',
+        name: '通讯录日志',
-        component: _import('business', 'orgStrucsyncLogtSet')
+        component: _import('business', 'syncLog')
      },
    ]
  },