From 7c60bce47dc8c201ac9f318c4bf9da652881e19d Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 13 Oct 2023 17:39:22 +0800 Subject: [PATCH] 2023-10-13 --- supervise-crm-ui/src/utils/tree/index.js | 8 + .../src/utils/tree/src/model/node.js | 485 +++++++++++++++++ .../src/utils/tree/src/model/tree-store.js | 340 ++++++++++++ .../src/utils/tree/src/model/util.js | 27 + .../src/utils/tree/src/tree-node.vue | 279 ++++++++++ supervise-crm-ui/src/utils/tree/src/tree.vue | 496 ++++++++++++++++++ .../src/views/projectStaff/index.vue | 16 +- supervise-organizational-ui/.env.development | 2 +- supervise-report-ui/.env.development | 4 +- .../src/api/supervise/salesreport.js | 10 + .../src/views/reportCenter/salesReport.vue | 156 +++--- supervise-uniapp/common/config.js | 4 +- supervise-uniapp/common/request.api.js | 8 +- supervise-uniapp/pages.json | 7 + supervise-uniapp/pages/home/WorkFragment.vue | 2 +- .../pages/index/DataAssembleList2.vue | 274 ++++++++++ .../pages/index/RegulatoryReporting.vue | 433 +++++++++------ .../pages/index/interestAccount.vue | 9 + supervise-uniapp/static/baseIcon/calendar.png | Bin 0 -> 2212 bytes supervise-uniapp/static/baseIcon/project.png | Bin 0 -> 1550 bytes supervise-uniapp/utils/index.js | 27 +- yxt-portal-ui/src/views/Home/Home.vue | 2 +- 22 files changed, 2351 insertions(+), 238 deletions(-) create mode 100644 supervise-crm-ui/src/utils/tree/index.js create mode 100644 supervise-crm-ui/src/utils/tree/src/model/node.js create mode 100644 supervise-crm-ui/src/utils/tree/src/model/tree-store.js create mode 100644 supervise-crm-ui/src/utils/tree/src/model/util.js create mode 100644 supervise-crm-ui/src/utils/tree/src/tree-node.vue create mode 100644 supervise-crm-ui/src/utils/tree/src/tree.vue create mode 100644 supervise-uniapp/pages/index/DataAssembleList2.vue create mode 100644 supervise-uniapp/pages/index/interestAccount.vue create mode 100644 supervise-uniapp/static/baseIcon/calendar.png create mode 100644 supervise-uniapp/static/baseIcon/project.png diff --git a/supervise-crm-ui/src/utils/tree/index.js b/supervise-crm-ui/src/utils/tree/index.js new file mode 100644 index 00000000..e52d6a58 --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/index.js @@ -0,0 +1,8 @@ +import Tree from './src/tree.vue'; + +/* istanbul ignore next */ +Tree.install = function(Vue) { + Vue.component(Tree.name, Tree); +}; + +export default Tree; diff --git a/supervise-crm-ui/src/utils/tree/src/model/node.js b/supervise-crm-ui/src/utils/tree/src/model/node.js new file mode 100644 index 00000000..657b3b82 --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/src/model/node.js @@ -0,0 +1,485 @@ +import objectAssign from 'element-ui/src/utils/merge'; +import { markNodeData, NODE_KEY } from './util'; +import { arrayFindIndex } from 'element-ui/src/utils/util'; + +export const getChildState = node => { + let all = true; + let none = true; + let allWithoutDisable = true; + for (let i = 0, j = node.length; i < j; i++) { + const n = node[i]; + if (n.checked !== true || n.indeterminate) { + all = false; + if (!n.disabled) { + allWithoutDisable = false; + } + } + if (n.checked !== false || n.indeterminate) { + none = false; + } + } + + return { all, none, allWithoutDisable, half: !all && !none }; +}; + +const reInitChecked = function(node) { + if (node.childNodes.length === 0) return; + + const {all, none, half} = getChildState(node.childNodes); + if (all) { + node.checked = true; + node.indeterminate = false; + } else if (half) { + node.checked = false; + node.indeterminate = true; + } else if (none) { + node.checked = false; + node.indeterminate = false; + } + + const parent = node.parent; + if (!parent || parent.level === 0) return; + + if (!node.store.checkStrictly) { + reInitChecked(parent); + } +}; + +const getPropertyFromData = function(node, prop) { + const props = node.store.props; + const data = node.data || {}; + const config = props[prop]; + + if (typeof config === 'function') { + return config(data, node); + } else if (typeof config === 'string') { + return data[config]; + } else if (typeof config === 'undefined') { + const dataProp = data[prop]; + return dataProp === undefined ? '' : dataProp; + } +}; + +let nodeIdSeed = 0; + +export default class Node { + constructor(options) { + this.id = nodeIdSeed++; + this.text = null; + this.checked = false; + this.indeterminate = false; + this.data = null; + this.expanded = false; + this.parent = null; + this.visible = true; + this.isCurrent = false; + + for (let name in options) { + if (options.hasOwnProperty(name)) { + this[name] = options[name]; + } + } + + // internal + this.level = 0; + this.loaded = false; + this.childNodes = []; + this.loading = false; + + if (this.parent) { + this.level = this.parent.level + 1; + } + + const store = this.store; + if (!store) { + throw new Error('[Node]store is required!'); + } + store.registerNode(this); + + const props = store.props; + if (props && typeof props.isLeaf !== 'undefined') { + const isLeaf = getPropertyFromData(this, 'isLeaf'); + if (typeof isLeaf === 'boolean') { + this.isLeafByUser = isLeaf; + } + } + + if (store.lazy !== true && this.data) { + this.setData(this.data); + + if (store.defaultExpandAll) { + this.expanded = true; + } + } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { + this.expand(); + } + if (!Array.isArray(this.data)) { + markNodeData(this, this.data); + } + if (!this.data) return; + const defaultExpandedKeys = store.defaultExpandedKeys; + const key = store.key; + if (key && defaultExpandedKeys && defaultExpandedKeys.indexOf(this.key) !== -1) { + this.expand(null, store.autoExpandParent); + } + + if (key && store.currentNodeKey !== undefined && this.key === store.currentNodeKey) { + store.currentNode = this; + store.currentNode.isCurrent = true; + } + + if (store.lazy) { + store._initDefaultCheckedNode(this); + } + + this.updateLeafState(); + } + + setData(data) { + if (!Array.isArray(data)) { + markNodeData(this, data); + } + + this.data = data; + this.childNodes = []; + + let children; + if (this.level === 0 && this.data instanceof Array) { + children = this.data; + } else { + children = getPropertyFromData(this, 'children') || []; + } + + for (let i = 0, j = children.length; i < j; i++) { + this.insertChild({ data: children[i] }); + } + } + + get label() { + return getPropertyFromData(this, 'label'); + } + + get key() { + const nodeKey = this.store.key; + if (this.data) return this.data[nodeKey]; + return null; + } + + get disabled() { + return getPropertyFromData(this, 'disabled'); + } + + get nextSibling() { + const parent = this.parent; + if (parent) { + const index = parent.childNodes.indexOf(this); + if (index > -1) { + return parent.childNodes[index + 1]; + } + } + return null; + } + + get previousSibling() { + const parent = this.parent; + if (parent) { + const index = parent.childNodes.indexOf(this); + if (index > -1) { + return index > 0 ? parent.childNodes[index - 1] : null; + } + } + return null; + } + + contains(target, deep = true) { + const walk = function(parent) { + const children = parent.childNodes || []; + let result = false; + for (let i = 0, j = children.length; i < j; i++) { + const child = children[i]; + if (child === target || (deep && walk(child))) { + result = true; + break; + } + } + return result; + }; + + return walk(this); + } + + remove() { + const parent = this.parent; + if (parent) { + parent.removeChild(this); + } + } + + insertChild(child, index, batch) { + if (!child) throw new Error('insertChild error: child is required.'); + + if (!(child instanceof Node)) { + if (!batch) { + const children = this.getChildren(true); + if (children.indexOf(child.data) === -1) { + if (typeof index === 'undefined' || index < 0) { + children.push(child.data); + } else { + children.splice(index, 0, child.data); + } + } + } + objectAssign(child, { + parent: this, + store: this.store + }); + child = new Node(child); + } + + child.level = this.level + 1; + + if (typeof index === 'undefined' || index < 0) { + this.childNodes.push(child); + } else { + this.childNodes.splice(index, 0, child); + } + + this.updateLeafState(); + } + + insertBefore(child, ref) { + let index; + if (ref) { + index = this.childNodes.indexOf(ref); + } + this.insertChild(child, index); + } + + insertAfter(child, ref) { + let index; + if (ref) { + index = this.childNodes.indexOf(ref); + if (index !== -1) index += 1; + } + this.insertChild(child, index); + } + + removeChild(child) { + const children = this.getChildren() || []; + const dataIndex = children.indexOf(child.data); + if (dataIndex > -1) { + children.splice(dataIndex, 1); + } + + const index = this.childNodes.indexOf(child); + + if (index > -1) { + this.store && this.store.deregisterNode(child); + child.parent = null; + this.childNodes.splice(index, 1); + } + + this.updateLeafState(); + } + + removeChildByData(data) { + let targetNode = null; + + for (let i = 0; i < this.childNodes.length; i++) { + if (this.childNodes[i].data === data) { + targetNode = this.childNodes[i]; + break; + } + } + + if (targetNode) { + this.removeChild(targetNode); + } + } + + expand(callback, expandParent) { + const done = () => { + if (expandParent) { + let parent = this.parent; + while (parent.level > 0) { + parent.expanded = true; + parent = parent.parent; + } + } + this.expanded = true; + if (callback) callback(); + }; + + if (this.shouldLoadData()) { + this.loadData((data) => { + if (data instanceof Array) { + if (this.checked) { + this.setChecked(true, true); + } else if (!this.store.checkStrictly) { + reInitChecked(this); + } + done(); + } + }); + } else { + done(); + } + } + + doCreateChildren(array, defaultProps = {}) { + array.forEach((item) => { + this.insertChild(objectAssign({ data: item }, defaultProps), undefined, true); + }); + } + + collapse() { + this.expanded = false; + } + + shouldLoadData() { + return this.store.lazy === true && this.store.load && !this.loaded; + } + + updateLeafState() { + if (this.store.lazy === true && this.loaded !== true && typeof this.isLeafByUser !== 'undefined') { + this.isLeaf = this.isLeafByUser; + return; + } + const childNodes = this.childNodes; + if (!this.store.lazy || (this.store.lazy === true && this.loaded === true)) { + this.isLeaf = !childNodes || childNodes.length === 0; + return; + } + this.isLeaf = false; + } + + setChecked(value, deep, recursion, passValue) { + this.indeterminate = value === 'half'; + this.checked = value === true; + + if (this.store.checkStrictly) return; + + if (!(this.shouldLoadData() && !this.store.checkDescendants)) { + let { all, allWithoutDisable } = getChildState(this.childNodes); + + if (!this.isLeaf && (!all && allWithoutDisable)) { + this.checked = false; + value = false; + } + + const handleDescendants = () => { + if (deep) { + const childNodes = this.childNodes; + for (let i = 0, j = childNodes.length; i < j; i++) { + const child = childNodes[i]; + passValue = passValue || value !== false; + const isCheck = child.disabled ? child.checked : passValue; + child.setChecked(isCheck, deep, true, passValue); + } + const { half, all } = getChildState(childNodes); + if (!all) { + this.checked = all; + this.indeterminate = half; + } + } + }; + + if (this.shouldLoadData()) { + // Only work on lazy load data. + this.loadData(() => { + handleDescendants(); + reInitChecked(this); + }, { + checked: value !== false + }); + return; + } else { + handleDescendants(); + } + } + + const parent = this.parent; + if (!parent || parent.level === 0) return; + + if (!recursion) { + reInitChecked(parent); + } + } + + getChildren(forceInit = false) { // this is data + if (this.level === 0) return this.data; + const data = this.data; + if (!data) return null; + + const props = this.store.props; + let children = 'children'; + if (props) { + children = props.children || 'children'; + } + + if (data[children] === undefined) { + data[children] = null; + } + + if (forceInit && !data[children]) { + data[children] = []; + } + + return data[children]; + } + + updateChildren() { + const newData = this.getChildren() || []; + const oldData = this.childNodes.map((node) => node.data); + + const newDataMap = {}; + const newNodes = []; + + newData.forEach((item, index) => { + const key = item[NODE_KEY]; + const isNodeExists = !!key && arrayFindIndex(oldData, data => data[NODE_KEY] === key) >= 0; + if (isNodeExists) { + newDataMap[key] = { index, data: item }; + } else { + newNodes.push({ index, data: item }); + } + }); + + if (!this.store.lazy) { + oldData.forEach((item) => { + if (!newDataMap[item[NODE_KEY]]) this.removeChildByData(item); + }); + } + + newNodes.forEach(({ index, data }) => { + this.insertChild({ data }, index); + }); + + this.updateLeafState(); + } + + loadData(callback, defaultProps = {}) { + if (this.store.lazy === true && this.store.load && !this.loaded && (!this.loading || Object.keys(defaultProps).length)) { + this.loading = true; + + const resolve = (children) => { + this.loaded = true; + this.loading = false; + this.childNodes = []; + + this.doCreateChildren(children, defaultProps); + + this.updateLeafState(); + if (callback) { + callback.call(this, children); + } + }; + + this.store.load(this, resolve); + } else { + if (callback) { + callback.call(this); + } + } + } +} diff --git a/supervise-crm-ui/src/utils/tree/src/model/tree-store.js b/supervise-crm-ui/src/utils/tree/src/model/tree-store.js new file mode 100644 index 00000000..d0bcd3ea --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/src/model/tree-store.js @@ -0,0 +1,340 @@ +import Node from './node'; +import { getNodeKey } from './util'; + +export default class TreeStore { + constructor(options) { + this.currentNode = null; + this.currentNodeKey = null; + + for (let option in options) { + if (options.hasOwnProperty(option)) { + this[option] = options[option]; + } + } + + this.nodesMap = {}; + + this.root = new Node({ + data: this.data, + store: this + }); + + if (this.lazy && this.load) { + const loadFn = this.load; + loadFn(this.root, (data) => { + this.root.doCreateChildren(data); + this._initDefaultCheckedNodes(); + }); + } else { + this._initDefaultCheckedNodes(); + } + } + + filter(value) { + const filterNodeMethod = this.filterNodeMethod; + const lazy = this.lazy; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + child.visible = filterNodeMethod.call(child, value, child.data, child); + + traverse(child); + }); + + if (!node.visible && childNodes.length) { + let allHidden = true; + allHidden = !childNodes.some(child => child.visible); + + if (node.root) { + node.root.visible = allHidden === false; + } else { + node.visible = allHidden === false; + } + } + if (!value) return; + + if (node.visible && !node.isLeaf && !lazy) node.expand(); + }; + + traverse(this); + } + + setData(newVal) { + const instanceChanged = newVal !== this.root.data; + if (instanceChanged) { + this.root.setData(newVal); + this._initDefaultCheckedNodes(); + } else { + this.root.updateChildren(); + } + } + + getNode(data) { + if (data instanceof Node) return data; + const key = typeof data !== 'object' ? data : getNodeKey(this.key, data); + return this.nodesMap[key] || null; + } + + insertBefore(data, refData) { + const refNode = this.getNode(refData); + refNode.parent.insertBefore({ data }, refNode); + } + + insertAfter(data, refData) { + const refNode = this.getNode(refData); + refNode.parent.insertAfter({ data }, refNode); + } + + remove(data) { + const node = this.getNode(data); + + if (node && node.parent) { + if (node === this.currentNode) { + this.currentNode = null; + } + node.parent.removeChild(node); + } + } + + append(data, parentData) { + const parentNode = parentData ? this.getNode(parentData) : this.root; + + if (parentNode) { + parentNode.insertChild({ data }); + } + } + + _initDefaultCheckedNodes() { + const defaultCheckedKeys = this.defaultCheckedKeys || []; + const nodesMap = this.nodesMap; + + defaultCheckedKeys.forEach((checkedKey) => { + const node = nodesMap[checkedKey]; + + if (node) { + node.setChecked(true, !this.checkStrictly); + } + }); + } + + _initDefaultCheckedNode(node) { + const defaultCheckedKeys = this.defaultCheckedKeys || []; + + if (defaultCheckedKeys.indexOf(node.key) !== -1) { + node.setChecked(true, !this.checkStrictly); + } + } + + setDefaultCheckedKey(newVal) { + if (newVal !== this.defaultCheckedKeys) { + this.defaultCheckedKeys = newVal; + this._initDefaultCheckedNodes(); + } + } + + registerNode(node) { + const key = this.key; + if (!key || !node || !node.data) return; + + const nodeKey = node.key; + if (nodeKey !== undefined) this.nodesMap[node.key] = node; + } + + deregisterNode(node) { + const key = this.key; + if (!key || !node || !node.data) return; + + node.childNodes.forEach(child => { + this.deregisterNode(child); + }); + + delete this.nodesMap[node.key]; + } + + getCheckedNodes(leafOnly = false, includeHalfChecked = false) { + const checkedNodes = []; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + if ((child.checked || (includeHalfChecked && child.indeterminate)) && (!leafOnly || (leafOnly && child.isLeaf))) { + checkedNodes.push(child.data); + } + + traverse(child); + }); + }; + + traverse(this); + + return checkedNodes; + } + + getCheckedKeys(leafOnly = false) { + return this.getCheckedNodes(leafOnly).map((data) => (data || {})[this.key]); + } + + getHalfCheckedNodes() { + const nodes = []; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + if (child.indeterminate) { + nodes.push(child.data); + } + + traverse(child); + }); + }; + + traverse(this); + + return nodes; + } + + getHalfCheckedKeys() { + return this.getHalfCheckedNodes().map((data) => (data || {})[this.key]); + } + + _getAllNodes() { + const allNodes = []; + const nodesMap = this.nodesMap; + for (let nodeKey in nodesMap) { + if (nodesMap.hasOwnProperty(nodeKey)) { + allNodes.push(nodesMap[nodeKey]); + } + } + + return allNodes; + } + + updateChildren(key, data) { + const node = this.nodesMap[key]; + if (!node) return; + const childNodes = node.childNodes; + for (let i = childNodes.length - 1; i >= 0; i--) { + const child = childNodes[i]; + this.remove(child.data); + } + for (let i = 0, j = data.length; i < j; i++) { + const child = data[i]; + this.append(child, node.data); + } + } + + _setCheckedKeys(key, leafOnly = false, checkedKeys) { + const allNodes = this._getAllNodes().sort((a, b) => b.level - a.level); + const cache = Object.create(null); + const keys = Object.keys(checkedKeys); + allNodes.forEach(node => node.setChecked(false, false)); + for (let i = 0, j = allNodes.length; i < j; i++) { + const node = allNodes[i]; + const nodeKey = node.data[key].toString(); + let checked = keys.indexOf(nodeKey) > -1; + if (!checked) { + if (node.checked && !cache[nodeKey]) { + node.setChecked(false, false); + } + continue; + } + + let parent = node.parent; + while (parent && parent.level > 0) { + cache[parent.data[key]] = true; + parent = parent.parent; + } + + if (node.isLeaf || this.checkStrictly) { + node.setChecked(true, false); + continue; + } + node.setChecked(true, true); + + if (leafOnly) { + node.setChecked(false, false); + const traverse = function(node) { + const childNodes = node.childNodes; + childNodes.forEach((child) => { + if (!child.isLeaf) { + child.setChecked(false, false); + } + traverse(child); + }); + }; + traverse(node); + } + } + } + + setCheckedNodes(array, leafOnly = false) { + const key = this.key; + const checkedKeys = {}; + array.forEach((item) => { + checkedKeys[(item || {})[key]] = true; + }); + + this._setCheckedKeys(key, leafOnly, checkedKeys); + } + + setCheckedKeys(keys, leafOnly = false) { + this.defaultCheckedKeys = keys; + const key = this.key; + const checkedKeys = {}; + keys.forEach((key) => { + checkedKeys[key] = true; + }); + + this._setCheckedKeys(key, leafOnly, checkedKeys); + } + + setDefaultExpandedKeys(keys) { + keys = keys || []; + this.defaultExpandedKeys = keys; + + keys.forEach((key) => { + const node = this.getNode(key); + if (node) node.expand(null, this.autoExpandParent); + }); + } + + setChecked(data, checked, deep) { + const node = this.getNode(data); + + if (node) { + node.setChecked(!!checked, deep); + } + } + + getCurrentNode() { + return this.currentNode; + } + + setCurrentNode(currentNode) { + const prevCurrentNode = this.currentNode; + if (prevCurrentNode) { + prevCurrentNode.isCurrent = false; + } + this.currentNode = currentNode; + this.currentNode.isCurrent = true; + } + + setUserCurrentNode(node) { + const key = node[this.key]; + const currNode = this.nodesMap[key]; + this.setCurrentNode(currNode); + } + + setCurrentNodeKey(key) { + if (key === null || key === undefined) { + this.currentNode && (this.currentNode.isCurrent = false); + this.currentNode = null; + return; + } + const node = this.getNode(key); + if (node) { + this.setCurrentNode(node); + } + } +}; diff --git a/supervise-crm-ui/src/utils/tree/src/model/util.js b/supervise-crm-ui/src/utils/tree/src/model/util.js new file mode 100644 index 00000000..dcc891b1 --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/src/model/util.js @@ -0,0 +1,27 @@ +export const NODE_KEY = '$treeNodeId'; + +export const markNodeData = function(node, data) { + if (!data || data[NODE_KEY]) return; + Object.defineProperty(data, NODE_KEY, { + value: node.id, + enumerable: false, + configurable: false, + writable: false + }); +}; + +export const getNodeKey = function(key, data) { + if (!key) return data[NODE_KEY]; + return data[key]; +}; + +export const findNearestComponent = (element, componentName) => { + let target = element; + while (target && target.tagName !== 'BODY') { + if (target.__vue__ && target.__vue__.$options.name === componentName) { + return target.__vue__; + } + target = target.parentNode; + } + return null; +}; diff --git a/supervise-crm-ui/src/utils/tree/src/tree-node.vue b/supervise-crm-ui/src/utils/tree/src/tree-node.vue new file mode 100644 index 00000000..bb83de36 --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/src/tree-node.vue @@ -0,0 +1,279 @@ + + + diff --git a/supervise-crm-ui/src/utils/tree/src/tree.vue b/supervise-crm-ui/src/utils/tree/src/tree.vue new file mode 100644 index 00000000..5b1c1b4c --- /dev/null +++ b/supervise-crm-ui/src/utils/tree/src/tree.vue @@ -0,0 +1,496 @@ + + + diff --git a/supervise-crm-ui/src/views/projectStaff/index.vue b/supervise-crm-ui/src/views/projectStaff/index.vue index 2b49e0c2..d0763c7d 100644 --- a/supervise-crm-ui/src/views/projectStaff/index.vue +++ b/supervise-crm-ui/src/views/projectStaff/index.vue @@ -49,18 +49,19 @@
-
+ style=" width: 100%;display: flex;flex-direction: row; align-items: center;flex-shrink: 1;" + :class="{'checkbox':data.isOrg==='1'}">
{{ node.label }}
- +
@@ -75,13 +76,15 @@ + + \ No newline at end of file diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue index f9256bcb..5ad47dec 100644 --- a/supervise-uniapp/pages/index/RegulatoryReporting.vue +++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue @@ -4,28 +4,40 @@ {{info.projectName}} - {{info.orderDate}} - - - - - - + + {{info.orderDate}} + + - - 贷款总额：{{info.totalLoanWan==''?'--':info.totalLoanWan}}万元 - + + + + - 报表下载 + 报表下载 - + + + + + + + + + 总授信：{{info.creditLimit}}元 + 总用信：{{info.useLimit}}元 + + - - + - + - - + + - - 账户余额 - {{info.accountsBalanceWan }}万元 + + 账户余额 + {{info.accountsBalanceWan }}万元 + + + - - - + - - + + - - 应收账款 - {{info.accountsReceivableWan }}万元 + + 应收账款 + {{info.accountsReceivableWan }}万元 + + + - - - + - - + + - - 库存货值 - {{info.stockAmountWan }}万元 + + 库存货值 + {{info.stockAmountWan }}万元 + + + - - - + - - + + - - 在途货值 - {{info.transitAmountWan }}万元 + + 在途货值 + {{info.transitAmountWan }}万元 + + + - - - + - - + + - - 预付款 - {{info.advancePaymentWan }}万元 + + 预付款 + {{info.advancePaymentWan }}万元 + + + - + + + + + + + + + + 暂无数据 + + + + + + + + \ No newline at end of file diff --git a/supervise-uniapp/static/baseIcon/calendar.png b/supervise-uniapp/static/baseIcon/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..479895a7c0b8ae5af9ddebae300343085a0eee22 GIT binary patch literal 2212 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 AN&o-= literal 0 HcmV?d00001 diff --git a/supervise-uniapp/utils/index.js b/supervise-uniapp/utils/index.js index e2a6bd72..fd55a2d4 100644 --- a/supervise-uniapp/utils/index.js +++ b/supervise-uniapp/utils/index.js @@ -16,6 +16,30 @@ function formatNumber(n) { return n[1] ? n : '0' + n } +// 获取前一天 +//只需要改变这里就OK，-1是昨天，0是今天，1是后一天 +function beforeDay (today, addDayCount) { + let date; + if (today) { + date = new Date(today); + } else { + date = new Date(); + } + date.setDate(date.getDate() + addDayCount); //获取AddDayCount天后的日期 + let y = date.getFullYear(); + let m = date.getMonth() + 1; //获取当前月份的日期 + let d = date.getDate(); + if (m < 10) { + m = '0' + m; + }; + if (d < 10) { + d = '0' + d; + }; + console.log(y + "-" + m + "-" + d) + return y + "-" + m + "-" + d; +} + + /** * 时间戳转化为年 月 日 时 分 秒 * number: 传入时间戳 @@ -43,5 +67,6 @@ function formatTimeTwo(number, format) { module.exports = { formatTime: formatTime, - formatTimeTwo: formatTimeTwo + formatTimeTwo: formatTimeTwo , + beforeDay: beforeDay } \ No newline at end of file diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue index 43eae002..5c7f6f67 100644 --- a/yxt-portal-ui/src/views/Home/Home.vue +++ b/yxt-portal-ui/src/views/Home/Home.vue @@ -460,7 +460,7 @@ window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank') // window.open('/organizational/#/' + '?token=' + getStorage(), '_blank') } else if (index === 8) { - window.open('http://192.168.1.101:9531/#/' + '?token=' + getStorage(), '_blank') + window.open('http://192.168.1.103:9531/#/' + '?token=' + getStorage(), '_blank') // window.open('/crm/#/' + '?token=' + getStorage(), '_blank') } else if (index === 9) { // window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')