From 67a307d8f0fa25fbc56ee9f84c313d521280925f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 三月 2022 15:33:09 +0800
Subject: [PATCH] 2022-03-04
---
src/utils/utils.js | 119 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 29 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 85b401e..460b65f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -707,14 +707,16 @@
static getSelectQueryOptions (item) {
let arrfield = [item.valueField, item.valueText]
- if (item.type === 'link') {
- arrfield.push(item.linkField)
- } else if (item.type === 'checkcard') {
+ if (item.type === 'checkcard') {
arrfield = item.fields.map(f => f.field)
arrfield.push(item.cardValField)
if (item.urlField) {
arrfield.push(item.urlField)
}
+ }
+
+ if (item.linkField) {
+ arrfield.push(item.linkField)
}
if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
arrfield.push(...item.linkSubField)
@@ -735,9 +737,11 @@
arrfield = arrfield.join(',')
if (item.orderBy) {
- sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
+ // sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
+ sql = `select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} order by orderfield ${item.orderType}`
} else {
- sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
+ // sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
+ sql = `select distinct ${arrfield} from ${_datasource}`
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -1110,19 +1114,6 @@
database = database ? (database[0] || '') : ''
- let getuuid = () => {
- let uuid = []
- let timestamp = new Date().getTime()
- let _options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 19; i++) {
- uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- uuid = timestamp + uuid.join('')
- return uuid
- }
-
- // let upId = getuuid()
-
let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
@@ -1164,13 +1155,7 @@
})
let key = item.$$uuid
- let type = 'upt'
- if (key === '$new') {
- key = getuuid()
- type = 'add'
- } else if (item.$deleted) {
- type = 'del'
- }
+ let type = item.$type || 'upt'
vals.push(`'${key}'`)
vals.push(`'${type}'`)
@@ -1360,7 +1345,7 @@
})
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'login_city']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'login_city', 'bid']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -1381,7 +1366,7 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
- if (form.type === 'number') {
+ if (form.type === 'number' || form.type === 'rate') {
let val = form.value
if (typeof(val) !== 'number') {
val = parseFloat(val)
@@ -1390,6 +1375,8 @@
}
}
_initFormfields.push(`@${_key}=${val}`)
+ } else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
+ _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
} else {
_initFormfields.push(`@${_key}='${form.value}'`)
}
@@ -1408,6 +1395,8 @@
_type = 'datetime'
} else if (form.type === 'number') {
_type = `decimal(18,${form.fieldlen})`
+ } else if (form.type === 'rate') {
+ _type = `decimal(18,2)`
}
_declarefields.push(`@${_key} ${_type}`)
@@ -1432,7 +1421,7 @@
let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
- _val = '1900-01-01'
+ _val = '1949-10-01'
}
_initvars.push(_key)
@@ -1482,7 +1471,7 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@bid nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -2034,6 +2023,76 @@
}
/**
+ * @description 鑾峰彇鏍囪淇℃伅
+ */
+export function getMark (marks, record, style = {}) {
+ let icon = null
+ let color = null
+ let position = null
+ style = JSON.parse(JSON.stringify(style))
+
+ marks.some(mark => {
+ let originVal = record[mark.field[0]] + ''
+ let contrastVal = ''
+ let result = false
+
+ if (mark.field[1] === 'static') {
+ contrastVal = mark.contrastValue + ''
+ } else {
+ contrastVal = record[mark.field[2]] + ''
+ }
+
+ if (mark.match === '=') {
+ result = originVal === contrastVal
+ } else if (mark.match === '!=') {
+ result = originVal !== contrastVal
+ } else if (mark.match === 'like') {
+ result = originVal.indexOf(contrastVal) > -1
+ } else if (mark.match === '>') {
+ result = parseFloat(originVal) > parseFloat(contrastVal)
+ } else if (mark.match === '<') {
+ result = parseFloat(originVal) < parseFloat(contrastVal)
+ }
+
+ if (!result) return false
+
+ let type = mark.signType[0]
+
+ if (type === 'font') {
+ style.color = mark.color
+ } else if (type === 'background') {
+ style.background = mark.color
+ if (mark.fontColor) {
+ style.color = mark.fontColor
+ }
+ } else if (type === 'underline') {
+ style.textDecoration = 'underline'
+ style.color = mark.color
+ } else if (type === 'line-through') {
+ style.textDecoration = 'line-through'
+ style.color = mark.color
+ } else if (type.indexOf('icon') > -1) {
+ icon = mark.signType[mark.signType.length - 1]
+ color = mark.color
+ if (type === 'iconfront' || mark.signType[1] === 'front') {
+ position = 'front'
+ } else {
+ position = 'back'
+ }
+ }
+
+ return true
+ })
+
+ return {
+ style,
+ icon,
+ color,
+ position
+ }
+}
+
+/**
* @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
*/
export function setGLOBFuncs () {
@@ -2253,6 +2312,8 @@
type = 'datetime=null'
} else if (item.type === 'number') {
type = `decimal(18,${item.decimal})=0`
+ } else if (item.type === 'rate') {
+ type = `decimal(18,2)=0`
} else {
type = 'nvarchar(50)=\'\''
}
--
Gitblit v1.8.0