From 27f12ae6cbc056470fa8291322a75676f806b54c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2020 14:26:13 +0800
Subject: [PATCH] 2020-02-14

---
 src/utils/utils.js |  594 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 530 insertions(+), 64 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 28c63dd..3bf9737 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -166,25 +166,11 @@
     value = value.replace(/%/ig, 'mpercent')
     value = value.replace(/(^\s|\s$)/ig, '')
 
-    // value = value.replace(/>/ig, 'greateror')
-    //   .replace(/</ig, 'lessor')
-    //   .replace(/!=/ig, 'noequal')
-    //   .replace(/=/ig, 'equal')
-    //   .replace(/,/ig, 'comma')
-    //   .replace(/>=/ig, 'greaterorequal')
-    //   .replace(/<=/ig, 'lessorequal')
-    //   .replace(/@/ig, 'matk')
-    //   .replace(/\(/ig, 'mlbrktsk')
-    //   .replace(/\)/ig, 'mrbrktsk')
-    //   .replace(/\*/ig, 'mastrsk')
-    //   .replace(/'/ig, 'mqotek')
-    //   .replace(/\s/ig, 'mspace')
-
     // 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
     value = window.btoa(window.encodeURIComponent(value))
 
-    // 闅忔満鎻掑叆瀛楃
-    let index = Math.floor(Math.random() * value.length)
+    // 鎻掑叆瀛楃
+    let index = Math.floor(value.length / 2)
     value = value.slice(0, index) + salt + value.slice(index)
 
     // base64鍔犲瘑
@@ -419,10 +405,20 @@
   }
 
   /**
-   * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨsql
+   * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨ鏉′欢
    * @return {String} item   鎼滅储鏉′欢淇℃伅
    */
-  static getSelectQuerySql (item) {
+  static getSelectQueryOptions (item) {
+    let arrfield = [item.valueField, item.valueText]
+
+    if (item.type === 'link') {
+      arrfield.push(item.linkField)
+    } else if (item.type === 'select' && item.linkSubField && item.linkSubField.length > 0) {
+      arrfield.push(...item.linkSubField)
+    }
+
+    arrfield = Array.from(new Set(arrfield))
+
     let _datasource = item.dataSource
     let sql = ''
 
@@ -430,17 +426,143 @@
       _datasource = '(' + _datasource + ') tb'
     }
 
-    if (item.type === 'link') {
-      sql = 'select ' + item.valueField + ',' + item.valueText + ',' + item.linkField + ' from ' + _datasource
-    } else {
-      sql = 'select ' + item.valueField + ',' + item.valueText + ' from ' + _datasource
-    }
+    arrfield = arrfield.join(',')
 
     if (item.orderBy) {
-      sql = sql + ' order by ' + item.orderBy + ' ' + item.orderType
+      sql = 'select distinct ' + arrfield + ',' + item.orderBy + ' as orderfield from ' + _datasource + ' order by orderfield ' + item.orderType
+    } else {
+      sql = 'select distinct ' + arrfield + ' from ' + _datasource
     }
 
-    return sql
+    return {
+      sql: sql,
+      field: arrfield
+    }
+  }
+
+  /**
+   * @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 _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, '')
+
+          let limitlen = col.type.match(/\d+/)[0]
+
+          if (!val && col.required === 'true') { // 蹇呭~鏍¢獙
+            let _error =  _position + dict['main.excel.content.emptyerror']
+            errors.push(_error)
+          } else if (val.length > limitlen) {    // 闀垮害鏍¢獙
+            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 (typeof(val) !== 'number' || parseInt(val) < parseFloat(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)) {
+          let _val = val + ''
+          _val = _val.split('.')
+          let limitlen = col.type.match(/\d+/ig)[1]
+
+          if (typeof(val) !== 'number') {                           // 妫�楠屾槸鍚︿负娴偣鏁�
+            let _error = _position + dict['main.excel.content.floaterror']
+            errors.push(_error)
+          } else if (_val[0].length > 18) {                         // 妫�楠屾暣鏁颁綅
+            let _error = _position + dict['main.excel.content.floatIntover']
+            errors.push(_error)
+          } else if (_val[1] && _val[1].length > limitlen) {        // 鏈�灏忓�兼楠�
+            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}`
+      })
+
+      if (!item.innerFunc) {
+        vals.push(`@upid+'${this.getuuid()}' as jskey`)
+      }
+
+      return `Select ${vals.join(',')}`
+    })
+
+    _Ltext = _Ltext.join(' Union all ')
+
+    let _sql = ''
+
+    if (!item.innerFunc) {
+      let declarefields = []
+      let fields = []
+      let timestamp = new Date().getTime()
+
+      btn.columns.forEach(col => {
+        declarefields.push(`${col.Column} ${col.type}`)
+        fields.push(col.Column)
+      })
+
+      fields = fields.join(',')
+
+      _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
+      Declare @UserName nvarchar(50),@FullName nvarchar(50) ,@upid nvarchar(50)
+      select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
+      
+      set @upid='${timestamp}'
+     
+      Insert into  @${btn.sheet} (${fields},jskey)
+      ${_Ltext}
+
+      Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid,upid) 
+      Select ${fields},@userid@,@username,@fullname,@BID@,@upid From @${btn.sheet}
+
+      Delete @${btn.sheet}`
+
+    } else {
+      _sql = _Ltext
+    }
+
+    console.log(_sql)
+    return {
+      sql: _sql,
+      errors: errors.join('; ')
+    }
   }
 
   /**
@@ -448,65 +570,410 @@
    * @return {String} type   鎵ц绫诲瀷
    * @return {String} table  琛ㄥ悕
    */
