From 96455706619a0a2a96a836714e106f4c7a3bfd40 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 04 三月 2020 13:18:26 +0800
Subject: [PATCH] 2020-03-04
---
src/utils/utils.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index a5aa2dd..b5c9245 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -607,13 +607,13 @@
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
// let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
// let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey']
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
// 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
- let _sql = `Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50)
+ let _sql = `Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50)
`
// let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
@@ -828,16 +828,24 @@
if (verify.billcodes && verify.billcodes.length > 0) {
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
- if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
+ let _lpline = ''
+ if (item.TypeCharOne === 'Lp') {
+ if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@${item.linkField},48)`
+ }
+ _ModularDetailCode = '@ModularDetailCode'
+ } else if (item.TypeCharOne === 'BN') {
let _val = ''
if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
_val = BID
} else if (data && data.hasOwnProperty(item.linkField)) {
_val = data[item.linkField]
}
- _ModularDetailCode = item.TypeCharOne + _val
+ _ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
- _ModularDetailCode = item.ModularDetailCode
+ _ModularDetailCode = `'${item.ModularDetailCode}'`
}
let _declare = ''
@@ -849,9 +857,10 @@
}
_sql += `${_declare}
- select @BillCode='', @${_key}=''
+ select @BillCode='', @${_key}='', @ModularDetailCode=''
+ ${_lpline}
exec s_get_BillCode
- @ModularDetailCode='${_ModularDetailCode}',
+ @ModularDetailCode=${_ModularDetailCode},
@Type=${item.Type},
@TypeCharOne='${item.TypeCharOne}',
@TypeCharTwo ='${item.TypeCharTwo}',
--
Gitblit v1.8.0