From f0602b981659c6d1ff18e8dba4ca1ce89c5f5610 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 22 三月 2020 21:18:34 +0800
Subject: [PATCH] 2020-03-22
---
src/utils/utils.js | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 9edfb85..a3abb26 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -194,7 +194,9 @@
key: search.field,
match: search.match,
type: search.type,
- value: search.initval
+ label: search.label,
+ value: search.initval,
+ required: search.required === 'true'
}
if (item.type === 'date') {
item.value = item.value ? moment().subtract(item.value, 'days').format('YYYY-MM-DD') : ''
@@ -287,6 +289,12 @@
newsearches[item.key] = item.value.join(',')
} else {
newsearches[item.key] = item.value
+ }
+ })
+
+ Object.keys(newsearches).forEach(key => {
+ if (!newsearches[key]) {
+ delete newsearches[key]
}
})
@@ -1112,6 +1120,7 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@@ -1269,8 +1278,15 @@
`
}
+ // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
+ let _printRemark = ''
+ if (btn.funcType === 'print') {
+ _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
+ }
+
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@@ -1291,7 +1307,7 @@
/*浜嬪姟鎿嶄綔*/
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
-
+ ${_printRemark}
/*
select top 10 * from sProcExcep order by id desc
@@ -1378,10 +1394,13 @@
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@ID nvarchar(50)='',
@BID nvarchar(50)='',
@Ltext nvarchar(max)='',
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
+ @secretkey nvarchar(50)='',
+ @timestamp nvarchar(50)='',
@lang nvarchar(50)='',
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
--
Gitblit v1.8.0