From e0f1f05b7567a7bfd29fd5ad54e4b2222ddfcb94 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 三月 2020 20:19:06 +0800
Subject: [PATCH] 2020-03-26

---
 src/utils/utils.js |  707 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 603 insertions(+), 104 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3a83691..6a5c97a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,5 +1,6 @@
 import moment from 'moment'
 import md5 from 'md5'
+import options from '@/store/options.js'
 
 const service = window.GLOB.service ? (/\/$/.test(window.GLOB.service) ? window.GLOB.service : window.GLOB.service + '/') : ''
 
@@ -193,7 +194,9 @@
         key: search.field,
         match: search.match,
         type: search.type,
-        value: search.initval
+        label: search.label,
+        value: search.initval,
+        required: search.required === 'true'
       }
       if (item.type === 'date') {
         item.value = item.value ? moment().subtract(item.value, 'days').format('YYYY-MM-DD') : ''
@@ -288,6 +291,12 @@
         newsearches[item.key] = item.value
       }
     })
+
+    Object.keys(newsearches).forEach(key => {
+      if (!newsearches[key]) {
+        delete newsearches[key]
+      }
+    })
     
     return newsearches
   }
@@ -317,12 +326,8 @@
 
         searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
       } else if (item.type === 'multiselect') {
-        let str = item.match === '=' ? '' : '%'
-        let options = item.value.map(val => {
-          return item.key + ' ' + item.match + ' \'' + str + val + str + '\''
-        })
 
-        searchText += '(' + options.join(' OR ') + ')'
+        searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
       } else if (item.type === 'date') {
         let _val = item.value
         let timetail = ' 00:00:00.000'
@@ -355,6 +360,7 @@
         searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
       }
     })
+
     return searchText
   }
 
