Skip to content

H
haoban-3
Commit 0b4717cc by 无尘
Options

fix: 修改日报配置和部门

parent 307b3647
Showing with 48 additions and 31 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.af2474ac0a0839f6a336bca90823eb47.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.f830181e3774909d55c6.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.d9e8509378655ccba143.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.795bb072a4734bf19e0b3231bfbab9f4.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.b962dd8b0e643dafb7e4.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.d9e8509378655ccba143.js></script></body></html>
\ No newline at end of file
dist/static/css/app.795bb072a4734bf19e0b3231bfbab9f4.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.af2474ac0a0839f6a336bca90823eb47.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/3.699e0c84ca2a5c74d5a3.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.d715905b742fe34107f2.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/5.bb6470a1a38772f6fb14.js → dist/static/js/5.83bf6c323a0101543e29.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.f830181e3774909d55c6.js → dist/static/js/manifest.b962dd8b0e643dafb7e4.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={51: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 n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"dbf05147df3025a8713a",1:"06c4e42e62c1f75191f0",2:"0280c4334e2686dc2baf",3:"d715905b742fe34107f2",4:"d99d3791a87563625864",5:"bb6470a1a38772f6fb14",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"5b211cc58fcb740976c2",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"d847d9cd9013c7382389",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"97a9b1a559ec27dad923",17:"7446f565455fbad09abd",18:"65b8c661308214b7851e",19:"74ba19395c578980c999",20:"7f3a92bcf5a66089600a",21:"0ec7408bb99f857e7132",22:"cb80178f17dc0f1c1385",23:"f26a64af6d595b65a127",24:"5b59042d681e7fe67787",25:"478df3da4cb7c7af6a47",26:"861a130a705ab90f18c9",27:"c6f51c051f25fc882ef9",28:"9bedf1daead8df8f312e",29:"bc43fde10c870859a8a3",30:"210e28f6787e17efe2b5",31:"a668ab1de95280d8ea4b",32:"22fcab94d4b8d6c87e72",33:"af03022c94f58809aa77",34:"dce139ae594034f17a52",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"c74e9e3d53219b3ac1ff",38:"424a8230959ada09c944",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"6323f9cc051bdb6fd81e",43:"8010c162bbcef7c0f498",44:"c8039697bf0dcf196cca",45:"45e4397c0ca09b32eb25",46:"b8a25437acb57de97830",47:"da9b899d98080bcbc0a4",48:"750f3261e51d2d100d96"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),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,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var a={},f={51: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 n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"dbf05147df3025a8713a",1:"06c4e42e62c1f75191f0",2:"0280c4334e2686dc2baf",3:"699e0c84ca2a5c74d5a3",4:"17eaaa937b6dda3c3437",5:"83bf6c323a0101543e29",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"5b211cc58fcb740976c2",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"d847d9cd9013c7382389",14:"a034fd161b8c1b267354",15:"fe7adb86092d73ec2e30",16:"97a9b1a559ec27dad923",17:"7446f565455fbad09abd",18:"65b8c661308214b7851e",19:"74ba19395c578980c999",20:"7f3a92bcf5a66089600a",21:"0ec7408bb99f857e7132",22:"cb80178f17dc0f1c1385",23:"f26a64af6d595b65a127",24:"5b59042d681e7fe67787",25:"478df3da4cb7c7af6a47",26:"861a130a705ab90f18c9",27:"c6f51c051f25fc882ef9",28:"9bedf1daead8df8f312e",29:"bc43fde10c870859a8a3",30:"210e28f6787e17efe2b5",31:"a668ab1de95280d8ea4b",32:"22fcab94d4b8d6c87e72",33:"af03022c94f58809aa77",34:"dce139ae594034f17a52",35:"ed9ebdd61aa7a7301b39",36:"e86539c9400400aeca81",37:"c74e9e3d53219b3ac1ff",38:"424a8230959ada09c944",39:"7dfcaaab2bdeab04f8e8",40:"26ef55c1adb75adce860",41:"409fc320bb5afcd95dbe",42:"6323f9cc051bdb6fd81e",43:"8010c162bbcef7c0f498",44:"c8039697bf0dcf196cca",45:"45e4397c0ca09b32eb25",46:"b8a25437acb57de97830",47:"da9b899d98080bcbc0a4",48:"750f3261e51d2d100d96"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),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/contact-tree.vue
......@@ -3,8 +3,8 @@
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘
* @LastEditTime : 2020-02-23 16:29:34
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 14:47:51
-->
<!--
<contact-tree :itemData="itemData" v-model="itemData" ></contact-tree>
......@@ -16,7 +16,7 @@ import contactTree from '/components/company/contact-tree.vue';
<!-- <draggable :list="itemData" class="wx-component" :options="rightOption" @input="emitter" @change="changeData"> -->
<li v-for="(item, index) in itemData" :key="index + 'gic'">
<div class="li-cell cursor-pointer" @click="toggleExpand(item)">
<span :class="['font-12 color-606266', item.isStore == 1 || !item.children.length ? '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.departmentName }}</span>
<span :class="['font-12 color-606266', item.isStore == 1 || !item.hasSonNode ? '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.departmentName }}</span>
</div>
<li-row v-if="item.expand" :itemData="item.children" @getSelectData="getSelectData"></li-row
><!-- v-show="!!item.children.length && item.expand" -->
......
src/components/company/depart-list.vue
......@@ -2,8 +2,8 @@
* @Descripttion : 当前组件信息
* @Author : 无尘
* @Date : 2020-02-13 14:02:22
* @LastEditors : 无尘
* @LastEditTime : 2020-02-28 18:08:57
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 15:06:13
* @FilePath : \Hapi-demoj:\公司\haoban-3\src\components\company\depart-list.vue
-->
<!--
......@@ -56,7 +56,7 @@
<!-- 新增子部门 -->
<el-dialog width="600px" title="新增子部门" :visible.sync="partVisible" append-to-body :before-close="handleClose">
<el-form :model="partForm" :rules="rules" ref="form" label-width="100px" class="dialog-form">
<el-form-item label="部门名称：" prop="departmentName">
<el-form-item label="部门名称" prop="departmentName">
<limitInput :inputWidth="440" :inputValue.sync="partForm.departmentName" :holder="'请输入部门名称'" :getByType="'char'" :maxLength="32"> </limitInput>
</el-form-item>
</el-form>
......
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 11:25:51
* @LastEditTime: 2020-03-06 15:03:15
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -18,7 +18,7 @@ import wxTree from './wx-tree.vue';
<div class="li-cell cursor-pointer">
<div class="flex flex-space-between boder-box p-r-20" :style="{ 'padding-left': (item.level + 1) * 10 + 'px' }">
<div class="tree-left" :title="item.gicEnterpriseName" @click="toggleExpand(item)">
<span :class="['font-12 color-606266', item.isStore == 1 || !item.children.length ? '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>
<span :class="['font-12 color-606266', item.isStore == 1 || !item.hasSonNode ? '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 class="tree-right">
<el-button v-if="item.isStore == 0" type="text" @click.stop="addChild(item)">添加子部门</el-button>
......@@ -387,6 +387,7 @@ export default {
parentDepartmentId: that.additem.departmentId,
children: []
};
that.$set(that.additem, 'hasSonNode', true);
that.additem.children.push(childObj);
// 增加的字段
that.$store.dispatch('saveAddInfo', JSON.parse(JSON.stringify(childObj)));
......
src/views/apps/cloudDaily/systemReport.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 12:42:16
* @LastEditTime: 2020-03-06 14:39:53
-->
<template>
<div class="template-wrap" :style="{ minHeight: bodyHeight }">
......@@ -559,14 +559,27 @@ export default {
let that = this;
if (!!newData) {
that.enterpriseId = newData;
// 卡片
that.cardInfo = [];
// 交易
that.tradeInfo = [];
// 生日会员
that.birthdayMemberInfo = [];
// 会员
that.memberInfo = [];
// 执行力
that.powerInfo = [];
// 中间数据集合
that.currentIndex = 0; //当前选择的 item
that.tempaletDataList = [];
/* eslint-disable */
Promise.all([that.getInfo()])
.then(values => {
that.getAllFields();
})
.catch(reason => {
console.log(reason);
});
Promise.all([that.getInfo()])
.then(values => {
that.getAllFields();
})
.catch(reason => {
console.log(reason);
});
}
},
},
......@@ -721,19 +734,21 @@ export default {
position: relative;
width: 180px;
height: 32px;
margin: 0 15px 15px 0;
line-height: 40px;
padding: 0 10px;
margin: 0 10px 10px 0;
line-height: 32px;
display: inline-block;
text-align: center;
cursor: move;
color: #fff;
color: #606266;
padding: 0;
overflow: hidden;
font-size: 12px;
font-size: 14px;
background:rgba(250,250,250,1);
border-radius:2px;
border:1px solid rgba(220,223,230,1);
&:nth-child(2n+1) {
margin-left: 20px;
}
&.fixed-item {
opacity: 0.5;
cursor: not-allowed;
......@@ -742,8 +757,8 @@ export default {
#list5 {
.compenent-item {
text-align: left;
padding: 0 16px;
// text-align: left;
// padding: 0 16px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
......@@ -791,8 +806,8 @@ export default {
}
}
&:hover {
color: #2f54eb;
border-color: #2f54eb;
// color: #2f54eb;
// border-color: #2f54eb;
.bg-icon {
&.bg-icon-one {
background-position: -18px -16px;
......
src/views/business/contacts.vue
......@@ -3,8 +3,8 @@
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors : 无尘
* @LastEditTime : 2020-02-28 15:12:29
* @LastEditors: 无尘
* @LastEditTime: 2020-03-06 15:04:52
-->
<template>
<div class="contacts-wrap common-set-wrap">
......@@ -159,6 +159,7 @@ export default {
async addDepart(obj) {
const that = this;
console.log(that.departObj, obj);
that.$set(that.departObj, 'hasSonNode', true);
that.departObj.children = await that.getChildData(that.departObj);
that.$forceUpdate();
},
......
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