Skip to content

H
haoban-3
Commit 2d6e7284 by fairyly
Options

fix: 修改接口

parent 32e9c18e
Showing with 67 additions and 34 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.f83bc92f8fa8988574e538af33b91162.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.18b0bf7a71372de4dcd1.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.3d10c11148fe0867bd89.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.fd5c02c0d319f1494678577c0d9dbf5b.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.d35ced21dbc8c68d159d.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.3d10c11148fe0867bd89.js></script></body></html>
\ No newline at end of file
dist/static/js/3.f37e5caa7cf66fcfa97c.js → dist/static/js/3.7343e324775b07b90a7f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.18b0bf7a71372de4dcd1.js → dist/static/js/manifest.d35ced21dbc8c68d159d.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:"547e4f5a9275665724ed",3:"f37e5caa7cf66fcfa97c",4:"114df92ac52300136d2e",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",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,o,c){for(var f,i,u,b=0,d=[];b<r.length;b++)i=r[b],t[i]&&d.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);d.length;)d.shift()();if(c)for(b=0;b<c.length;b++)u=a(a.s=c[b]);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 o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+e+"."+{0:"cbd8baab911002c79be8",1:"9a1776fdc262362d75b8",2:"547e4f5a9275665724ed",3:"7343e324775b07b90a7f",4:"7ff1e8704ade6a4a0bec",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",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(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),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-24 16:27:15
* @LastEditTime : 2020-02-25 12:00:13
-->
<!--
<org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>
......@@ -18,7 +18,7 @@ import orgTree from './org-tree.vue';
<div class="li-cell cursor-pointer" @click="toggleExpand(item)">
<span :class="['font-12 color-606266', item.isStore == 1 ? 'color-fff' : '', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span :class="['font-14 p-l-10 p-r-10 iconfont', item.isStore == 1 ? 'icondianpu-kuai' : 'iconqiye-tianchong', item.bindFlag == 1 ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ item.label }}</span>
</div>
<li-row v-show="!!item.children.length && item.expand" :itemData="item.children"></li-row>
<li-row v-show="!!item.children.length && item.expand" :itemObj="item" :itemData="item.children"></li-row>
</li>
</draggable>
</ul>
......@@ -38,6 +38,12 @@ export default {
default() {
return [];
}
},
itemObj: {
type: [Object, Array],
default() {
return [];
}
}
},
data() {
......@@ -73,12 +79,12 @@ export default {
getChildData(item) {
const that = this;
let para = {
parentId: item.departmentId, //
isStore: item.isStore, //
keyword: '' //
enterpriseId: item.enterpriseId,
departmentId: item.departmentId, //
type: item.type //
};
return new Promise((resolve, reject) => {
getRequest('/haoban-manage3-web/department-list-level', para)
getRequest('/haoban-manage3-web/unbind-department-list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
......@@ -90,6 +96,7 @@ export default {
ele.children = [];
ele.level = item.level + 1;
ele.label = ele.departmentName;
ele.enterpriseId = item.enterpriseId;
});
}
resolve(resData.result || []);
......@@ -113,8 +120,11 @@ export default {
onMove(evt) {
// const that = this;
// 判断中间是否存在父级
const draggedElement = evt.draggedContext.element;
// 首级不能移动
if (draggedElement.level == 0) {
return false;
}
// console.log(evt, !draggedElement.fixed);
return !draggedElement.fixed;
},
......@@ -124,19 +134,36 @@ export default {
itemMoveEnd(evt) {
const that = this;
// 判断中间是否已经添加
// console.log(that.itemData);
console.log('gic:', evt, that.itemObj, that.itemData);
that.$forceUpdate();
},
/**
* 获取子级的数据
*/
async getNextData() {
const that = this;
for (let index = 0; index < that.itemData.length; index++) {
that.itemData[index].expand = true;
// 获取子集的时候会加一个加载的标志，来避免移动后重复加载子集
if (!that.itemData[index].loaded) {
that.itemData[index].children = await that.getChildData(that.itemData[index]);
}
}
}
},
watch: {
itemData: function(newData, oldData) {
const that = this;
that.trData = JSON.parse(JSON.stringify(newData));
if (newData.length) {
that.getNextData();
}
}
},
mounted() {
const that = this;
that.trData = JSON.parse(JSON.stringify(that.itemData));
if (that.itemData.length) {
that.getNextData();
}
},
beforeDestroy() {
this.tempArr = [];
......
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘
* @LastEditTime : 2020-02-24 14:44:34
* @LastEditTime : 2020-02-25 09:39:38
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -27,7 +27,7 @@ import wxTree from './wx-tree.vue';
</div>
</div>
</div>
<li-row v-if="item.expand" :itemData="item.children"></li-row
<li-row :itemObj="item" :itemData="item.children"></li-row
><!-- v-show="!!item.children.length && item.expand" -->
</li>
</draggable>
......@@ -59,6 +59,12 @@ export default {
default() {
return [];
}
},
itemObj: {
type: [Object, Array],
default() {
return [];
}
}
},
data() {
......@@ -95,7 +101,7 @@ export default {
itemMoveEnd(evt) {
const that = this;
// 判断中间是否已经添加
console.log(evt, that.itemData);
console.log('移动后：', evt, that.itemObj, that.itemData);
that.$forceUpdate();
},
/**
......@@ -106,7 +112,7 @@ export default {
this.$emit('input', value);
},
changeData(value) {
// console.log(value);
console.log('change:', value);
},
/**
* 展开或者关闭下级
......
src/views/business/orgStructSet.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors : 无尘
* @LastEditTime : 2020-02-25 09:09:54
* @LastEditTime : 2020-02-25 11:54:17
-->
<template>
<div class="my-customer-wrap common-set-wrap">
......@@ -53,12 +53,12 @@
<span v-if="!item.isStore" :class="['font-12 color-606266', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span :class="['font-14 p-l-10 p-r-10 iconfont', item.isStore == 1 ? 'icondianpu-kuai' : 'iconqiye-tianchong', item.bindFlag == 1 ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ item.label }}</span>
</div>
<div class="tree-right">
<el-button v-if="item.isStore == 0" type="text" @click.stop="addChild(item)">添加子部门</el-button>
<el-button v-if="!item.isStore" type="text" @click.stop="addChild(item)">添加子部门</el-button>
<el-button type="text" @click.stop="modChild(item)">修改名称</el-button>
</div>
</div>
</div>
<wx-tree v-if="item.expand" :itemData="item.children" v-model="item.children"></wx-tree>
<wx-tree v-if="item.expand" :itemObj="item" :itemData="item.children" v-model="item.children"></wx-tree>
</li>
</ul>
</div>
......@@ -85,6 +85,7 @@ import wxTree from '@/components/company/wx-tree.vue';
import addDepart from '@/components/company/add-depart.vue';
import { getRequest, postRequest } from '@/api/api';
import errMsg from '@/common/js/error';
import showMsg from '@/common/js/showmsg';
import { _debounce } from '@/common/js/public';
import localforage from 'localforage';
export default {
......@@ -146,12 +147,11 @@ export default {
postSaveData() {
const that = this;
let para = {};
postRequest('/haoban-manage3-web/wx-enterprise-bind', para)
postRequest('/haoban-manage3-web/department-batch-sync', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.tableData = resData.result.list || [];
that.total = resData.result.total;
showMsg.showmsg('同步成功', 'success');
return false;
}
errMsg.errorMsg(resData);
......@@ -174,8 +174,7 @@ export default {
const that = this;
let para = {
enterpriseId: item.enterpriseId, //
wxEnterpriseId: that.wxEnterpriseId, //
version: item.version
type: 1
};
getRequest('/haoban-manage3-web/unbind-department-list', para)
.then(res => {
......@@ -187,6 +186,7 @@ export default {
ele.children = [];
ele.level = 0;
ele.label = ele.departmentName;
enterpriseId: item.enterpriseId;
});
}
that.gicData = resData.result || [];
......
src/views/login/index.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors : 无尘
* @LastEditTime : 2020-02-24 11:58:13
* @LastEditTime : 2020-02-25 10:08:01
-->
<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: '达摩网络'
},*/
],
// 登录
......@@ -171,9 +171,9 @@ export default {
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
// localStorage.removeItem('userInfo');
// localStorage.setItem('userInfo', JSON.stringify(resData.result));
// that.$router.push('/index');
localStorage.removeItem('userInfo');
localStorage.setItem('userInfo', JSON.stringify(resData.result));
that.$router.push('/index');
return;
}
if (resData.errorCode == 30004) {
......
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