@@ -391,6 +397,7 @@
    */
   static getrealurl (url) {
     if (!url) return ''
+
     let baseurl = ''
     if (process.env.NODE_ENV === 'production') {
       baseurl = document.location.origin + '/' + service
@@ -402,6 +409,24 @@
     // }
     let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
     return realurl
+  }
+
+  /**
+   * @description 鑾峰彇浜戠鍥剧墖鐪熷疄璺緞
+   * @return {String}    url 鍥剧墖璺緞
+   */
+  static getcloudurl (url) {
+    if (!url) return ''
+    
+    let baseurl = ''
+    
+    if (options.cloudServiceApi) {
+      baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
+    } else {
+      baseurl = document.location.origin + '/' + service
+    }
+
+    return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
   }
 
   /**
@@ -441,51 +466,315 @@
   }
 
   /**
+   * @description 鑾峰彇excel瀵煎叆鍙傛暟
+   * @return {String} btn   鎸夐挳
+   * @return {String} data  excel鏁版嵁
+   */
+  static getExcelInSql (item, data, dict) {
+    let btn = item.verify
+    let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
+
+    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] : ''
+        let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + (cindex + 1) + dict['main.excel.column']  + ' '
+
+        if (/^Nvarchar/ig.test(col.type)) {
+          if (typeof(val) === 'number') {
+            val = val.toString()
+          }
+
+          val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+
+          if (!val && col.required === 'true') { // 蹇呭~鏍¢獙
+            let _error =  _position + dict['main.excel.content.emptyerror']
+            errors.push(_error)
+          } else if (val.length > col.limit) {    // 闀垮害鏍¢獙
+            let _error =  _position + dict['main.excel.content.maxlimit']
+            errors.push(_error)
+          } else {                               // 鍏抽敭瀛楁牎楠�
+            keys.forEach(key => {
+              let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
+              if (_patten.test(val)) {
+                let _error = _position + dict['main.excel.includekey'] + key
+                errors.push(_error)
+              }
+            })
+          }
+        } else if (/^int/ig.test(col.type)) {
+          if (!val) {
+            let _error =  _position + dict['main.excel.content.emptyerror']
+            errors.push(_error)
+          } else {
+            let _val = val + ''
+
+            if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) {               // 妫�楠屾槸鍚︿负鏁存暟
+              let _error = _position + dict['main.excel.content.interror']
+              errors.push(_error)
+            } else if ((col.min || col.min === 0) && val < col.min) {          // 鏈�灏忓�兼楠�
+              let _error = _position + dict['main.excel.content.limitmin']
+              errors.push(_error)
+            } else if ((col.max || col.max === 0) && val > col.max) {          // 鏈�澶у�兼楠�
+              let _error = _position + dict['main.excel.content.limitmax']
+              errors.push(_error)
+            }
+          }
+        } else if (/^Decimal/ig.test(col.type)) {
+          if (!val) {
+            let _error =  _position + dict['main.excel.content.emptyerror']
+            errors.push(_error)
+          } else {
+            let _val = val + ''
+            let _vals = _val.split('.')
+
+            if (!/^(([^0][0-9]+|0)\.([0-9]+)$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]+)$)|^(([1-9]+)$)/.test(_val)) {                           // 妫�楠屾槸鍚︿负娴偣鏁�
+              let _error = _position + dict['main.excel.content.floaterror']
+              errors.push(_error)
+            } else if (_vals[0].length > 18) {                         // 妫�楠屾暣鏁颁綅
+              let _error = _position + dict['main.excel.content.floatIntover']
+              errors.push(_error)
+            } else if (_vals[1] && _vals[1].length > col.limit) {       // 鏈�灏忓�兼楠�
+              let _error = _position + dict['main.excel.content.floatPointover']
+              errors.push(_error)
+            } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
+              let _error = _position + dict['main.excel.content.limitmin']
+              errors.push(_error)
+            } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
+              let _error = _position + dict['main.excel.content.limitmax']
+              errors.push(_error)
+            }
+          }
+        }
+        
+        return `'${val}' as ${col.Column}`
+      })
+
+      let _lineIndex = '0000' + (lindex + 1) + '0'
+      _lineIndex = _lineIndex.substring(_lineIndex.length - 6)
+
+      vals.push(`'${upId + _lineIndex}' as jskey`)
+
+      return `Select ${vals.join(',')}`
+    })
+
+    _Ltext = _Ltext.join(' Union all ')
+
+    let _sql = ''
+
+    if (item.intertype === 'inner' && !item.innerFunc) {
+      let declarefields = []
+      let fields = []
+
+      btn.columns.forEach(col => {
+        declarefields.push(`${col.Column} ${col.type}`)
+        fields.push(col.Column)
+      })
+
+      fields = fields.join(',')
+
+      let _insert = ''
+
+      if (btn.default !== 'false') {
+        _insert = `
+        Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid) 
+        Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
+        `
+      }
+
+      if (btn.scripts && btn.scripts.length > 0) {
+        btn.scripts.forEach(script => {
+          if (script.status === 'false') return
+
+          _insert += `
+          ${script.sql}
+          `
+        })
+      }
+
+      _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@
+      
+      Insert into  @${item.sheet} (${fields},jskey)
+      ${_Ltext}
+      ${_insert}
+      Delete @${item.sheet}
+
+      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+    } else {
+      _sql = _Ltext
+    }
+
+    console.log(_sql)
+    return {
+      sql: _sql,
+      errors: errors.join('; ')
+    }
+  }
+
+  /**
    * @description 浣跨敤绯荤粺鍑芥暟鏃讹紙sPC_TableData_InUpDe 锛夛紝鐢熸垚sql璇彞
    * @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 verify = btn.verify || {}
     let _formFieldValue = {}
+    // 闇�瑕佸0鏄庣殑鍙橀噺闆�
+    // 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', 'modulardetailcode']
 
-    if (formdata) { // 鑾峰彇瀛楁閿�煎
+    // 涓婚敭瀛楁
+    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),@ModularDetailCode nvarchar(50)
+      `
+
+    // let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
+    let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
+    let _initfields = []
+    let _declarefields = []
+
+    // 鑾峰彇瀛楁閿�煎
+    if (formdata) {
       formdata.forEach(form => {
         _formFieldValue[form.key] = form.value
+        let _key = form.key.toLowerCase()
+
+        if (!_initvars.includes(_key)) {
+          _initvars.push(_key)
+
+          if (form.type === 'number' && typeof(form.value) === 'number') {
+            _initfields.push(`@${_key}=${form.value}`)
+          } else {
+            _initfields.push(`@${_key}='${form.value}'`)
+          }
+        }
+        
+        if (!_vars.includes(_key)) {
+          _vars.push(_key)
+
+          let _type = `nvarchar(${form.fieldlen})`
+
+          if (form.type.match(/date/ig)) {
+            _type = 'datetime'
+          } else if (form.type === 'number') {
+            _type = `decimal(18,${form.fieldlen})`
+          }
+
+          _declarefields.push(`@${_key} ${_type}`)
+        }
       })
     }
 
-    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)
-      `
-    if (verify && verify.scripts && verify.scripts.length > 0 && formdata) {
-      let _formfields = formdata.filter(form => !['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear'].includes(form.key))
-      _formfields = _formfields.map(form => `@${form.key} nvarchar(50)`)
-      _formfields = _formfields.join(',')
-      _sql += `${_formfields}
+    // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鏃惰烦杩�)
+    if (data && btn.Ot !== 'notRequired') {
+      _formFieldValue = {...data, ..._formFieldValue}
+
+      if (logcolumns && logcolumns.length > 0) {
+        logcolumns.forEach(col => {
+          let _key = col.field.toLowerCase()
+
+          if (!_initvars.includes(_key)) {
+            _initvars.push(_key)
+
+            let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
+
+            if (col.type === 'number' && typeof(_val) === 'number') {
+              _initfields.push(`@${_key}=${_val}`)
+            } else {
+              _initfields.push(`@${_key}='${_val}'`)
+            }
+          }
+          
+          if (!_vars.includes(_key)) {
+            _vars.push(_key)
+  
+            let _type = `nvarchar(${col.fieldlength || 50})`
+
+            if (col.type === 'number') {
+              let _length = col.decimal ? col.decimal : 0
+              _type = `decimal(18,${_length})`
+            } else if (col.type === 'picture' || col.type === 'textarea') {
+              _type = `nvarchar(${col.fieldlength || 512})`
+            }
+  
+            _declarefields.push(`@${_key} ${_type}`)
+          }
+        })
+      }
+    }
+
+    // 鍙橀噺澹版槑
+    _declarefields = _declarefields.join(',')
+    if (_declarefields) {
+      _sql += `,${_declarefields}
         `
     }
 
-    _sql += `Select @BVoucher='',@FIBVoucherDate='',@FiYear=''
+    // 鍙橀噺璧嬪��
+    _initfields = _initfields.join(',')
+    if (_initfields) {
+      _sql += `select ${_initfields}
+        `
+    }
+
+    // 鍘婚櫎绂佺敤鐨勯獙璇�
+    if (verify.contrasts) {
+      verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
+    }
+    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 userName = sessionStorage.getItem('User_Name') || ''
+    let fullName = sessionStorage.getItem('Full_Name') || ''
+
+    if (sessionStorage.getItem('isEditState') === 'true') {
+      userName = sessionStorage.getItem('CloudUserName') || ''
+      fullName = sessionStorage.getItem('CloudFullName') || ''
+    }
+
+    // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
+    _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
       `
 
-    if (verify && verify.accountdate === 'true') { // 鍚敤璐︽湡楠岃瘉
+    // 鍚敤璐︽湡楠岃瘉
+    if (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.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='鏁版嵁宸插け鏁�'
@@ -493,24 +782,51 @@
         end
         `
     }
-    if (formdata && verify && verify.uniques.length > 0) { // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
-      let _primaryId = primaryId
-      if (btn.sqlType === 'insert') {
-        _primaryId = ''
+
+    // 姣旇緝楠岃瘉
+    if (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.uniques && verify.uniques.length > 0) {
+      let hasBid = false // 妫�楠岃〃鍗曞強鍒楀瓧娈典腑鏄惁鏈塨id
+      let _keys_ = Object.keys(_formFieldValue).map(key => key.toLowerCase())
+      if (_keys_.includes('bid')) {
+        hasBid = true
       }
 
       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]}'`)
+          let _fval = `'${_formFieldValue[_field]}'`
+          // if (['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(_field.toLowerCase())) {
+          //   _fval = '@' + _field + '@'
+          // }
+          if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+            _fval = '@BID@'
+          }
+          _fieldValue.push(`${_field}=${_fval}`)
           _value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
         })
 
-        _sql += `Select @tbid='', @ErrorCode='',@retmsg=''
-          Select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${_primaryId}'
+        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}'${_verifyType}
           If @tbid!=''
           Begin
             select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -520,34 +836,11 @@
       })
     }
     
-    if (verify && verify.customverifys.length > 0) { // 鑷畾涔夐獙璇�
-      let _primaryId = primaryId
-      if (btn.sqlType === 'insert') {
-        _primaryId = ''
-      }
-
+    // 鑷畾涔夐獙璇�
+    if (verify.customverifys && verify.customverifys.length > 0) {
       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
+        _sql += `select @tbid='', @ErrorCode='',@retmsg=''
+          select top 1 @tbid='X' from (${item.sql}) a
           If @tbid ${item.result === 'true' ? '!=' : '='}''
           Begin
             select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
@@ -557,25 +850,43 @@
       })
     }
 
-    if (verify && verify.billcodes.length > 0) { // 鍗曞彿鐢熸垚
+    // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
+    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}'`
         }
 
-        _sql += `Declare @${item.field} nvarchar(50)
-          select @BillCode='', @${item.field}=''
+        let _declare = ''
+        let _key = item.field.toLowerCase()
+
+        if (!_vars.includes(_key)) {
+          _declare = `Declare @${_key} nvarchar(50)`
+          _vars.push(_key)
+        }
+
+        _sql += `${_declare}
+          select @BillCode='', @${_key}='', @ModularDetailCode=''
+          ${_lpline}
           exec s_get_BillCode
-            @ModularDetailCode='${_ModularDetailCode}',
+            @ModularDetailCode=${_ModularDetailCode},
             @Type=${item.Type},
             @TypeCharOne='${item.TypeCharOne}',
             @TypeCharTwo ='${item.TypeCharTwo}',
@@ -584,17 +895,18 @@
             @retmsg=@retmsg output
           if @ErrorCode!=''
             goto aaa
-          set @${item.field}=@BillCode
+          set @${_key}=@BillCode
           `
       })
     }
 
-    let _updateconfig = ''
+    let hasvoucher = false
 
-    if (verify && verify.voucher && verify.voucher.enabled && data) { // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+    // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+    if (verify.voucher && verify.voucher.enabled && data) {
       let _voucher = verify.voucher
 
-      _updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
+      hasvoucher = true
 
       _sql += `exec s_BVoucher_Create
           @Bill ='${data[_voucher.linkField]}',
@@ -612,31 +924,63 @@
         `
     }
 
-    if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
+    let primaryKeyName = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(primaryKey.toLowerCase()) ? primaryKey + '@' : primaryKey
+
+    let _actionType = null
+
+    if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
+      _actionType = btn.sqlType
+    }
+
+    // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
+    if (_actionType === 'insert') {
       let keys = []
       let values = []
+
       formdata.forEach(item => {
         if (item.type === 'funcvar') {
-          keys.push(item.key)
+          keys.push(item.key.toLowerCase())
           values.push('@' + item.key)
         } else if (item.type === 'number') {
-          keys.push(item.key)
+          keys.push(item.key.toLowerCase())
           values.push(item.value)
         } else {
-          keys.push(item.key)
+          keys.push(item.key.toLowerCase())
           values.push('\'' + item.value + '\'')
         }
       })
 
+      if (!keys.includes(primaryKey)) {
+        keys.push(primaryKey)
+        values.push('\'' + primaryId + '\'')
+      }
+      if (!keys.includes('createuserid')) {
+        keys.push('createuserid')
+        values.push('@userid@')
+      }
+      if (!keys.includes('createuser')) {
+        keys.push('createuser')
+        values.push('@username')
+      }
+      if (!keys.includes('createstaff')) {
+        keys.push('createstaff')
+        values.push('@fullname')
+      }
+      if (!keys.includes('bid')) {
+        keys.push('bid')
+        values.push('@BID@')
+      }
+
       keys = keys.join(',')
       values = values.join(',')
-      _sql += `declare @UserName  nvarchar(50),@FullName nvarchar(50)
-        select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID 
-        `
-      _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@userid,@username,@fullname,@BID`
-    } else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
+      _sql += `insert into ${btn.sql} (${keys}) select ${values};`
+    } else if (_actionType === 'update') {
       let _form = []
+      let _arr = []
+
       formdata.forEach(item => {
+        _arr.push(item.key.toLowerCase())
+
         if (item.type === 'funcvar') {
           _form.push(item.key + '=@' + item.key)
         } else if (item.type === 'number') {
@@ -645,26 +989,56 @@
           _form.push(item.key + '=\'' + item.value + '\'')
         }
       })
+
+      if (!_arr.includes('modifydate')) {
+        _form.push('modifydate=getdate()')
+      }
+      if (!_arr.includes('modifyuserid')) {
+        _form.push('modifyuserid=@userid@')
+      }
+      if (hasvoucher) {
+        if (!_arr.includes('bvoucher')) {
+          _form.push('BVoucher=@BVoucher')
+        }
+        if (!_arr.includes('fibvoucherdate')) {
+          _form.push('FIBVoucherDate=@FIBVoucherDate')
+        }
+        if (!_arr.includes('fiyear')) {
+          _form.push('FiYear=@FiYear')
+        }
+      }
+
       _form = _form.join(',')
-      _sql += `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid${_updateconfig} where ${primaryKey}=@${primaryKey}`
-    } 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') {      // 鐗╃悊鍒犻櫎
-      _sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
+      _sql += `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+    } else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
+      _sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
+    
+    } else if (_actionType === 'delete') {      // 鐗╃悊鍒犻櫎
+      let _msg = ''
+      if (data && logcolumns && logcolumns.length > 0) {
+        let _index = 0
+        logcolumns.forEach(col => {
+          if (col.Hide !== 'true' && _index < 4) {
+            _msg += col.label + '=' + data[col.field] + ','
+            _index++
+          }
+        })
+      }
+      _sql += `insert into snote (remark,createuserid,CreateUser,CreateStaff) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKeyName},@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKeyName};`
     }
 
-    if (verify && verify.scripts && verify.scripts.length > 0) {
+    // 鎷兼帴鑷畾涔夎剼鏈�
+    if (verify.scripts && verify.scripts.length > 0) {
       let _scripts = ''
       verify.scripts.forEach(item => {
-        _scripts += `${item.sql}
-        `
+        _scripts += `
+        ${item.sql}`
       })
-      _sql += `
-        ${_scripts}`
+      _sql += `${_scripts}`
     }
 
-    _sql += `aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg
-      `
+    _sql += `
+      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
     console.log(_sql)
     return _sql
   }
@@ -684,15 +1058,20 @@
   static getTableFunc (param, menu, config) {
     let form = ''
     let formParam = ''
+    let _vars = ['bid', 'pageindex', 'pagesize', 'ordercol', 'ordertype', 'exceltype', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
     let _columns = []
     let primaryKey = config.setting.primaryKey || 'ID'
+
+    if (!_vars.includes(primaryKey.toLowerCase())) {
+      _vars.push(primaryKey.toLowerCase())
+      formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
+    }
 
     if (config.search && config.search.length > 0) {
       let _fields = new Map()
       config.search.forEach(item => {
         if (item.field) {
           let type = ''
-          let _f = item.field
 
           if (item.type.match(/date/ig)) {
             type = 'datetime=null'
@@ -700,12 +1079,19 @@
             type = 'nvarchar(50)=\'\''
           }
 
-          if (_fields.has(item.field)) {
-            _f = _f + '1'
-          }
+          item.field.split(',').forEach(cell => {
+            let _f = cell
+            if (_fields.has(cell)) {
+              _f = _f + '1'
+            }
+  
+            _fields.set(cell, true)
 
-          _fields.set(item.field, true)
-          formParam = formParam + `mchr13k@${_f} ${type},`
+            if (!_vars.includes(_f.toLowerCase())) {
+              _vars.push(_f.toLowerCase())
+              formParam = formParam + `mchr13k@${_f} ${type},`
+            }
+          })
         }
       })
     }
@@ -726,8 +1112,8 @@
 
     let Ltext = `create proc ${param.innerFunc}
     ( /*${menu.MenuName}*/
