From fbe8b1adf4b50323b7ea6ad09c810cb3e07a69b9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 04 二月 2020 11:47:38 +0800
Subject: [PATCH] 2020-02-04
---
src/utils/utils.js | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4972675..3492fa5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -548,14 +548,21 @@
})
}
- if (verify && verify.billcodes.length > 0) {
+ if (verify && verify.billcodes.length > 0) { // 鍗曞彿鐢熸垚
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
- _ModularDetailCode = item.TypeCharOne + item.linkField
+ let _val = ''
+ if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+ _val = BID
+ } else if (data.hasOwnProperty(item.linkField)) {
+ _val = data[item.linkField]
+ }
+ _ModularDetailCode = item.TypeCharOne + _val
} else {
_ModularDetailCode = item.ModularDetailCode
}
+
_sql += `Declare @${item.field} nvarchar(50)
select @BillCode='', @${item.field}=''
exec s_get_BillCode
@@ -600,7 +607,10 @@
let keys = []
let values = []
formdata.forEach(item => {
- if (item.type === 'number') {
+ if (item.type === 'funcvar') {
+ keys.push(item.key)
+ values.push('@' + item.key)
+ } else if (item.type === 'number') {
keys.push(item.key)
values.push(item.value)
} else {
@@ -608,6 +618,7 @@
values.push('\'' + item.value + '\'')
}
})
+
keys = keys.join(',')
values = values.join(',')
_sql += `declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -617,7 +628,9 @@
} else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
let _form = []
formdata.forEach(item => {
- if (item.type === 'number') {
+ if (item.type === 'funcvar') {
+ _form.push(item.key + '=@' + item.key)
+ } else if (item.type === 'number') {
_form.push(item.key + '=' + item.value)
} else {
_form.push(item.key + '=\'' + item.value + '\'')
@@ -913,7 +926,7 @@
ROLLBACK TRAN
END`
- console.log(Ltext)
+
Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
return Ltext
--
Gitblit v1.8.0