From 1a14ff6035932eadfb6ef7970e3adb24b4e158a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十二月 2019 18:56:17 +0800
Subject: [PATCH] 2019-12-18
---
src/utils/utils.js | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 62df4d8..840f7b1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -223,7 +223,7 @@
}
/**
- * @description 鎷兼帴鎼滅储鏉′欢
+ * @description 鎷兼帴鎼滅储鏉′欢main
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
*/
@@ -244,12 +244,17 @@
let timetail = ' 00:00:00.000'
if (item.match === '<' || item.match === '<=') {
timetail = ' 23:59:59.999'
+ } else if (item.match === '=') {
+ timetail = ''
}
// eslint-disable-next-line
searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + timetail + '\')'
} else if (item.type === 'datemonth') {
+ // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
+ let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM').endOf('month').format('YYYY-MM-DD') + ' 23:59:59.999'
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
+ searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + _startval + '\' AND \'' + _endval + '\')'
} else if (item.type === 'dateweek') {
let stimetail = ' 00:00:00.000'
let etimetail = ' 23:59:59.999'
@@ -269,7 +274,7 @@
}
/**
- * @description 鎷兼帴鎼滅储鏉′欢
+ * @description 鎷兼帴鎼滅储鏉′欢datamanage
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
*/
@@ -323,8 +328,6 @@
* @return {String} table 琛ㄥ悕
*/
static getSysDefaultSql (btn, setting, formdata) {
- console.log(btn)
- console.log(formdata)
let _sql = ''
if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
let keys = []
@@ -358,14 +361,6 @@
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') {
_sql = `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: id='+@id,@userid delete ${btn.sql} where ${setting.primaryKey}=@id`
}
- //insert into 琛ㄥ悕 (琛ㄥ崟瀛楁锛岄�楀彿鍒嗛殧锛屽鏋滀富閿负鍙紪杈戝垯浼犲～鍐欏唴瀹癸紝鍙鎴栨病鏈夐厤缃〃鍗曪紝鍒欎紶鍓嶇鐢熸垚id,+createuserid)
- // +select 琛ㄥ崟瀛楁鍊�+@userid
-
- // 淇敼锛歶pdate 琛ㄥ悕 set 琛ㄥ崟闈炲彧璇诲瓧娈�=琛ㄥ崟鍊硷紝modifydate=getdate(),modifyuserid=@userid where 涓婚敭=@id琛宨d
-
- // 閫昏緫鍒犻櫎:update 琛ㄥ悕 set deleted=1锛宮odifydate=getdate(),modifyuserid=@userid where 涓婚敭=@id琛宨d
-
- // 鐗╃悊鍒犻櫎锛歩nsert into snote (remark,createuserid) select '鍒犻櫎琛� '+琛ㄥ悕+'鏁版嵁 '+id=@id delete 琛ㄥ悕 where 涓婚敭=@id琛宨d
console.log(_sql)
return _sql
}
@@ -382,10 +377,11 @@
* @description 鍒涘缓瀛樺偍杩囩▼
* @return {String}
*/
- static getfunc (param) {
+ static getfunc (param, btn, menu, columns) {
let form = ''
let formParam = ''
-
+ console.log(menu)
+ console.log(columns)
if (param.fields && param.fields.length > 0) {
let _fields = []
param.fields.forEach(item => {
@@ -420,8 +416,33 @@
`
}
+ if (columns) {
+ let _col = []
+ let _field = []
+ columns.forEach(col => {
+ if (col.field) {
+ if (col.type === 'number') {
+ _col.push(col.field + ' decimal(18,2)')
+ } else {
+ _col.push(col.field + ' nvarchar(50)')
+ }
+ _field.push(col.field)
+ }
+ })
+ _col = _col.join(',')
+ _field = _field.join(',')
+
+ form = form + `
+ declare @dc table (${_col})
+
+ insert into @dc (${_field})
+
+ @tableid ='${menu.MenuID}'
+ `
+ }
+
let Ltext = `create proc ${param.funcName}
- (
+ ( /*${menu.MenuName} ${btn.label}*/
@BID nvarchar(50)='',
@ID nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@@ -490,8 +511,9 @@
ROLLBACK TRAN
END`
- Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
console.log(Ltext)
+ Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
+
return Ltext
}
}
\ No newline at end of file
--
Gitblit v1.8.0