From b4744510a44b2f59b7ecece75085d4b70da2b059 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2020 19:02:50 +0800
Subject: [PATCH] 2020-02-05
---
src/utils/utils.js | 119 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2f0b702..df4d668 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -450,9 +450,8 @@
let BID = param.BID
let verify = btn.verify
let _formFieldValue = {}
-
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName']
+ let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -468,8 +467,50 @@
})
}
+ // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�
+ if (data) {
+ _formFieldValue = {...data, ..._formFieldValue}
+ }
+
+ // 娣诲姞鏃朵富閿负绌�
+ if (btn.sqlType === 'insert') {
+ primaryId = ''
+ }
+
+ // 澹版槑琛ㄥ崟鍙婂垪琛ㄦ暟鎹瓧娈碉紝鍒濆鍖栬祴鍊�
+ let keys = Object.keys(_formFieldValue)
+ let _initfields = []
+ let _initvars = ['ID', 'BID']
+ let _formfields = []
+ keys.forEach(key => {
+ if (!_initvars.includes(key)) {
+ _initvars.push(key)
+ _initfields.push(`@${key}='${_formFieldValue[key]}'`)
+ }
+
+ if (!_vars.includes(key)) {
+ _vars.push(key)
+ _formfields.push(`@${key} nvarchar(50)`)
+ }
+ })
+
+ _formfields = _formfields.join(',')
+ if (_formfields) {
+ _sql += `,${_formfields}
+ `
+ }
+
+ _initfields = _initfields.join(',')
+ if (_initfields) {
+ _sql += `select ${_initfields}
+ `
+ }
+
// 鍘婚櫎绂佺敤鐨勯獙璇�
if (verify) {
+ if (verify.contrasts) {
+ verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
+ }
if (verify.uniques) {
verify.uniques = verify.uniques.filter(item => item.status !== 'false')
}
@@ -482,28 +523,6 @@
if (verify.scripts) {
verify.scripts = verify.scripts.filter(item => item.status !== 'false')
}
- }
-
- // 璁剧疆鏈夎嚜瀹氫箟鑴氭湰鏃讹紝澹版槑鍙橀噺涓坊鍔犳墍鏈夎〃鍗曞瓧娈碉紝骞堕伩鍏嶉噸澶�
- if (verify && verify.scripts && verify.scripts.length > 0 && formdata && formdata.length > 0) {
- let _initfields = []
- let _formfields = formdata.filter(form => {
- _initfields.push(`@${form.key}='${form.value}'`)
-
- return !_vars.includes(form.key)
- })
-
- _formfields = _formfields.map(form => {
- _vars.push(form.key)
- return `@${form.key} nvarchar(50)`
- })
- _formfields = _formfields.join(',')
- _sql += `,${_formfields}
- `
- _initfields = _initfields.join(',')
- _sql += `select ${_initfields}
- `
-
}
// 鍒濆鍖栧嚟璇佸瓧娈�
@@ -535,13 +554,20 @@
`
}
+ // 姣旇緝楠岃瘉
+ if (verify && verify.contrasts && verify.contrasts.length > 0) {
+ verify.contrasts.forEach(item => {
+ _sql += `If ${item.frontfield} ${item.operator} ${item.backfield}
+ Begin
+ select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
+ goto aaa
+ end
+ `
+ })
+ }
+
// 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
if (formdata && verify && verify.uniques.length > 0) {
- let _primaryId = primaryId
- if (btn.sqlType === 'insert') {
- _primaryId = ''
- }
-
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
@@ -552,8 +578,13 @@
_value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
})
+ let _verifyType = ''
+ if (item.verifyType === 'logic') {
+ _verifyType = ' and deleted=0'
+ }
+
_sql += `select @tbid='', @ErrorCode='',@retmsg=''
- select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${_primaryId}'
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${primaryId}'${_verifyType}
If @tbid!=''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -563,35 +594,11 @@
})
}
- // 鑷畾涔夐獙璇侊紝浣跨敤鍒楄〃鍙婅〃鍗曟暟鎹紙琛ㄥ崟浼樺厛锛夛紝鏇挎崲鎵�鏈堾鐩稿悓瀛楁銆丂ID銆丂BID
+ // 鑷畾涔夐獙璇�
if (verify && verify.customverifys.length > 0) {
- let _primaryId = primaryId
- if (btn.sqlType === 'insert') {
- _primaryId = ''
- }
-
verify.customverifys.forEach(item => {
- let _cuSql = item.sql
- if (data) {
- _formFieldValue = {...data, ..._formFieldValue}
- }
- let keys = Object.keys(_formFieldValue)
- keys = keys.sort((a, b) => {
- return b.length - a.length
- })
-
- keys.forEach(key => {
- let reg = new RegExp('@' + key, 'ig')
- _cuSql = _cuSql.replace(reg, `'${_formFieldValue[key]}'`)
- })
- let idreg = new RegExp('@ID', 'ig')
- _cuSql = _cuSql.replace(idreg, `'${_primaryId}'`)
-
- let bidreg = new RegExp('@BID', 'ig')
- _cuSql = _cuSql.replace(bidreg, `'${BID}'`)
-
_sql += `select @tbid='', @ErrorCode='',@retmsg=''
- select top 1 @tbid='X' from (${_cuSql}) a
+ select top 1 @tbid='X' from (${item.sql}) a
If @tbid ${item.result === 'true' ? '!=' : '='}''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
--
Gitblit v1.8.0