-    @BID nvarchar(50)='',
-    @${primaryKey} nvarchar(50)='',${formParam}
+    @appkey nvarchar(50)='',
+    @BID nvarchar(50)='',${formParam}
     @PageIndex nvarchar(50)='',
     @PageSize nvarchar(50)='',
     @OrderCol nvarchar(50)='',
@@ -812,8 +1198,14 @@
   static getfunc (param, btn, menu, config) {
     let form = ''
     let formParam = ''
+    let _vars = ['bid', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
     let columns = config.columns
     let primaryKey = config.setting.primaryKey || 'ID'
+
+    if (!_vars.includes(primaryKey.toLowerCase())) {
+      _vars.push(primaryKey.toLowerCase())
+      formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
+    }
 
     if (param.fields && param.fields.length > 0) {
       let _fields = []
@@ -827,7 +1219,11 @@
           } else {
             type = 'nvarchar(50)=\'\''
           }
-          formParam = formParam + `mchr13k@${item.field} ${type},`
+
+          if (!_vars.includes(item.field.toLowerCase())) {
+            _vars.push(item.field.toLowerCase())
+            formParam = formParam + `mchr13k@${item.field} ${type},`
+          }
 
           _fields.push(item.field)
         }
@@ -874,10 +1270,16 @@
       `
     }
 
+    // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
+    let _printRemark = ''
+    if (btn.funcType === 'print') {
+      _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
+    }
+
     let Ltext = `create proc ${param.funcName}
     ( /*${menu.MenuName}  ${btn.label}*/
-    @BID nvarchar(50)='',
-    @${primaryKey} nvarchar(50)='',${formParam}
+    @appkey nvarchar(50)='',
+    @BID nvarchar(50)='',${formParam}
     @sEPTMenuNo nvarchar(50)='${param.menuNo}',
     @lang nvarchar(50)='',
     @debug nvarchar(50)='',
@@ -897,7 +1299,7 @@
       /*浜嬪姟鎿嶄綔*/
       BEGIN TRAN
         /*鍏蜂綋涓氬姟鎿嶄綔*/
-        
+        ${_printRemark}
         /* 
         select top 10 * from sProcExcep order by id desc
         
@@ -949,4 +1351,101 @@
 
     return Ltext
   }
+
+  /**
+   * @description 鍒涘缓瀵煎叆瀛樺偍杩囩▼
+   * @return {String}
+   */
+  static getexcelInfunc (param, btn, menu) {
+    let _verify = btn.verify
+
+    let declarefields = []
+    let fields = []
+
+    _verify.columns.forEach(col => {
+      declarefields.push(`${col.Column} ${col.type}`)
+      fields.push(col.Column)
+    })
+
+    fields = fields.join(',')
+
+    let _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50))
+      Declare @UserName nvarchar(50),@FullName nvarchar(50)
+      
+      select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
+      
+      Insert into @${btn.sheet} (${fields},jskey)
+
+      exec s_KeyWords_Replace
+      @LText=@LText, @BID=@BID,@LoginUID=@LoginUID,@SessionUid=@SessionUid,@UserID=@UserID,@ID=@ID
+
+      Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid) 
+      Select ${fields},@userid,@username,@fullname,@BID From @${btn.sheet}
+
+      Delete @${btn.sheet}`
+
+    let Ltext = `create proc ${param.funcName}
+    ( /*${menu.MenuName}  ${btn.label}*/
+      @appkey nvarchar(50)='',
+      @ID nvarchar(50)='',
+      @BID nvarchar(50)='',
+      @Ltext nvarchar(max)='',
+      @sEPTMenuNo nvarchar(50)='${param.menuNo}', 
+      @secretkey nvarchar(50)='',
+      @timestamp nvarchar(50)='',
+      @lang nvarchar(50)='',
+      @LoginUID nvarchar(50)='',
+      @SessionUid nvarchar(50)='',
+      @UserID nvarchar(50), 
+      @ErrorCode nvarchar(50) out,
+      @retmsg nvarchar(4000) out
+    )
+    as
+    begin
+    declare @BegindateTest datetime,@EnddateTest datetime 
+    select @BegindateTest=getdate() 
+    set @ErrorCode=''
+    set @retmsg=''
+    BEGIN TRY
+      /*浜嬪姟鎿嶄綔*/
+      BEGIN TRAN
+        /*鍏蜂綋涓氬姟鎿嶄綔*/
+
+        /* 
+        ${_sql}
+        */
+        
+      COMMIT TRAN
+      SET NOCOUNT ON
+      RETURN
+    END TRY
+    BEGIN CATCH
+      /*閿欒澶勭悊*/
+      ROLLBACK TRAN
+      DECLARE @ErrorMessage NVARCHAR(4000);
+      DECLARE @ErrorSeverity INT;
+      DECLARE @ErrorState INT;
+      
+      /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
+      set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
+      SET @retmsg=ERROR_MESSAGE();
+      SELECT @ErrorMessage=ERROR_MESSAGE(),
+        @ErrorSeverity=ERROR_SEVERITY(),
+        @ErrorState=ERROR_STATE();
+        
+      RAISERROR(@ErrorMessage, /*-- Message text.*/
+        @ErrorSeverity, /*-- Severity.*/
+        @ErrorState  /*-- State.*/
+      );
+    END CATCH
+    
+    GOTO_RETURN:
+      ROLLBACK TRAN
+      
+    END`
+
+    Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
+
+    return Ltext
+  }
 }
\ No newline at end of file

--
Gitblit v1.8.0