-  static getSysDefaultSql (btn, setting, formdata, primaryId) {
-    // let verify = btn.verify
+  static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns) {
+    let primaryId = param.ID
+    let BID = param.BID
+    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', 'id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey']
+    let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname']
+
+    // 涓婚敭瀛楁
     let primaryKey = setting.primaryKey || 'id'
-    let _sql = ''
 
-    // if (verify && verify.accountdate === 'true') {
-    //   _sql += `exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
-    //     if @ErrorCode!=''
-    //     GOTO aaa
-    //     `
-    // }
-    // if (verify && verify.invalid === 'true') {
-    //   _sql += `Declare @tbid nvarchar(50), @ErrorCode nvarchar(50),
-    //     @retmsg nvarchar(4000)
-    //     Select @tbid='', @ErrorCode='',@retmsg=''
-    //     Select @tbid=${primaryKey} from ${btn.sql} where ${primaryKey} ='${primaryId}'
-    //     If @tbid=''
-    //     Begin
-    //       Setect @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
-    //       goto aaa
-    //     end
-    //     `
+    // 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
+    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 _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
+    // 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}`)
+        }
+      })
+    }
+
+    // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鏃惰烦杩�)
+    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}
+        `
+    }
+
+    // 鍙橀噺璧嬪��
+    _initfields = _initfields.join(',')
+    if (_initfields) {
+      _sql += `select ${_initfields}
+        `
+    }
+
+    // 娣诲姞鏃朵富閿负绌� 鏀逛负鍓嶅彴鐢熸垚
+    // if (btn.sqlType === 'insert') {
+    //   primaryId = ''
     // }
 
-    console.log(btn)
-    console.log(formdata)
-    console.log(primaryId)
-    if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
+    // 鍘婚櫎绂佺敤鐨勯獙璇�
+    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')
+    }
+
+    // 鍒濆鍖栧嚟璇佸瓧娈�
+    _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg=''
+      `
+
+    // 鍚敤璐︽湡楠岃瘉
+    if (verify.accountdate === 'true') {
+      _sql += `exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
+        if @ErrorCode!=''
+          GOTO aaa
+        `
+    }
+
+    // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
+    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}'
+        If @tbid=''
+        Begin
+          select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+          goto aaa
+        end
+        `
+    }
+
+    // 姣旇緝楠岃瘉
+    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(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
+
+        item.field.split(',').forEach((_field, index) => {
+          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] || ''}`)
+        })
+
+        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(', ')} 宸插瓨鍦�'
+            goto aaa
+          end
+          `
+      })
+    }
+    
+    // 鑷畾涔夐獙璇�
+    if (verify.customverifys && verify.customverifys.length > 0) {
+      verify.customverifys.forEach(item => {
+        _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}'
+            goto aaa
+          end
+          `
+      })
+    }
+
+    // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
+    if (verify.billcodes && verify.billcodes.length > 0) {
+      verify.billcodes.forEach(item => {
+        let _ModularDetailCode = ''
+        if (item.TypeCharOne === 'Lp' || 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
+        } else {
+          _ModularDetailCode = item.ModularDetailCode
+        }
+
+        let _declare = ''
+        let _key = item.field.toLowerCase()
+
+        if (!_vars.includes(_key)) {
+          _declare = `Declare @${_key} nvarchar(50)`
+          _vars.push(_key)
+        }
+
+        _sql += `${_declare}
+          select @BillCode='', @${_key}=''
+          exec s_get_BillCode
+            @ModularDetailCode='${_ModularDetailCode}',
+            @Type=${item.Type},
+            @TypeCharOne='${item.TypeCharOne}',
+            @TypeCharTwo ='${item.TypeCharTwo}',
+            @BillCode =@BillCode output,
+            @ErrorCode =@ErrorCode output, 
+            @retmsg=@retmsg output
+          if @ErrorCode!=''
+            goto aaa
+          set @${_key}=@BillCode
+          `
+      })
+    }
+
+    let hasvoucher = false
+
+    // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+    if (verify.voucher && verify.voucher.enabled && data) {
+      let _voucher = verify.voucher
+
+      hasvoucher = true
+
+      _sql += `exec s_BVoucher_Create
+          @Bill ='${data[_voucher.linkField]}',
+          @BVoucherType ='${_voucher.BVoucherType}',
+          @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
+          @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
+          @Type =${_voucher.Type},
+          @BVoucher =@BVoucher OUTPUT ,
+          @FIBVoucherDate =@FIBVoucherDate OUTPUT ,
+          @FiYear =@FiYear OUTPUT ,
+          @ErrorCode =@ErrorCode OUTPUT, 
+          @retmsg=@retmsg OUTPUT
+        if @ErrorCode!=''
+          GOTO aaa
+        `
+    }
+
+    // 鐢ㄤ簬鍙栫敤鎴蜂俊鎭�
+    let _user = `select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
+      `
+
+    let primaryKeyName = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(primaryKey.toLowerCase()) ? primaryKey + '@' : primaryKey
+
+    // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
+    if (btn.OpenType === 'pop' && btn.sqlType === 'insert' && verify.default !== 'false') {
       let keys = []
       let values = []
+
       formdata.forEach(item => {
-        if (!item.readonly && item.type === 'number') {
-          keys.push(item.key)
+        if (item.type === 'funcvar') {
+          keys.push(item.key.toLowerCase())
+          values.push('@' + item.key)
+        } else if (item.type === 'number') {
+          keys.push(item.key.toLowerCase())
           values.push(item.value)
-        } else if (!item.readonly) {
-          keys.push(item.key)
+        } else {
+          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 += `insert into ${btn.sql} (${keys}, createuserid, BID) select ${values},@BID,@userid`
-    } else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
+      _sql += _user
+      _sql += `insert into ${btn.sql} (${keys}) select ${values};`
+    } else if (btn.OpenType === 'pop' && btn.sqlType === 'update' && verify.default !== 'false') {
       let _form = []
+      let _arr = []
+
       formdata.forEach(item => {
-        if (!item.readonly && item.type === 'number') {
+        _arr.push(item.key.toLowerCase())
+
+        if (item.type === 'funcvar') {
+          _form.push(item.key + '=@' + item.key)
+        } else if (item.type === 'number') {
           _form.push(item.key + '=' + item.value)
-        } else if (!item.readonly) {
+        } else {
           _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 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 ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete' && verify.default !== 'false') { // 閫昏緫鍒犻櫎
+      _sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
+    } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete' && verify.default !== 'false') {      // 鐗╃悊鍒犻櫎
+      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 += _user
+      _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.scripts && verify.scripts.length > 0) {
+      let _scripts = ''
+      verify.scripts.forEach(item => {
+        _scripts += `
+        ${item.sql}`
+      })
+      _sql += `${_scripts}`
+    }
+
+    _sql += `
+      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
     console.log(_sql)
     return _sql
   }
@@ -652,7 +1119,6 @@
    * @return {String}
    */
   static getfunc (param, btn, menu, config) {
-    console.log(menu)
     let form = ''
     let formParam = ''
     let columns = config.columns

--
Gitblit v1.8.0