From d38dc481492878c04ddf2d6bc2e9bf7d44c57fd7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十二月 2019 18:29:38 +0800
Subject: [PATCH] 2019-12-23
---
src/utils/utils.js | 331 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 279 insertions(+), 52 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 62df4d8..e5648a1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -213,8 +213,16 @@
item.value = item.value ? [moment().subtract(item.value * 7, 'days').startOf('week').format('YYYY-MM-DD'),
moment().subtract(item.value * 7, 'days').endOf('week').format('YYYY-MM-DD')] : ''
} else if (item.type === 'daterange') {
- item.value = item.value ? [moment().subtract(item.value, 'days').format('YYYY-MM-DD'),
- moment().subtract(item.value === 1 ? 1 : 0, 'days').format('YYYY-MM-DD')] : ''
+ let _val = item.value
+ if (_val) {
+ try {
+ _val = JSON.parse(_val)
+ } catch {
+ _val = ''
+ }
+ }
+ item.value = _val ? [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
+ moment().subtract(_val[1], 'days').format('YYYY-MM-DD')] : ''
}
newsearches.push(item)
})
@@ -223,7 +231,71 @@
}
/**
- * @description 鎷兼帴鎼滅储鏉′欢
+ * @description 鍒濆鍖栨悳绱㈡潯浠�
+ * @param {Array} searches 鎼滅储鏉′欢
+ * @return {String} searches 鏍煎紡鍖栧悗缁撴灉
+ */
+ static formatCustomMainSearch (searches) {
+ if (!searches || searches.length === 0) return {}
+
+ let newsearches = {}
+ searches.forEach(item => {
+ if (item.type === 'date') {
+ let timetail = ''
+ let _val = item.value
+
+ if (item.match === '<' || item.match === '<=') {
+ timetail = ' 00:00:00.000'
+ if (_val) {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+ } else if (item.match === '>' || item.match === '>=') {
+ timetail = ' 00:00:00.000'
+ }
+
+ if (newsearches[item.key]) {
+ newsearches[item.key + '1'] = _val ? _val + timetail : null
+ } else {
+ newsearches[item.key] = _val ? _val + timetail : null
+ }
+ } else if (item.type === 'datemonth') {
+ // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
+ let _startval = null
+ let _endval = null
+
+ if (item.value) {
+ _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+ _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ }
+
+ newsearches[item.key] = _startval
+ newsearches[item.key + '1'] = _endval
+ } else if (item.type === 'dateweek') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+
+ newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ } else if (item.type === 'daterange') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+
+ newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ } else {
+ newsearches[item.key] = item.value
+ }
+ })
+
+ return newsearches
+ }
+
+ /**
+ * @description 鎷兼帴鎼滅储鏉′欢main
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
*/
@@ -241,25 +313,37 @@
// eslint-disable-next-line
searchText += item.key + ' ' + item.match + ' ' + '\'' + str + item.value + str + '\''
} else if (item.type === 'date') {
+ let _val = item.value
let timetail = ' 00:00:00.000'
- if (item.match === '<' || item.match === '<=') {
- timetail = ' 23:59:59.999'
+ let _match = item.match
+
+ if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
+ _match = '<'
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ } else if (item.match === '=') {
+ timetail = ''
}
+
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + timetail + '\')'
- } else if (item.type === 'datemonth') {
+ searchText += '(' + item.key + ' ' + _match + ' ' + '\'' + _val + timetail + '\')'
+ } else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
+ 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').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
- } else if (item.type === 'dateweek') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
+ } else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
+ let _startval = item.value[0] + ' 00:00:00.000'
+ let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'daterange') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
+ let _startval = item.value[0] + ' 00:00:00.000'
+ let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else {
// eslint-disable-next-line
searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
@@ -269,7 +353,7 @@
}
/**
- * @description 鎷兼帴鎼滅储鏉′欢
+ * @description 鎷兼帴鎼滅储鏉′欢datamanage
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
*/
@@ -323,8 +407,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,15 +440,7 @@
} 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
}
@@ -379,52 +453,61 @@
}
/**
- * @description 鍒涘缓瀛樺偍杩囩▼
+ * @description 鍒涘缓椤甸潰瀛樺偍杩囩▼
* @return {String}
*/
- static getfunc (param) {
+ static getTableFunc (param, menu, config) {
let form = ''
let formParam = ''
+ let _columns = []
- if (param.fields && param.fields.length > 0) {
- let _fields = []
- param.fields.forEach(item => {
+ if (config.search && config.search.length > 0) {
+ let _fields = new Map()
+ config.search.forEach(item => {
if (item.field) {
let type = ''
+ let _f = item.field
+
if (item.type.match(/date/ig)) {
type = 'datetime=null'
- } else if (item.type === 'number') {
- type = `decimal(18,${item.decimal})=0`
} else {
type = 'nvarchar(50)=\'\''
}
- formParam = formParam + `mchr13k@${item.field} ${type},`
- _fields.push(item.field)
+ if (_fields.has(item.field)) {
+ _f = _f + '1'
+ }
+
+ _fields.set(item.field, true)
+ formParam = formParam + `mchr13k@${_f} ${type},`
+ }
+ })
+ }
+
+ if (config.columns && config.columns.length > 0) {
+ config.columns.forEach(item => {
+ if (item.field) {
+ _columns.push(`${item.field} as ${item.label}`)
}
})
- let field1 = _fields.join(',')
- let field2 = _fields.join(',@')
- let field3 = _fields.map(cell => {
- return cell + '=@' + cell
- })
-
- field2 = field2 ? '@' + field2 : ''
- field3 = field3.join(',')
-
form = `
- insert into ${param.name} (${field1},createuserid) select ${field2},@UserID
+ declare @dc table (${_columns.join(',')})
- update ${param.name} set ${field3},modifydate=getdate(),modifyuserid=@UserID
+ @tableid ='${menu.MenuID}'
`
}
- let Ltext = `create proc ${param.funcName}
- (
+ let Ltext = `create proc ${param.innerFunc}
+ ( /*${menu.MenuName}*/
@BID nvarchar(50)='',
@ID nvarchar(50)='',${formParam}
- @sEPTMenuNo nvarchar(50)='${param.menuNo}',
+ @PageIndex nvarchar(50)='',
+ @PageSize nvarchar(50)='',
+ @OrderCol nvarchar(50)='',
+ @OrderType nvarchar(50)='',
+ @exceltype nvarchar(50)='',
+ @sEPTMenuNo nvarchar(50)='${menu.MenuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
@LoginUID nvarchar(50)='',
@@ -444,7 +527,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -483,15 +566,159 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
ROLLBACK TRAN
END`
- Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
console.log(Ltext)
+ Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
+
+ return Ltext
+ }
+
+ /**
+ * @description 鍒涘缓瀛樺偍杩囩▼
+ * @return {String}
+ */
+ static getfunc (param, btn, menu, columns) {
+ let form = ''
+ let formParam = ''
+
+ if (param.fields && param.fields.length > 0) {
+ let _fields = []
+ param.fields.forEach(item => {
+ if (item.field) {
+ let type = ''
+ if (item.type.match(/date/ig)) {
+ type = 'datetime=null'
+ } else if (item.type === 'number') {
+ type = `decimal(18,${item.decimal})=0`
+ } else {
+ type = 'nvarchar(50)=\'\''
+ }
+ formParam = formParam + `mchr13k@${item.field} ${type},`
+
+ _fields.push(item.field)
+ }
+ })
+
+ let field1 = _fields.join(',')
+ let field2 = _fields.join(',@')
+ let field3 = _fields.map(cell => {
+ return cell + '=@' + cell
+ })
+
+ field2 = field2 ? '@' + field2 : ''
+ field3 = field3.join(',')
+
+ form = `
+ insert into ${param.name} (${field1},createuserid) select ${field2},@UserID
+
+ update ${param.name} set ${field3},modifydate=getdate(),modifyuserid=@UserID
+ `
+ }
+
+ 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}',
+ @lang nvarchar(50)='',
+ @debug nvarchar(50)='',
+ @LoginUID nvarchar(50)='',
+ @SessionUid nvarchar(50)='',
+ @UserID nvarchar(50),
+ @ErrorCode nvarchar(50) out,
+ @retmsg nvarchar(4000) out
+ )
+ as
+ begin
+ declare @BegindateTest datetime,@EnddateTest datetime
+ select @BegindateTest=getdate()
+ set @ErrorCode=''
+ set @retmsg=''
+ BEGIN TRY
+ /*浜嬪姟鎿嶄綔*/
+ BEGIN TRAN
+ /*鍏蜂綋涓氬姟鎿嶄綔*/
+
+ /*
+ select top 10 * from sProcExcep order by id desc
+
+ declare @UserName nvarchar(50),@FullName nvarchar(50)
+
+ select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
+ ${form}
+ if 1=2
+ begin
+ set @ErrorCode='E'
+ set @retmsg='鍦ㄦ鍐欐姤閿�'
+ goto GOTO_RETURN
+ end
+
+ insert into sNote (remark,createuserid,CreateUser,CreateStaff)
+ select '鍦ㄦ鍐欐棩蹇�',@UserID,@UserName,@FullName
+ */
+
+ COMMIT TRAN
+ SET NOCOUNT ON
+ RETURN
+ END TRY
+ BEGIN CATCH
+ /*閿欒澶勭悊*/
+ ROLLBACK TRAN
+ DECLARE @ErrorMessage NVARCHAR(4000);
+ DECLARE @ErrorSeverity INT;
+ DECLARE @ErrorState INT;
+
+ /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
+ set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
+ SET @retmsg=ERROR_MESSAGE();
+ SELECT @ErrorMessage=ERROR_MESSAGE(),
+ @ErrorSeverity=ERROR_SEVERITY(),
+ @ErrorState=ERROR_STATE();
+
+ RAISERROR(@ErrorMessage, /*-- Message text.*/
+ @ErrorSeverity, /*-- Severity.*/
+ @ErrorState /*-- State.*/
+ );
+ END CATCH
+
+ GOTO_RETURN:
+ ROLLBACK TRAN
+
+ END`
+
+ Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
+
return Ltext
}
}
\ No newline at end of file
--
Gitblit v1.8.0