From dce3eca3dc273be7a5bd66094b840bb6c4f763c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 21 十一月 2021 14:09:44 +0800
Subject: [PATCH] 2021-11-21
---
src/utils/utils.js | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 85b401e..e96a81f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -735,9 +735,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') { // 鏁版嵁鏉冮檺
@@ -1360,7 +1362,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 +1383,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)
@@ -1408,6 +1410,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}`)
@@ -1482,7 +1486,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}
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -2253,6 +2257,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