Skip to content

H
haoban-3
Commit 3c4d12d3 by 无尘
Options

fix: 修改组织架构状态

parent 887f0b54
Showing with 30 additions and 13 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.19621d0c94056561c748f41f47ebbd09.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.bd643c96ee5dbf2e8c38.js></script><script type=text/javascript src=./static/js/vendor.014a23eec35e9d02ede3.js></script><script type=text/javascript src=./static/js/app.5f7b88f11169314ec036.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.128cc1781e96b0bed2678ab3a81f3f47.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.0e0400002c78dc97d314.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>
\ No newline at end of file \ No newline at end of file
dist/static/css/public.css
...@@ -1247,3 +1247,7 @@ button.el-button--danger.is-plain { ...@@ -1247,3 +1247,7 @@ button.el-button--danger.is-plain {
transform: scale(0, 0); transform: scale(0, 0);
} }
} }
.hide-header-dialog .el-dialog__header {
display: none;
}
dist/static/js/4.f79ced2d2e281f5e6b32.js → dist/static/js/4.5ced769c6f5de9b24ab6.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.bd643c96ee5dbf2e8c38.js → dist/static/js/manifest.0e0400002c78dc97d314.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:"f79ced2d2e281f5e6b32",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:"18e2a75903d8bf803840",3:"7ac2e1c035738da79fbe",4:"5ced769c6f5de9b24ab6",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 \ No newline at end of file
src/components/company/sync-dialog.vue
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-04-14 09:50:16 * @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-04-14 11:42:00 * @LastEditTime: 2020-04-14 12:43:02
--> -->
<!-- <!--
<sync-dialog :syncData="syncData"></sync-dialog> <sync-dialog :syncData="syncData"></sync-dialog>
import syncDialog from '@/components/company/sync-dialog.vue'; import syncDialog from '@/components/company/sync-dialog.vue';
--> -->
<template> <template>
<el-dialog title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose"> <el-dialog class="hide-header-dialog" title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
<div> <div>
<div class="el-progress-bar" style="width:350px"> <div class="el-progress-bar" style="width:350px">
<div class="el-progress-bar__outer" style="height: 8px;"> <div class="el-progress-bar__outer" style="height: 8px;">
......
src/components/company/sync-fail.vue
...@@ -4,23 +4,23 @@ ...@@ -4,23 +4,23 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-04-14 09:50:16 * @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-04-14 12:37:56 * @LastEditTime: 2020-04-14 12:42:40
--> -->
<!-- <!--
<sync-fail :syncData="syncData"></sync-fail> <sync-fail :syncData="syncData"></sync-fail>
import syncFail from '@/components/company/sync-fail.vue'; import syncFail from '@/components/company/sync-fail.vue';
--> -->
<template> <template>
<el-dialog center title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose"> <el-dialog class="hide-header-dialog" center title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
<div> <div>
<div class="text-center"><span class="font-36 el-icon-circle-close color-f83431"></span></div> <div class="text-center"><span class="font-36 el-icon-circle-close color-f83431"></span></div>
<div class="font-18 color-303133 m-t-25 text-center">出错了！</div> <div class="font-18 color-303133 m-t-25 text-center">出错了！</div>
<div class="font-14 color-606266 m-t-10 text-center line-h-20">同步失败，您所提交的同步内容未同步成功，请查看日志后重新同步失败门店或分组。关闭提示后不能再进行剩余同步！</div> <div class="font-14 color-606266 m-t-10 text-center line-h-20">同步失败，您所提交的同步内容未同步成功，请查看日志后重新同步失败门店或分组。关闭提示后不能再进行剩余同步！</div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="toLog">查看日志</el-button> <el-button type="primary" @click="toLog">查看日志</el-button>
<el-button type="primary" @click="centerDialogVisible = false">继续同步</el-button> <el-button type="primary" @click="toContinue">继续同步</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
...@@ -50,6 +50,10 @@ export default { ...@@ -50,6 +50,10 @@ export default {
toLog() { toLog() {
// const that = this; // const that = this;
window.open('/haoban-3/#/syncLog'); window.open('/haoban-3/#/syncLog');
},
toContinue() {
const that = this;
that.$emit('continueSync');
} }
} }
}; };
......
src/components/company/sync-success.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
import syncSuccess from '@/components/company/sync-success.vue'; import syncSuccess from '@/components/company/sync-success.vue';
--> -->
<template> <template>
<el-dialog center title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose"> <el-dialog class="hide-header-dialog" center title="" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
<div> <div>
<div class="text-center"><span class=" font-36 el-icon-circle-check color-49c958"></span></div> <div class="text-center"><span class=" font-36 el-icon-circle-check color-49c958"></span></div>
<div class="font-18 color-303133 m-t-25 text-center">已成功！</div> <div class="font-18 color-303133 m-t-25 text-center">已成功！</div>
......
src/router/index.js
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-03-16 15:34:46 * @LastEditTime: 2020-04-14 12:39:42
*/ */
import Vue from 'vue'; import Vue from 'vue';
import Router from 'vue-router'; import Router from 'vue-router';
...@@ -75,7 +75,12 @@ export const constantRouterMap = [ ...@@ -75,7 +75,12 @@ export const constantRouterMap = [
path: '/recycle', path: '/recycle',
name: '组织架构管理', name: '组织架构管理',
component: _import('business', 'recycle') component: _import('business', 'recycle')
} },
{
path: '/syncLog',
name: '组织架构管理',
component: _import('business', 'orgStrucsyncLogtSet')
},
] ]
}, },
......
static/css/public.css
...@@ -1247,3 +1247,7 @@ button.el-button--danger.is-plain { ...@@ -1247,3 +1247,7 @@ button.el-button--danger.is-plain {
transform: scale(0, 0); transform: scale(0, 0);
} }
} }
.hide-header-dialog .el-dialog__header {
display: none;
}
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