From a117f28f890f89bfef46b0920b4861b542cd395b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 13:46:27 +0800
Subject: [PATCH] 回款登记功能修改
---
src/utils/ruoyi.js | 144 +++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 81 deletions(-)
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 2714962..0d72c1a 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -1,5 +1,3 @@
-
-
/**
* 閫氱敤js鏂规硶灏佽澶勭悊
* Copyright (c) 2019 ruoyi
@@ -18,7 +16,7 @@
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
} else if (typeof time === 'string') {
- time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+ time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '')
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
@@ -49,89 +47,89 @@
// 琛ㄥ崟閲嶇疆
export function resetForm(refName) {
if (this.$refs[refName]) {
- this.$refs[refName].resetFields();
+ this.$refs[refName].resetFields()
}
}
// 娣诲姞鏃ユ湡鑼冨洿
export function addDateRange(params, dateRange, propName) {
- let search = params;
- search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
- dateRange = Array.isArray(dateRange) ? dateRange : [];
+ let search = params
+ search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
+ dateRange = Array.isArray(dateRange) ? dateRange : []
if (typeof (propName) === 'undefined') {
- search.params['beginTime'] = dateRange[0];
- search.params['endTime'] = dateRange[1];
+ search.params['beginTime'] = dateRange[0]
+ search.params['endTime'] = dateRange[1]
} else {
- search.params['begin' + propName] = dateRange[0];
- search.params['end' + propName] = dateRange[1];
+ search.params['begin' + propName] = dateRange[0]
+ search.params['end' + propName] = dateRange[1]
}
- return search;
+ return search
}
// 鍥炴樉鏁版嵁瀛楀吀
export function selectDictLabel(datas, value) {
if (value === undefined) {
- return "";
+ return ""
}
- var actions = [];
+ var actions = []
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + value)) {
- actions.push(datas[key].label);
- return true;
+ actions.push(datas[key].label)
+ return true
}
})
if (actions.length === 0) {
- actions.push(value);
+ actions.push(value)
}
- return actions.join('');
+ return actions.join('')
}
-// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
+// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆銆佹暟缁勶級
export function selectDictLabels(datas, value, separator) {
if (value === undefined || value.length ===0) {
- return "";
+ return ""
}
if (Array.isArray(value)) {
- value = value.join(",");
+ value = value.join(",")
}
- var actions = [];
- var currentSeparator = undefined === separator ? "," : separator;
- var temp = value.split(currentSeparator);
+ var actions = []
+ var currentSeparator = undefined === separator ? "," : separator
+ var temp = value.split(currentSeparator)
Object.keys(value.split(currentSeparator)).some((val) => {
- var match = false;
+ var match = false
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + temp[val])) {
- actions.push(datas[key].label + currentSeparator);
- match = true;
+ actions.push(datas[key].label + currentSeparator)
+ match = true
}
})
if (!match) {
- actions.push(temp[val] + currentSeparator);
+ actions.push(temp[val] + currentSeparator)
}
})
- return actions.join('').substring(0, actions.join('').length - 1);
+ return actions.join('').substring(0, actions.join('').length - 1)
}
// 瀛楃涓叉牸寮忓寲(%s )
export function sprintf(str) {
- var args = arguments, flag = true, i = 1;
+ var args = arguments, flag = true, i = 1
str = str.replace(/%s/g, function () {
- var arg = args[i++];
+ var arg = args[i++]
if (typeof arg === 'undefined') {
- flag = false;
- return '';
+ flag = false
+ return ''
}
- return arg;
- });
- return flag ? str : '';
+ return arg
+ })
+ return flag ? str : ''
}
// 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负""
export function parseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") {
- return "";
+ return ""
}
- return str;
+ return str
}
// 鏁版嵁鍚堝苟
@@ -139,16 +137,16 @@
for (var p in target) {
try {
if (target[p].constructor == Object) {
- source[p] = mergeRecursive(source[p], target[p]);
+ source[p] = mergeRecursive(source[p], target[p])
} else {
- source[p] = target[p];
+ source[p] = target[p]
}
} catch (e) {
- source[p] = target[p];
+ source[p] = target[p]
}
}
- return source;
-};
+ return source
+}
/**
* 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
@@ -162,43 +160,28 @@
id: id || 'id',
parentId: parentId || 'parentId',
childrenList: children || 'children'
- };
+ }
- var childrenListMap = {};
- var nodeIds = {};
- var tree = [];
-
+ var childrenListMap = {}
+ var tree = []
for (let d of data) {
- let parentId = d[config.parentId];
- if (childrenListMap[parentId] == null) {
- childrenListMap[parentId] = [];
+ let id = d[config.id]
+ childrenListMap[id] = d
+ if (!d[config.childrenList]) {
+ d[config.childrenList] = []
}
- nodeIds[d[config.id]] = d;
- childrenListMap[parentId].push(d);
}
for (let d of data) {
- let parentId = d[config.parentId];
- if (nodeIds[parentId] == null) {
- tree.push(d);
+ let parentId = d[config.parentId]
+ let parentObj = childrenListMap[parentId]
+ if (!parentObj) {
+ tree.push(d)
+ } else {
+ parentObj[config.childrenList].push(d)
}
}
-
- for (let t of tree) {
- adaptToChildrenList(t);
- }
-
- function adaptToChildrenList(o) {
- if (childrenListMap[o[config.id]] !== null) {
- o[config.childrenList] = childrenListMap[o[config.id]];
- }
- if (o[config.childrenList]) {
- for (let c of o[config.childrenList]) {
- adaptToChildrenList(c);
- }
- }
- }
- return tree;
+ return tree
}
/**
@@ -208,36 +191,35 @@
export function tansParams(params) {
let result = ''
for (const propName of Object.keys(params)) {
- const value = params[propName];
- var part = encodeURIComponent(propName) + "=";
+ const value = params[propName]
+ var part = encodeURIComponent(propName) + "="
if (value !== null && value !== "" && typeof (value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
- let params = propName + '[' + key + ']';
- var subPart = encodeURIComponent(params) + "=";
- result += subPart + encodeURIComponent(value[key]) + "&";
+ let params = propName + '[' + key + ']'
+ var subPart = encodeURIComponent(params) + "="
+ result += subPart + encodeURIComponent(value[key]) + "&"
}
}
} else {
- result += part + encodeURIComponent(value) + "&";
+ result += part + encodeURIComponent(value) + "&"
}
}
}
return result
}
-
// 杩斿洖椤圭洰璺緞
export function getNormalPath(p) {
if (p.length === 0 || !p || p == 'undefined') {
return p
- };
+ }
let res = p.replace('//', '/')
if (res[res.length - 1] === '/') {
return res.slice(0, res.length - 1)
}
- return res;
+ return res
}
// 楠岃瘉鏄惁涓篵lob鏍煎紡
--
Gitblit v1.9.3