From 0594fe8d97286a535177f8ba05972d0305fc7dee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 二月 2020 14:15:58 +0800
Subject: [PATCH] 2020-02-17

---
 src/utils/utils.js |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 9994fd0..ea8091e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -451,6 +451,7 @@
 
     let errors = []
     let _topline = btn.range || 0
+    let upId = this.getuuid()
     let _Ltext = data.map((item, lindex) => {
       let vals = btn.columns.map((col, cindex) => {
         let val = item[col.Column] !== undefined ? item[col.Column] : ''
@@ -520,7 +521,7 @@
       let _lineIndex = '0000' + (lindex + 1) + '0'
       _lineIndex = _lineIndex.substring(_lineIndex.length - 6)
 
-      vals.push(`@upid+'${_lineIndex}' as jskey`)
+      vals.push(`'${upId + _lineIndex}' as jskey`)
 
       return `Select ${vals.join(',')}`
     })
@@ -540,22 +541,20 @@
 
       fields = fields.join(',')
 
-      _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50) ,@upid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
+      _sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
 
       Select  @ErrorCode='', @retmsg=''
       
       select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
       
-      set @upid='${this.getuuid()}'
-     
-      Insert into  @${btn.sheet} (${fields},jskey)
+      Insert into  @${item.sheet} (${fields},jskey)
       ${_Ltext}
 
-      Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid,upid) 
-      Select ${fields},@userid@,@username,@fullname,@BID@,@upid From @${btn.sheet}
+      Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid) 
+      Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
 
-      Delete @${btn.sheet}
+      Delete @${item.sheet}
 
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
@@ -1288,24 +1287,22 @@
 
     fields = fields.join(',')
 
-    let _sql = `declare @${_verify.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@upid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
+    let _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
+      Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
       
       Select @ErrorCode='',@retmsg=''
 
       select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
       
-      set @upid='鏃堕棿鎴�'
-      
-      Insert into @${_verify.sheet} (${fields},jskey)
+      Insert into @${btn.sheet} (${fields},jskey)
 
       exec s_KeyWords_Replace 
       @LText=@LText, @BID=@BID,@LoginUID=@LoginUID,@SessionUid=@SessionUid,@UserID=@UserID,@ID=@ID
 
-      Insert into ${_verify.sheet} (${fields},createuserid,createuser,createstaff,bid,upid) 
-      Select ${fields},@userid@,@username,@fullname,@BID@,@upid From @${_verify.sheet}
+      Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid) 
+      Select ${fields},@userid@,@username,@fullname,@BID@ From @${btn.sheet}
 
-      Delete @${_verify.sheet}
+      Delete @${btn.sheet}
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 

--
Gitblit v1.8.0