From 74f42024805abe7850dbeeb03dae48a0d9ef0b79 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 二月 2020 13:10:17 +0800
Subject: [PATCH] 2020-02-05

---
 src/utils/utils.js |  102 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 231c169..2f0b702 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -445,26 +445,54 @@
    * @return {String} type   鎵ц绫诲瀷
    * @return {String} table  琛ㄥ悕
    */
-  static getSysDefaultSql (btn, setting, formdata, param, data) {
+  static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns) {
     let primaryId = param.ID
     let BID = param.BID
     let verify = btn.verify
     let _formFieldValue = {}
 
-    if (formdata) { // 鑾峰彇瀛楁閿�煎
+    // 闇�瑕佸0鏄庣殑鍙橀噺闆�
+    let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName']
+
+    // 涓婚敭瀛楁
+    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)
+      `
+
+    // 鑾峰彇瀛楁閿�煎
+    if (formdata) {
       formdata.forEach(form => {
         _formFieldValue[form.key] = form.value
       })
     }
 
-    let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName']
+    // 鍘婚櫎绂佺敤鐨勯獙璇�
+    if (verify) {
+      if (verify.uniques) {
+        verify.uniques = verify.uniques.filter(item => item.status !== 'false')
+      }
+      if (verify.customverifys) {
+        verify.customverifys = verify.customverifys.filter(item => item.status !== 'false')
+      }
+      if (verify.billcodes) {
+        verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
+      }
+      if (verify.scripts) {
+        verify.scripts = verify.scripts.filter(item => item.status !== 'false')
+      }
+    }
 
-    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)
-      `
-    if (verify && verify.scripts && verify.scripts.length > 0 && formdata) {
-      let _formfields = formdata.filter(form => !_vars.includes(form.key))
+    // 璁剧疆鏈夎嚜瀹氫箟鑴氭湰鏃讹紝澹版槑鍙橀噺涓坊鍔犳墍鏈夎〃鍗曞瓧娈碉紝骞堕伩鍏嶉噸澶�
+    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)`
@@ -472,25 +500,33 @@
       _formfields = _formfields.join(',')
       _sql += `,${_formfields}
         `
+      _initfields = _initfields.join(',')
+      _sql += `select ${_initfields}
+        `
+
     }
 
-    _sql += `Select @BVoucher='',@FIBVoucherDate='',@FiYear=''
+    // 鍒濆鍖栧嚟璇佸瓧娈�
+    _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear=''
       `
 
-    if (verify && verify.accountdate === 'true') { // 鍚敤璐︽湡楠岃瘉
+    // 鍚敤璐︽湡楠岃瘉
+    if (verify && verify.accountdate === 'true') {
       _sql += `exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
         if @ErrorCode!=''
           GOTO aaa
         `
     }
-    if (btn.sqlType !== 'insert' && verify && verify.invalid === 'true' && setting.dataresource) { // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
+
+    // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
+    if (btn.sqlType !== 'insert' && verify && verify.invalid === 'true' && setting.dataresource) {
       let datasource = setting.dataresource
       if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
         datasource = '(' + datasource + ') tb'
       }
 
-      _sql += `Select @tbid='', @ErrorCode='',@retmsg=''
-        Select @tbid=${primaryKey} from ${datasource} where ${primaryKey} ='${primaryId}'
+      _sql += `select @tbid='', @ErrorCode='',@retmsg=''
+        select @tbid=${primaryKey} from ${datasource} where ${primaryKey} ='${primaryId}'
         If @tbid=''
         Begin
           select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
@@ -498,24 +534,26 @@
         end
         `
     }
-    if (formdata && verify && verify.uniques.length > 0) { // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
+
+    // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
+    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 = []      // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
-        let _labels = item.fieldlabel.split(',')
+        let _fieldValue = []                     // 琛ㄥ崟閿�煎field=value
+        let _value = []                          // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
+        let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
 
         item.field.split(',').forEach((_field, index) => {
           _fieldValue.push(`${_field}='${_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}'
+        _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='${_value.join(', ')} 宸插瓨鍦�'
@@ -525,7 +563,8 @@
       })
     }
     
-    if (verify && verify.customverifys.length > 0) { // 鑷畾涔夐獙璇�
+    // 鑷畾涔夐獙璇侊紝浣跨敤鍒楄〃鍙婅〃鍗曟暟鎹紙琛ㄥ崟浼樺厛锛夛紝鏇挎崲鎵�鏈堾鐩稿悓瀛楁銆丂ID銆丂BID
+    if (verify && verify.customverifys.length > 0) {
       let _primaryId = primaryId
       if (btn.sqlType === 'insert') {
         _primaryId = ''
@@ -551,8 +590,8 @@
         let bidreg = new RegExp('@BID', 'ig')
         _cuSql = _cuSql.replace(bidreg, `'${BID}'`)
 
-        _sql += `Select @tbid='', @ErrorCode='',@retmsg=''
-          Select top 1 @tbid='X' from (${_cuSql}) a
+        _sql += `select @tbid='', @ErrorCode='',@retmsg=''
+          select top 1 @tbid='X' from (${_cuSql}) a
           If @tbid ${item.result === 'true' ? '!=' : '='}''
           Begin
             select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
@@ -562,7 +601,8 @@
       })
     }
 
-    if (verify && verify.billcodes.length > 0) { // 鍗曞彿鐢熸垚
+    // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
+    if (verify && verify.billcodes.length > 0) {
       verify.billcodes.forEach(item => {
         let _ModularDetailCode = ''
         if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
@@ -602,7 +642,8 @@
 
     let _updateconfig = ''
 
-    if (verify && verify.voucher && verify.voucher.enabled && data) { // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+    // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+    if (verify && verify.voucher && verify.voucher.enabled && data) {
       let _voucher = verify.voucher
 
       _updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
@@ -623,9 +664,11 @@
         `
     }
 
+    // 鐢ㄤ簬鍙栫敤鎴蜂俊鎭�
     let _user = `select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
       `
 
+    // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
     if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
       let keys = []
       let values = []
@@ -662,10 +705,17 @@
     } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete') { // 閫昏緫鍒犻櫎
       _sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey};`
     } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') {      // 鐗╃悊鍒犻櫎
+      let _msg = ''
+      if (data && logcolumns && logcolumns.length > 0) {
+        logcolumns.forEach(col => {
+          _msg += col.label + '=' + data[col.field] + ','
+        })
+      }
       _sql += _user
-      _sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKey};`
+      _sql += `insert into snote (remark,createuserid,CreateUser,CreateStaff) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKey},@userid,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKey};`
     }
 
+    // 鎷兼帴鑷畾涔夎剼鏈�
     if (verify && verify.scripts && verify.scripts.length > 0) {
       let _scripts = ''
       verify.scripts.forEach(item => {

--
Gitblit v1.8.0