Skip to content

H
haoban-3
Commit b0ee8c10 by 无尘
Options

fix: 修改组织架构状态

parent b15e7f1c
Showing with 79 additions and 17 deletions
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.b06407d91e01c1c5bafad42bb1580020.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.03cb4eb0dc147323176d.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
<!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.7905cbdedb2e4ff9c9107fa4fb70f09a.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.c8676e62cc2f518bca9f.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.0cf26dcc7f0c9dfc3f1c.js></script></body></html>
\ No newline at end of file
dist/static/css/app.7905cbdedb2e4ff9c9107fa4fb70f09a.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.b06407d91e01c1c5bafad42bb1580020.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.285d29389d588923f068.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.34d0d21f7f00e655e87e.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.7ac2e1c035738da79fbe.js → dist/static/js/4.e3e73e861d3b00d3ba95.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.03cb4eb0dc147323176d.js → dist/static/js/manifest.c8676e62cc2f518bca9f.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:"34d0d21f7f00e655e87e",3:"7ac2e1c035738da79fbe",4:"0e06da4e1ebfb45b2d87",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
!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:"285d29389d588923f068",3:"5ed4e87494b38a8c96c7",4:"e3e73e861d3b00d3ba95",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
src/components/company/help-tip.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-04-14 14:13:08
* @LastEditTime: 2020-04-14 14:17:07
-->
<!--
<help-tip : @toCloseTip="toCloseTip"></help-tip>
......@@ -13,11 +13,11 @@
<template>
<el-dialog title="查看帮助提示" :visible.sync="dialogVisible" width="600px" :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;中关闭其他同步 <br /><span style="padding-left:20px;">后，在此页面右上角提示中选择安装【通讯录同步助手】</span></div>
<div class="m-b-20">5. 在与企业微信第三方对接通讯录同步，同时会冻结好办端的通讯录操作。为此给用户<br /><span style="padding-left:20px;">带来的不变敬请谅解。</span></div>
<div class="m-b-12">1. 邀请人员每日最多可邀请一次，批量邀请请在企业微信中操作</div>
<div class="m-b-12">2. 【店长导购】添加，可在GIC中操作，因企业微信添加成员无法输入导购code</div>
<div class="m-b-12">3. 【普通成员】添加（非店长导购），可在企业微信/好办通讯中操作</div>
<div class="m-b-12">4. 如需同步通讯录或添加导购，请在&lt;企业微信/管理工具/API同步&gt;中关闭其他同步 <br /><span style="padding-left:16px;">后，在此页面右上角提示中选择安装【通讯录同步助手】</span></div>
<div class="m-b-12">5. 在与企业微信第三方对接通讯录同步，同时会冻结好办端的通讯录操作。为此给用户<br /><span style="padding-left:16px;">带来的不变敬请谅解。</span></div>
</div>
</el-dialog>
</template>
......@@ -37,6 +37,9 @@ export default {
};
</script>
<style lang="less" scoped>
.m-b-12 {
margin-bottom: 12px;
}
.m-b-20 {
margin-bottom: 20px;
}
......
src/views/business/contacts.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-04-14 14:11:00
* @LastEditTime: 2020-04-14 14:21:47
-->
<template>
<div class="contacts-wrap common-set-wrap">
......@@ -40,9 +40,11 @@
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
<help-dialog v-if="helpShow" @closeHelp="closeHelp"></help-dialog>
<contact-sync-dialog v-if="syncStatusData.syncStatus == 1 || syncStatusData.syncStatus == 2 || syncStatusData.syncStatus == 3" :syncData="syncStatusData"></contact-sync-dialog>
</div>
</template>
<script>
import contactSyncDialog from '@/components/company/contact-sync-dialog.vue';
import helpDialog from '@/components/company/help-dialog.vue';
import navCrumb from '@/components/nav/nav.vue';
import contactTree from '@/components/company/contact-tree.vue';
......@@ -63,7 +65,8 @@ export default {
departMember,
storeMember,
contactTreeFilter,
helpDialog
helpDialog,
contactSyncDialog
},
data() {
return {
......@@ -101,7 +104,9 @@ export default {
],
selectData: {},
departObj: {},
helpShow: false
helpShow: false,
// 同步状态
syncStatusData: { syncStatus: 0 }
};
},
computed: {},
......@@ -277,6 +282,28 @@ export default {
message: error.message
});
});
},
/**
* 获取同步状态
*/
getSyncStatus() {
const that = this;
let para = {};
getRequest('/haoban-manage3-web/department-sync-check', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.syncStatusData = resData.result || {};
return false;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}
},
watch: {
......@@ -287,6 +314,7 @@ export default {
mounted() {
const that = this;
that.getTableList();
that.getSyncStatus();
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
......
src/views/business/orgStructSet.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-04-14 13:41:17
* @LastEditTime: 2020-04-14 14:27:47
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -13,7 +13,12 @@
<div class="right-box" :style="{ 'min-height': bgHeight }">
<div class="apps-content flex">
<div class="apps-content-left">
<div class="content-gic-title font-16 color-303133 text-left">GIC门店架构</div>
<div class="content-gic-title font-16 color-303133 text-left">
<div class="flex flex-space-between">
<span class="font-16 color-303133">GIC门店架构</span>
<div class="help-body flex flex-space-between" @click="showHelp"><span class="font-12 color-2f54eb">查看使用帮助</span><span class="font-12 color-2f54eb el-icon-arrow-right"></span></div>
</div>
</div>
<div class="content-gic flex">
<div class="gic-content-business">
<ul>
......@@ -83,6 +88,7 @@
</div>
</template>
<script>
import helpDialog from '@/components/company/help-dialog.vue';
import syncDialog from '@/components/company/sync-dialog.vue';
import syncSuccess from '@/components/company/sync-success.vue';
import syncFail from '@/components/company/sync-fail.vue';
......@@ -151,12 +157,25 @@ export default {
// 同步状态
syncStatusData: {
syncStatus: 0
}
},
helpShow: false
};
},
computed: {},
methods: {
/**
* 显示help弹窗
*
*/
showHelp() {
const that = this;
that.helpShow = true;
},
closeHelp() {
const that = this;
that.helpShow = false;
},
/**
* 触发父级
*/
changeParent(itemObj) {
......@@ -711,7 +730,8 @@ export default {
addDepart,
syncDialog,
syncSuccess,
syncFail
syncFail,
helpDialog
}
};
</script>
......@@ -736,6 +756,17 @@ export default {
.my-customer-wrap {
height: 100%;
}
.help-body {
margin-top: 12px;
line-height: 28px;
background: rgba(245, 247, 250, 1);
padding: 0 10px;
box-sizing: border-box;
cursor: pointer;
span {
line-height: 28px;
}
}
.right-content {
/*width: 100%;*/
padding: 0 20px 20px 20px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment