From 1b0fd0a20d54068f0f4716177780e00a75b860ef Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 10 一月 2020 17:12:34 +0800
Subject: [PATCH] 2020-01-10
---
src/utils/utils.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4d2c968..ff237b6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -433,7 +433,11 @@
if (item.type === 'link') {
sql = 'select ' + item.valueField + ',' + item.valueText + ',' + item.linkField + ' from ' + _datasource
} else {
- sql = 'select ' + item.valueField + ',' + item.valueText + ' from ' + _datasource
+ let _linkSubField = '' // 涓嬫媺鑿滃崟鍏宠仈琛ㄥ崟
+ if (item.linkSubField && item.linkSubField.length > 0) {
+ _linkSubField = ',' + item.linkSubField.join(',')
+ }
+ sql = 'select ' + item.valueField + ',' + item.valueText + _linkSubField + ' from ' + _datasource
}
if (item.orderBy) {
@@ -449,7 +453,7 @@
* @return {String} table 琛ㄥ悕
*/
static getSysDefaultSql (btn, setting, formdata, param, data) {
- let primaryId = param[setting.primaryKey]
+ let primaryId = param.ID
let BID = param.BID
let verify = btn.verify
let _formFieldValue = {}
@@ -496,17 +500,18 @@
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
+ let _labels = item.fieldlabel.split(',')
- item.field.split(',').forEach(_field => {
+ item.field.split(',').forEach((_field, index) => {
_fieldValue.push(`${_field}='${_formFieldValue[_field]}'`)
- _value.push(_formFieldValue[_field])
+ _value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
})
_sql += `Select @tbid='', @ErrorCode='',@retmsg=''
Select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${_primaryId}'
If @tbid!=''
Begin
- select @ErrorCode='${item.errorCode}',@retmsg='${item.fieldlabel || ''}锛�${_value.join(' ')} 宸插瓨鍦�'
+ select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
goto aaa
end
`
--
Gitblit v1.8.0