From 0c86e5e2eaf907dfcb63aea13e6efac3ccc52cce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2020 11:06:20 +0800
Subject: [PATCH] 2020-02-25
---
src/utils/utils.js | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6de456a..2fa05f9 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -550,6 +550,25 @@
fields = fields.join(',')
+ let _insert = ''
+
+ if (btn.default !== 'false') {
+ _insert = `
+ Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid)
+ Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
+ `
+ }
+
+ if (btn.scripts && btn.scripts.length > 0) {
+ btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ _insert += `
+ ${script.sql}
+ `
+ })
+ }
+
_sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
@@ -559,10 +578,7 @@
Insert into @${item.sheet} (${fields},jskey)
${_Ltext}
-
- Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid)
- Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
-
+ ${_insert}
Delete @${item.sheet}
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
@@ -1021,7 +1037,6 @@
config.search.forEach(item => {
if (item.field) {
let type = ''
- let _f = item.field
if (item.type.match(/date/ig)) {
type = 'datetime=null'
@@ -1029,12 +1044,15 @@
type = 'nvarchar(50)=\'\''
}
- if (_fields.has(item.field)) {
- _f = _f + '1'
- }
-
- _fields.set(item.field, true)
- formParam = formParam + `mchr13k@${_f} ${type},`
+ item.field.split(',').forEach(cell => {
+ let _f = cell
+ if (_fields.has(cell)) {
+ _f = _f + '1'
+ }
+
+ _fields.set(cell, true)
+ formParam = formParam + `mchr13k@${_f} ${type},`
+ })
}
})
}
--
Gitblit v1.8.0