Skip to content

H
haoban-3
Commit 68d8f99f by fairyly
Options

fix: 修改接口返回数据

parent 29a17f7c
Showing with 60 additions and 9 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.36b6a3a4310d8283ecff2d83652e63ff.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.d84925896e53bf790095.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.526ea7bf8d69d8ab6ed2.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.24.css><link href=./static/css/app.8d3b9b978a9a6afc7e66cf484732b5ee.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.8c373151d153ecb6d705.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.526ea7bf8d69d8ab6ed2.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.36b6a3a4310d8283ecff2d83652e63ff.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.8d3b9b978a9a6afc7e66cf484732b5ee.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.ae8a37ecf4428979119d.js → dist/static/js/3.389b66732123ac70064f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d84925896e53bf790095.js → dist/static/js/manifest.8c373151d153ecb6d705.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={21:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"df83d5351bb9e8882766",1:"9a1776fdc262362d75b8",2:"9311f0519f0b2899a4a7",3:"ae8a37ecf4428979119d",4:"114df92ac52300136d2e",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",11:"e0ef37bbae35125bd787",12:"d90be435e90fc03b61dd",13:"863fcfef38d982f04a9d",14:"6ddcbf8576b81570a798",15:"0a934f87a0f05eee4293",16:"ceb943561fcf2e88bc01",17:"30b2bb1593a5d6e55f0a",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(d,12e4);function d(){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=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){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 a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={21:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"df83d5351bb9e8882766",1:"9a1776fdc262362d75b8",2:"9311f0519f0b2899a4a7",3:"389b66732123ac70064f",4:"114df92ac52300136d2e",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",11:"e0ef37bbae35125bd787",12:"d90be435e90fc03b61dd",13:"863fcfef38d982f04a9d",14:"6ddcbf8576b81570a798",15:"0a934f87a0f05eee4293",16:"ceb943561fcf2e88bc01",17:"30b2bb1593a5d6e55f0a",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(d,12e4);function d(){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=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/company/org-tree.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-08-14 16:51:07 * @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2020-02-18 14:41:36 * @LastEditTime : 2020-02-24 16:27:15
--> -->
<!-- <!--
<org-tree v-if="item.children.length" :itemData="item.children" ></org-tree> <org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>
...@@ -16,7 +16,7 @@ import orgTree from './org-tree.vue'; ...@@ -16,7 +16,7 @@ import orgTree from './org-tree.vue';
<draggable :list="itemData" class="org-component" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd"> <draggable :list="itemData" class="org-component" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
<li v-for="(item, index) in itemData" :key="index + 'gic'"> <li v-for="(item, index) in itemData" :key="index + 'gic'">
<div class="li-cell cursor-pointer" @click="toggleExpand(item)"> <div class="li-cell cursor-pointer" @click="toggleExpand(item)">
<span :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> <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> </div>
<li-row v-show="!!item.children.length && item.expand" :itemData="item.children"></li-row> <li-row v-show="!!item.children.length && item.expand" :itemData="item.children"></li-row>
</li> </li>
...@@ -25,6 +25,8 @@ import orgTree from './org-tree.vue'; ...@@ -25,6 +25,8 @@ import orgTree from './org-tree.vue';
</template> </template>
<script> <script>
import draggable from 'vuedraggable'; import draggable from 'vuedraggable';
import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api';
export default { export default {
name: 'li-row', name: 'li-row',
components: { components: {
...@@ -56,9 +58,54 @@ export default { ...@@ -56,9 +58,54 @@ export default {
/** /**
* 展开或者关闭下级 * 展开或者关闭下级
*/ */
toggleExpand(item) { async toggleExpand(item) {
const that = this;
// console.log(item); // console.log(item);
item.expand = item.expand ? false : true; item.expand = item.expand ? false : true;
// 点击的时候，如果非门店且子级是空的需要请求获取子级
if (item.isStore == 0 && !item.children.length && !item.loaded) {
item.children = await that.getChildData(item);
}
},
/**
* 获取下级数据
*/
getChildData(item) {
const that = this;
let para = {
parentId: item.departmentId, //
isStore: item.isStore, //
keyword: '' //
};
return new Promise((resolve, reject) => {
getRequest('/haoban-manage3-web/department-list-level', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
// 加一个已加载标志
if (resData.result.length) {
item.loaded = true;
resData.result.forEach(ele => {
ele.expand = false;
ele.children = [];
ele.level = item.level + 1;
ele.label = ele.departmentName;
});
}
resolve(resData.result || []);
return false;
}
resolve([]);
errMsg.errorMsg(resData);
})
.catch(function(error) {
resolve([]);
that.$message.error({
duration: 1000,
message: error.message
});
});
});
}, },
/** /**
* move{relatedContext, draggedContext} * move{relatedContext, draggedContext}
...@@ -99,6 +146,9 @@ export default { ...@@ -99,6 +146,9 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.li-cell { .li-cell {
line-height: 26px; line-height: 26px;
.color-fff {
color: #fff;
}
} }
.w-110 { .w-110 {
......
src/views/business/orgStructSet.vue
...@@ -107,6 +107,7 @@ export default { ...@@ -107,6 +107,7 @@ export default {
path: '' path: ''
} }
], ],
wxEnterpriseId: JSON.parse(localStorage.getItem('userInfo')).wxEnterpriseId,
addShow: false, addShow: false,
enterpriseData: [], enterpriseData: [],
gicData: [], gicData: [],
...@@ -173,14 +174,14 @@ export default { ...@@ -173,14 +174,14 @@ export default {
const that = this; const that = this;
let para = { let para = {
enterpriseId: item.enterpriseId, // enterpriseId: item.enterpriseId, //
wxEnterpriseId: item.wxEnterpriseId, // wxEnterpriseId: that.wxEnterpriseId, //
version: item.version version: item.version
}; };
getRequest('/haoban-manage3-web/unbind-department-list', para) getRequest('/haoban-manage3-web/unbind-department-list', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.gicData = resData.result.list || []; that.gicData = resData.result || [];
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
......
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