Skip to content

H
haoban-3
Commit 4c543657 by fairyly
Options

fix: 修改接口返回部门数据

parent 954b4d63
Showing with 42 additions and 19 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.24.css><link href=./static/css/app.6026f46ee9e292e5c3d39722fdd21152.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.0ae169573e786dd20fac.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.afd1ff31b04aa05a428b.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.24.css><link href=./static/css/app.4c772f418e3de2db63ac66f043d5c4ff.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.0be942081de78e6b11c5.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.afd1ff31b04aa05a428b.js></script></body></html>
\ No newline at end of file
dist/static/js/3.00ae4e056fc054aad402.js → dist/static/js/3.7dc18f7a6fdafbe4b1f3.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.0ae169573e786dd20fac.js → dist/static/js/manifest.0be942081de78e6b11c5.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);b.length;)b.shift()();if(o)for(d=0;d<o.length;d++)u=a(a.s=o[d]);return u};var r={},t={21:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"cbd8baab911002c79be8",1:"9a1776fdc262362d75b8",2:"ae426c80e728c02a22cf",3:"00ae4e056fc054aad402",4:"d36035914e37c9854788",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"617b6e3f6d04e59ae06b",10:"de993e1c4bc498c9dbd6",11:"29941951e052f4942eca",12:"c95e6e2e763aa2d73679",13:"28d4554055ef8599c8af",14:"6ddcbf8576b81570a798",15:"0a934f87a0f05eee4293",16:"ceb943561fcf2e88bc01",17:"30b2bb1593a5d6e55f0a",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);b.length;)b.shift()();if(o)for(u=0;u<o.length;u++)i=a(a.s=o[u]);return i};var r={},t={21:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"cbd8baab911002c79be8",1:"9a1776fdc262362d75b8",2:"ae426c80e728c02a22cf",3:"7dc18f7a6fdafbe4b1f3",4:"55f32e862d526233bb6d",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"617b6e3f6d04e59ae06b",10:"de993e1c4bc498c9dbd6",11:"29941951e052f4942eca",12:"c95e6e2e763aa2d73679",13:"28d4554055ef8599c8af",14:"6ddcbf8576b81570a798",15:"0a934f87a0f05eee4293",16:"ceb943561fcf2e88bc01",17:"30b2bb1593a5d6e55f0a",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/company/org-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘
* @LastEditTime : 2020-02-25 15:08:26
* @LastEditTime : 2020-02-26 09:14:30
-->
<!--
<org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>
......@@ -147,7 +147,7 @@ export default {
async getNextData() {
const that = this;
for (let index = 0; index < that.itemData.length; index++) {
that.itemData[index].expand = true;
that.itemData[index].expand = false;
// 获取子集的时候会加一个加载的标志，来避免移动后重复加载子集
if (!that.itemData[index].loaded) {
that.itemData[index].children = await that.getChildData(that.itemData[index]);
......
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘
* @LastEditTime : 2020-02-25 19:43:08
* @LastEditTime : 2020-02-26 09:06:28
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -111,26 +111,43 @@ export default {
// console.log(value);
this.$emit('input', value);
},
changeData(value) {
handleAdded(pitem) {
const that = this;
pitem.children.forEach((ele, index) => {
ele.level = pitem.level + 1;
if (ele.children.length) {
that.handleAdded(ele);
}
});
},
async changeData(value) {
const that = this;
// that.$store.dispatch('saveAddInfo', );
console.log('wx:change:', value, that.itemObj);
const objKey = !!value['added'] ? 'added' : !!value['moved'] ? 'moved' : '';
const objKey = !!value['added'] ? 'added' : !!value['moved'] ? 'moved' : 'removed';
if (!!objKey) {
let sort = '';
that.itemObj.children.forEach((ele, index) => {
ele.sort = index;
if (value[objKey].element.departmentId == ele.departmentId) {
for (let index = 0; index < that.itemObj.children.length; index++) {
that.itemObj.children[index].sort = index;
if (value[objKey].element.departmentId == that.itemObj.children[index].departmentId) {
sort = index;
ele.level = that.itemObj.level + 1;
that.itemObj.children[index].level = that.itemObj.level + 1;
}
});
if (that.itemObj.children[index].children.length) {
await that.handleAdded(that.itemObj.children[index]);
}
}
let newEle = JSON.parse(JSON.stringify(value[objKey].element));
newEle.parentId = that.itemObj.departmentId;
newEle.storeFlag = newEle.isStore;
newEle.level = that.itemObj.level + 1;
newEle.sort = sort;
// 移入如果是多层级结构，就要循环遍历
if (newEle.children.length) {
await that.handleAdded(newEle);
}
console.log(newEle);
that.$nextTick(() => {
if (objKey == 'moved') {
......@@ -138,9 +155,15 @@ export default {
that.$store.dispatch('saveEditInfo', that.itemObj);
return false;
}
if (objKey == 'removed') {
that.$store.dispatch('saveEditInfo', newEle);
that.$store.dispatch('saveEditInfo', that.itemObj);
return false;
}
that.$store.dispatch('saveAddInfo', newEle);
that.$store.dispatch('saveAddInfo', that.itemObj);
});
that.$forceUpdate();
}
},
/**
......
src/views/login/index.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors : 无尘
* @LastEditTime : 2020-02-25 20:43:31
* @LastEditTime : 2020-02-26 09:10:37
-->
<template>
<div class="login-wrap">
......@@ -56,10 +56,10 @@ export default {
// 企业列表
enterpriseList: [
/*{
enterpriseId : '1231',
logoUrl: require("../../assets/logo.png"),
enterpriseName: '达摩网络'
},*/
enterpriseId : '1231',
logoUrl: require("../../assets/logo.png"),
enterpriseName: '达摩网络'
},*/
],
// 登录
......
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