From c0f61b1955b21968014dbb65e424436d4738eb06 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 三月 2025 23:05:27 +0800
Subject: [PATCH] 2025-03-11

---
 src/utils/utils-custom.js | 1023 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 824 insertions(+), 199 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 501e159..dc7f0de 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -451,11 +451,7 @@
             card.elements = card.elements.map(cell => {
               if (cell.eleType === 'button') {
                 cell.uuid = md5(commonId + cell.uuid)
-                if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                  cell.pageTemplate = ''
-                  cell.linkmenu = ''
-                }
-                this.resetBtn(cell, commonId)
+                this.resetBtn(cell, commonId, clear)
               } else {
                 cell.uuid = this.getuuid()
               }
@@ -467,11 +463,7 @@
             card.backElements = card.backElements.map(cell => {
               if (cell.eleType === 'button') {
                 cell.uuid = md5(commonId + cell.uuid)
-                if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                  cell.pageTemplate = ''
-                  cell.linkmenu = ''
-                }
-                this.resetBtn(cell, commonId)
+                this.resetBtn(cell, commonId, clear)
               } else {
                 cell.uuid = this.getuuid()
               }
@@ -491,11 +483,7 @@
           item.elements = item.elements.map(cell => {
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
-              if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                cell.pageTemplate = ''
-                cell.linkmenu = ''
-              }
-              this.resetBtn(cell, commonId)
+              this.resetBtn(cell, commonId, clear)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -528,12 +516,7 @@
                 cell.uuid = md5(commonId + cell.uuid)
 
                 if (cell.eleType === 'button') {
-                  if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                    cell.pageTemplate = ''
-                    cell.linkmenu = ''
-                  }
-
-                  this.resetBtn(cell, commonId)
+                  this.resetBtn(cell, commonId, clear)
                 }
 
                 return cell
@@ -572,11 +555,15 @@
           })
 
           if (cell.subButton) {
-            this.resetBtn(cell.subButton, commonId)
+            this.resetBtn(cell.subButton, commonId, clear)
           }
 
           return cell
         })
+      } else if (item.type === 'login') {
+        if (clear) {
+          item.wrap.linkmenu = ''
+        }
       }
   
       if (item.btnlog) {
@@ -587,12 +574,7 @@
         item.action = item.action.map(cell => {
           cell.uuid = md5(commonId + cell.uuid)
 
-          if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-            cell.pageTemplate = ''
-            cell.linkmenu = ''
-          }
-
-          this.resetBtn(cell, commonId)
+          this.resetBtn(cell, commonId, clear)
 
           return cell
         })
@@ -650,15 +632,25 @@
   /**
    * @description 鎸夐挳閲嶇疆
    */
-  static resetBtn (btn, commonId) {
+  static resetBtn (btn, commonId, clear = false) {
     if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.execMode === 'pop')) {
-      if (btn.modal && btn.modal.fields.length > 0) {
+      if (btn.modal && btn.modal.fields && btn.modal.fields.length > 0) {
         btn.modal.fields = btn.modal.fields.map(m => {
           m.uuid = this.getuuid()
           return m
         })
       }
     }
+
+    if (clear) {
+      if (btn.pageTemplate === 'linkpage') {
+        btn.pageTemplate = ''
+      }
+      delete btn.linkmenu
+      delete btn.openmenu
+      delete btn.refreshTab
+    }
+    
     if (btn.switchTab && btn.switchTab.length > 0) {
       btn.switchTab = btn.switchTab.map(m => md5(commonId + m))
     }
@@ -666,6 +658,15 @@
       btn.anchors = btn.anchors.map(m => md5(commonId + m))
     }
     if (btn.syncComponent && btn.syncComponent[0] === 'multiComponent' && btn.syncComponents) {
+      if (btn.syncComponents[0] && Array.isArray(btn.syncComponents[0])) {
+        btn.syncComponents = btn.syncComponents.map((item, i) => {
+          return {
+            syncComId: item,
+            label: '',
+            uuid: 'fixed' + i
+          }
+        })
+      }
       btn.syncComponents = btn.syncComponents.map(m => {
         m.syncComId = m.syncComId.map(n => {
           if (/\$focus/.test(n)) {
@@ -684,6 +685,10 @@
 
         return md5(commonId + m)
       })
+    }
+
+    if (btn.OpenType === 'popview' && btn.config && btn.config.components) {
+      btn.config.components = this.resetConfig(btn.config.components, commonId)
     }
   }
 
@@ -771,14 +776,7 @@
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
 
-              if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                if (cell.modal && cell.modal.fields.length > 0) {
-                  cell.modal.fields = cell.modal.fields.map(m => {
-                    m.uuid = this.getuuid()
-                    return m
-                  })
-                }
-              }
+              this.resetBtn(cell, commonId)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -792,14 +790,8 @@
           card.backElements = card.backElements.map(cell => {
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
-              if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                if (cell.modal && cell.modal.fields.length > 0) {
-                  cell.modal.fields = cell.modal.fields.map(m => {
-                    m.uuid = this.getuuid()
-                    return m
-                  })
-                }
-              }
+
+              this.resetBtn(cell, commonId)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -818,14 +810,8 @@
         item.elements = item.elements.map(cell => {
           if (cell.eleType === 'button') {
             cell.uuid = md5(commonId + cell.uuid)
-            if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-              if (cell.modal && cell.modal.fields.length > 0) {
-                cell.modal.fields = cell.modal.fields.map(m => {
-                  m.uuid = this.getuuid()
-                  return m
-                })
-              }
-            }
+
+            this.resetBtn(cell, commonId)
           } else {
             cell.uuid = this.getuuid()
           }
@@ -850,14 +836,7 @@
             col.elements = col.elements.map(cell => {
               cell.uuid = md5(commonId + cell.uuid)
               if (cell.eleType === 'button') {
-                if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                  if (cell.modal && cell.modal.fields.length > 0) {
-                    cell.modal.fields = cell.modal.fields.map(m => {
-                      m.uuid = this.getuuid()
-                      return m
-                    })
-                  }
-                }
+                this.resetBtn(cell, commonId)
               }
               return cell
             })
@@ -902,14 +881,7 @@
       }
       item.action = item.action.map(cell => {
         cell.uuid = md5(commonId + cell.uuid)
-        if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-          if (cell.modal && cell.modal.fields.length > 0) {
-            cell.modal.fields = cell.modal.fields.map(m => {
-              m.uuid = this.getuuid()
-              return m
-            })
-          }
-        }
+        this.resetBtn(cell, commonId)
 
         return cell
       })
@@ -1733,6 +1705,7 @@
 
   if (config.interfaces) {
     config.interfaces.forEach(item => {
+      if (item.status !== 'true') return
       if (item.setting && item.setting.interType === 'outer' && item.setting.sysInterface !== 'true') {
         inters = 'true'
       }
@@ -1913,6 +1886,25 @@
     if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
       if (!cell.modal || cell.modal.fields.length === 0) {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
+      } else if (cell.OpenType === 'pop') {
+        let forms = []
+        cell.modal.fields.forEach(n => {
+          if (n.type === 'funcvar' && n.field) {
+            forms.push(n.field)
+          }
+        })
+        if (cell.verify && cell.verify.billcodes && cell.verify.billcodes.length > 0) {
+          let bills = cell.verify.billcodes.filter(item => item.status !== 'false').map(item => item.field)
+          bills.forEach(n => {
+            if (!forms.includes(n)) {
+              errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍗曞彿鐢熸垚鐨勫嚱鏁板彉閲忊��${n}鈥濅笉瀛樺湪`})
+            }
+          })
+          forms = forms.filter(n => !bills.includes(n))
+        }
+        if (forms.length) {
+          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        }
       }
     } else if (cell.OpenType === 'excelIn') {
       if (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0) {
@@ -1944,23 +1936,62 @@
     if (['pop', 'prompt', 'exec'].includes(cell.OpenType) && cell.verify && !cell.output) {
       if (cell.verify.noteEnable === 'true') {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊肩煭淇″彂閫佹棤鏁堬紒`})
+      } else if (cell.verify.wxNote === 'true') {
+        errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊煎叕浼楀彿娑堟伅鏃犳晥锛乣})
       } else if (cell.verify.emailEnable === 'true') {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊奸偖浠跺彂閫佹棤鏁堬紒`})
+      } else if (cell.verify.DeepSeekable === 'true') {
+        errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊糄eekSeek鏃犳晥锛乣})
       }
     }
 
     if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
+      if (cell.Ot !== 'requiredOnce' && ['pop', 'form'].includes(cell.OpenType) && cell.verify && cell.verify.uniques && cell.verify.uniques.length > 0) {
+        let forms = ['BID']
+    
+        if (cell.OpenType === 'form') {
+          forms.push(cell.field)
+        } else if (cell.modal && cell.modal.fields.length > 0) {
+          cell.modal.fields.forEach(n => {
+            if (!n.field) return
+            forms.push(n.field)
+          })
+        }
+        let emptys = []
+        if (cell.Ot !== 'notRequired') {
+          forms.push(...columns)
+        }
+
+        cell.verify.uniques.forEach(m => {
+          if (m.status === 'false') return
+
+          m.field.split(',').forEach(n => {
+            if (!forms.includes(n)) {
+              emptys.push(n)
+            }
+          })
+        })
+
+        if (emptys.length) {
+          if (cell.Ot === 'notRequired') {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+          } else {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓庡瓧娈甸泦涓笉瀛樺湪锛乣})
+          }
+        }
+      }
+
       if (cell.OpenType === 'form' && cell.formType === 'count_line') return
      
       if (cell.intertype === 'system') {
-        if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
-        }
+        // if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+        //   errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+        // }
       } else if (cell.intertype === 'custom' || cell.intertype === 'outer') {
         if (cell.callbackType === 'script' && (!cell.verify || !cell.verify.cbScripts || cell.verify.cbScripts.filter(item => item.status !== 'false').length === 0)) {
           errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝鍥炶皟鑴氭湰涓嶅彲涓虹┖锛乣})
-        } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+        // } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+        //   errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
         }
       }
     } else if (cell.OpenType === 'funcbutton') {
@@ -2077,6 +2108,80 @@
     }
   }
 
+  if (card.$c_fc) {
+    let idCtrl = false
+    let supModule = ''
+
+    if (card.wrap.datatype === 'dynamic') {
+      supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
+      if (supModule === 'empty') {
+        supModule = ''
+      }
+    } else {
+      if (card.wrap.datatype === 'static') {
+        supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+      } else {
+        supModule = null
+      }
+    }
+
+    card.subcards.forEach(item => {
+      if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+        errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+      }
+      if (item.subButton.Ot === 'requiredSgl' && card.wrap.datatype === 'static') {
+        errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳閫夎鏃朵笉鍙娇鐢ㄩ潤鎬佹暟鎹簮`})
+      }
+      if (item.subButton.verify && !item.subButton.output) {
+        if (item.subButton.verify.noteEnable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+        } else if (item.subButton.verify.wxNote === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�煎叕浼楀彿娑堟伅鏃犳晥锛乣})
+        } else if (item.subButton.verify.emailEnable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+        } else if (item.subButton.verify.DeepSeekable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�糄eekSeek鏃犳晥锛乣})
+        }
+      }
+
+      let forms = []
+      item.fields.forEach(m => {
+        if (m.type === 'funcvar' && m.field) {
+          forms.push(m.field)
+        }
+        if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
+          idCtrl = true
+        }
+        if (m.type === 'linkMain' && !supModule && supModule !== null) {
+          if (item.setting && item.setting.title) {
+            errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
+          } else {
+            errors.push({ level: 1, detail: `璇锋鏌ュ叧鑱斾富琛ㄢ��${m.label}鈥濇槸鍚︽湁鏁坄})
+          }
+        }
+      })
+      
+      if (item.subButton.verify && item.subButton.verify.billcodes && item.subButton.verify.billcodes.length > 0) {
+        let bills = item.subButton.verify.billcodes.filter(item => item.status !== 'false').map(item => item.field)
+        bills.forEach(n => {
+          if (!forms.includes(n)) {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${item.subButton.label}鈥濅腑鍗曞彿鐢熸垚鐨勫嚱鏁板彉閲忊��${n}鈥濅笉瀛樺湪`})
+          }
+        })
+        forms = forms.filter(n => !bills.includes(n))
+      }
+      if (forms.length) {
+        if (item.setting && item.setting.title) {
+          errors.push({ level: 0, detail: `鍒嗙粍鈥�${item.setting.title}鈥濅腑鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        } else {
+          errors.push({ level: 0, detail: `鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        }
+      }
+    })
+
+    card.idCtrl = idCtrl
+  }
+
   return errors
 }
 
@@ -2098,6 +2203,7 @@
   let _ch_d = sql.match(/@check\$/ig)
   let _m_b = sql.match(/\$@/ig)
   let _m_d = sql.match(/@\$/ig)
+  let caseErr = false
 
   _quot = _quot ? _quot.length : 0
   _lparen = _lparen ? _lparen.length : 0
@@ -2106,6 +2212,14 @@
   _ch_d = _ch_d ? _ch_d.length : 0
   _m_b = _m_b ? _m_b.length : 0
   _m_d = _m_d ? _m_d.length : 0
+
+  if (/case\s+when\s+[\s\S]+\send(\s|\n|$)/ig.test(sql)) {
+    sql.match(/case\s+when\s+[\s\S]+\send(\s|\n|$)/ig).forEach(line => {
+      if (!/\selse\s/ig.test(line)) {
+        caseErr = true
+      }
+    })
+  }
 
   if (_quot % 2 !== 0) {
     notification.warning({
@@ -2169,6 +2283,40 @@
       duration: 5
     })
     return false
+  } else if (/,\./ig.test(sql)) {
+    let lines = []
+    sql.split(/\n/).forEach((s, i) => {
+      if (/,\./ig.test(s)) {
+        lines.push(i + 1)
+      }
+    })
+
+    lines = lines.join('銆�')
+    lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+    notification.warning({
+      top: 92,
+      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
+      duration: 5
+    })
+    return false
+  } else if (/\.,/ig.test(sql)) {
+    let lines = []
+    sql.split(/\n/).forEach((s, i) => {
+      if (/\.,/ig.test(s)) {
+        lines.push(i + 1)
+      }
+    })
+
+    lines = lines.join('銆�')
+    lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+    notification.warning({
+      top: 92,
+      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
+      duration: 5
+    })
+    return false
   } else if (/鈥榺鈥�/ig.test(sql)) {
     let lines = []
     sql.split(/\n/).forEach((s, i) => {
@@ -2194,9 +2342,23 @@
     })
     return false
   } else if (/\sdecimal\(8,/ig.test(sql)) {
+    let lines = ''
+    sql.split(/\n/).forEach((s, i) => {
+      if (/(^|\s)decimal\(8,/ig.test(s)) {
+        lines = '绗�' + (i + 1) + '琛屼腑'
+      }
+    })
+
     notification.warning({
       top: 92,
-      message: `涓嶅彲浣跨敤 decimal(8`,
+      message: `${lines}涓嶅彲浣跨敤 decimal(8`,
+      duration: 5
+    })
+    return false
+  } else if (caseErr) {
+    notification.warning({
+      top: 92,
+      message: 'case when 璇彞闇�瑕佹湁 else',
       duration: 5
     })
     return false
@@ -3022,11 +3184,18 @@
 GOTO_RETURN:
   ROLLBACK TRAN`
 
-  let filterComponent = (components, mainSearch, label = '') => {
+  let filterComponent = (components, mainSearch, label = '', ispop) => {
     components.forEach(item => {
       item.$menuname = (config.MenuName || '') + label + '-' + (item.name || '')
 
       if (item.type === 'tabs') {
+        if (config.Template === 'BaseTable') {
+          item.subtabs.forEach(tab => {
+            if (tab.permission !== 'true' && tab.components[0] && tab.components[0].wrap) {
+              tab.components[0].wrap.permission = 'false'
+            }
+          })
+        }
         item.subtabs.forEach(tab => {
           let _mainSearch = mainSearch || []
 
@@ -3037,10 +3206,11 @@
               _mainSearch = com.search || []
             })
           }
-          filterComponent(tab.components, _mainSearch, label)
+
+          filterComponent(tab.components, _mainSearch, label, ispop)
         })
       } else if (item.type === 'group') {
-        filterComponent(item.components, mainSearch, label)
+        filterComponent(item.components, mainSearch, label, ispop)
       } else {
         if (item.wrap && item.setting) {
           if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') {
@@ -3056,7 +3226,7 @@
             if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) {
               let msg = getFormSql(cell, '鎼滅储')
       
-              sqls.push({uuid: cell.uuid, type: 'sForm', ...msg})
+              sqls.push({uuid: md5(item.uuid + cell.uuid), type: 'sForm', ...msg})
             }
           })
         }
@@ -3073,8 +3243,16 @@
           item.setting.$name = item.$menuname || ''
 
           let msg = getDataSource(item, mainSearch)
+          let roleId = config.uuid
+          if (item.wrap && item.wrap.permission === 'false') {
+            roleId = ''
+          } else if (item.setting.database === 'sso') {
+            roleId = ''
+          } else if (ispop) {
+            roleId = ''
+          }
 
-          sqls.push({uuid: item.uuid, type: 'datasource', ...msg})
+          sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
         } else if (item.setting && item.setting.useMSearch === 'true') {
           let searches = item.search || []
           if (mainSearch.length > 0) {
@@ -3086,7 +3264,7 @@
         item.action && item.action.forEach(cell => {
           if (cell.hidden === 'true') return false
           
-          resetButton(item, cell)
+          resetButton(item, cell, false, ispop)
         })
 
         if (item.type === 'table') {
@@ -3101,7 +3279,7 @@
                 col.elements.forEach(cell => {
                   if (cell.eleType !== 'button' || cell.hidden === 'true') return
                   
-                  resetButton(item, cell)
+                  resetButton(item, cell, false, ispop)
                 })
               } else if (item.subtype === 'editable' && col.editable === 'true') {
                 if (col.editType === 'select' && col.resourceType === '1') {
@@ -3138,7 +3316,7 @@
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell)
+              resetButton(item, cell, false, ispop)
             })
   
             if (!card.backElements || card.backElements.length === 0) return
@@ -3146,14 +3324,14 @@
             card.backElements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell, true)
+              resetButton(item, cell, true, ispop)
             })
           })
         } else if (item.type === 'balcony') {
           item.elements.forEach(cell => {
             if (cell.eleType !== 'button' || cell.hidden === 'true') return
             
-            resetButton(item, cell)
+            resetButton(item, cell, false, ispop)
           })
         } else if (item.type === 'form') {
           item.subcards.forEach(group => {
@@ -3166,15 +3344,49 @@
               fields: group.fields
             }
 
-            resetButton(item, group.subButton)
+            resetButton(item, group.subButton, false, ispop)
           })
+        } else if (item.type === 'module' && item.subtype === 'invoice') {
+          if (item.buyer.setting && item.buyer.setting.interType === 'system') {
+            let msg = getDataSource(item.buyer, [])
+            
+            sqls.push({uuid: item.uuid + 'buyer', type: 'datasource', ...msg})
+          }
+
+          if (item.detail.setting && item.detail.setting.interType === 'system') {
+            let _msg = getDataSource(item.detail, [])
+  
+            sqls.push({uuid: item.uuid + 'detail', type: 'datasource', ..._msg})
+          }
+
+          let btnmsg = getInvoicePreSql(item.billSaveBtn, item.$menuname + '-' + item.billSaveBtn.label)
+
+          sqls.push({uuid: item.uuid + item.billSaveBtn.type, type: 'button', ...btnmsg})
+
+          let _btnmsg = getInvoicePreSql(item.billOutBtn, item.$menuname + '-'  + item.billOutBtn.label)
+
+          sqls.push({uuid: item.uuid + item.billOutBtn.type, type: 'button', ..._btnmsg})
+
+          let backmsg = getInvoiceSysBackSql(item.billOutBtn, item.$menuname + '-'  + item.billOutBtn.label + '(鍥炶皟)')
+
+          sqls.push({uuid: item.uuid + 'billback', type: 'btnCallBack', ...backmsg})
         }
       }
     })
   }
 
-  let resetButton = (item, cell, isback) => {
+  let resetButton = (item, cell, isback, ispop) => {
     cell.logLabel = item.$menuname + '-' + cell.label
+    let roleId = cell.uuid
+    if (item.wrap && item.wrap.permission === 'false') {
+      roleId = ''
+    } else if (cell.hidden === 'true' || cell.permission === 'false') {
+      roleId = ''
+    } else if (cell.database === 'sso') {
+      roleId = ''
+    } else if (ispop) {
+      roleId = ''
+    }
 
     if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
       if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
@@ -3188,11 +3400,11 @@
 
           let msg = getSysDefaultSql(cell, _item)
 
-          sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+          sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
         } else {
           let msg = getSysDefaultSql(cell, item)
 
-          sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+          sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
         }
       }
       if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
@@ -3214,12 +3426,12 @@
           // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
           if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
             let msg = getFormSql(form, '琛ㄥ崟')
-  
-            sqls.push({uuid: form.uuid, type: 'form', ...msg})
+
+            sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg})
           } else if (form.type === 'popSelect') {
             let msg = getPopSelectSql(form)
         
-            sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+            sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
           }
         })
       }
@@ -3227,20 +3439,30 @@
       if (cell.intertype === 'system') {
         let msg = getExcelInSql(cell)
 
-        sqls.push({uuid: cell.uuid, type: 'excelIn', ...msg})
+        sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelIn', ...msg})
       }
     } else if (cell.OpenType === 'excelOut') {
       if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
         let msg = getExcelOutSql(cell, item)
 
-        sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
+        sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+      } else if (cell.intertype === 'system' && cell.verify && item.setting && item.setting.interType === 'system') {
+        if (appType === 'mob') {
+          cell.pagination = 'false'
+        }
+        if (item.subtype === 'dualdatacard' || item.setting.laypage !== cell.pagination) {
+          let msg = getDoubleExcelOutSql(cell, item)
+  
+          sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+        }
       }
+      
     } else if (cell.OpenType === 'funcbutton') {
       if (cell.funcType === 'print') {
         if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
           let msg = getPrintSql(cell, item)
   
-          sqls.push({uuid: cell.uuid, type: 'print', ...msg})
+          sqls.push({uuid: cell.uuid, roleId: roleId, type: 'print', ...msg})
         }
         if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
           cell.modal.fields.forEach(form => {
@@ -3248,27 +3470,27 @@
             if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') {
               let msg = getFormSql(form, '琛ㄥ崟')
     
-              sqls.push({uuid: form.uuid, type: 'form', ...msg})
+              sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'form', ...msg})
             } else if (form.type === 'popSelect') {
               let msg = getPopSelectSql(form)
           
-              sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+              sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
             }
           })
         }
       } else if ((cell.funcType === 'refund' || cell.funcType === 'pay') && cell.payMode === 'system') {
         let msg = getPaySql(cell, item)
 
-        sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+        sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
       }
     } else if (cell.OpenType === 'innerpage' || cell.OpenType === 'outerpage') {
       if (cell.pageTemplate === 'pay' && cell.payMode === 'system') {
         let msg = getPaySql(cell, item)
 
-        sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+        sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
       }
     } else if (cell.OpenType === 'popview') {
-      if (cell.config && cell.config.components) {
+      if (cell.config && cell.config.components && cell.config.enabled) {
         let _mainSearch = []
 
         if (appType === 'mob') {
@@ -3292,7 +3514,9 @@
           })
         }
 
-        filterComponent(cell.config.components, _mainSearch, '-' + cell.label)
+        let label = (item.name ? '-' + item.name : '') + '-' + cell.label
+
+        filterComponent(cell.config.components, _mainSearch, label, true)
       }
     }
   }
@@ -3428,7 +3652,12 @@
             type: item.type,
             isconst: item.constant === 'true'
           }
-    
+
+          if (item.type === 'linkMain' && item.verifyVal === 'true') {
+            _item.$verify = true
+            _item.label = item.label
+          }
+
           if (_item.type === 'datemonth') {
             _item.type = 'text'
           } else if (_item.type === 'number' || _item.type === 'rate') {
@@ -3467,8 +3696,19 @@
       formdata.push(item)
     }
 
+    let verifyValSql = ''
     // 鑾峰彇瀛楁閿�煎
     formdata && formdata.forEach(form => {
+      if (form.$verify) {
+        verifyValSql += `
+        if @${form.key}=${form.type === 'number' ? 0 : `''`}
+        begin
+          select @errorcode='E',@retmsg='${form.label}锛屽叧鑱斾富琛ㄥけ鏁�'
+          goto aaa
+        end
+        `
+      }
+
       let _key = form.key.toLowerCase()
 
       if (!formkeys.includes(_key)) {
@@ -3643,22 +3883,21 @@
     if (formdata && verify.billcodes && verify.billcodes.length > 0) {
       verify.billcodes.forEach(item => {
         let _key = item.field.toLowerCase()
-        let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
   
         if (!formkeys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
   
         let _lpline = ''
         if (item.TypeCharOne === 'Lp') {
-          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+          if (/^BID$/ig.test(item.linkField)) {
             _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
           } else {
-            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
+            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
           }
         } else if (item.TypeCharOne === 'BN') {
-          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+          if (/^BID$/ig.test(item.linkField)) {
             _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
           } else {
-            _lpline = `set @ModularDetailCode= 'BN'+ right(@${_linkKey},48)`
+            _lpline = `set @ModularDetailCode= 'BN'+ right(@${item.linkField},48)`
           }
         } else {
           _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
@@ -3698,19 +3937,29 @@
         item.field.split(',').forEach((_field, index) => {
           let _key = _field.toLowerCase()
           let _val = ''
+          let _val2 = ''
   
           arr.push(_key)
-          if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+          if (_key === 'bid') {
             _val = BID
           } else {
-            _val = `'@mk_${_key}_mk@'`
+            // _val = `'@mk_${_key}_mk@'`
+            _val = `@${_field}`
           }
 
           _fieldValue.push(`${_key}=${_val}`)
-          _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+
+          if (_key === 'bid') {
+            _val2 = `' + ${BID} + '`
+          } else {
+            // _val2 = `@mk_${_key}_mk@`
+            _val2 = `' + @${_field} + '`
+          }
+
+          _value.push(`${_labels[index] || ''}锛�${_val2}`)
         })
   
-        if (!arr.includes(primaryKey.toLowerCase())) {
+        if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
           _fieldValue.push(`${primaryKey} !=${primaryId}`)
         }
   
@@ -3761,15 +4010,20 @@
     let hasvoucher = false
   
     // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
-    if (verify.voucher && verify.voucher.enabled && btn.Ot !== 'requiredOnce') {
+    if (verify.voucher && verify.voucher.enabled) {
       let _voucher = verify.voucher
+      let linkField = `@${_voucher.linkField}`
+  
+      if (/^BID$/ig.test(_voucher.linkField)) {
+        linkField = BID
+      }
   
       hasvoucher = true
   
       _sql += `
         /* 鍒涘缓鍑瘉 */
         exec s_BVoucher_Create
-          @Bill ='0',
+          @Bill = ${linkField},
           @BVoucherType ='${_voucher.BVoucherType}',
           @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
           @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -3797,7 +4051,7 @@
         let _key = item.key.toLowerCase()
   
         keys.push(_key)
-        values.push('@mk_' + _key + '_mk@')
+        values.push('@' + _key)
       })
   
       if (!keys.includes(primaryKey.toLowerCase())) {
@@ -3841,7 +4095,7 @@
         let _key = item.key.toLowerCase()
         
         _arr.push(_key)
-        _form.push(_key + '=@mk_' + _key + '_mk@')
+        _form.push(_key + '=@' + _key)
       })
   
       if (_actionType === 'audit') {
@@ -3964,7 +4218,9 @@
         _sql += `
           /* 宸ヤ綔娴佸紓甯竤ql */
           if @works_flow_error@ != ''
-          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          begin
+            select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          end
 
           /* 宸ヤ綔娴侀粯璁ql */
           insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
@@ -3983,11 +4239,40 @@
         _sql += `
           /* 宸ヤ綔娴佸紓甯竤ql */
           if @works_flow_error@ != ''
-          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          begin
+            select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          end
 
           if @works_flow_countersign@ = 'Y'
           begin
               /* 宸ヤ綔娴侀粯璁ql锛堜細绛撅級 */
+              set @retmsg =''
+              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+              if @retmsg =''
+              begin
+                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+                  if @retmsg !=''
+                  begin
+                      select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+                      goto aaa
+                  end
+
+                  set @retmsg =''
+                  select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+                  if @retmsg !=''
+                  begin
+                      select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+
+                      select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+                      goto aaa
+                  end
+
+                  select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+                  goto aaa
+              end
+
               declare @works_flow_statuscharone nvarchar(50),@works_flow_statuschartwo nvarchar(50),@works_flow_statuscharthree nvarchar(50),@works_flow_statuscharfour nvarchar(50),@works_flow_statuscharfive nvarchar(50),@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param  nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id  nvarchar(50)
               select @works_flow_statuscharone='',@works_flow_statuschartwo='',@works_flow_statuscharthree='',@works_flow_statuscharfour='',@works_flow_statuscharfive='',@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
 
@@ -4044,11 +4329,11 @@
           begin
               /* 宸ヤ綔娴侀粯璁ql锛堟垨绛撅級 */
               set @retmsg =''
-              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+              select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
 
               if @retmsg =''
               begin
-                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+                  select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
 
                   if @retmsg !=''
                   begin
@@ -4058,18 +4343,31 @@
 
                   if @dataM@ !='' 
                   begin
-                      set @retmsg =''
-                      select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0  
+                    set @retmsg =''
+                    select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
 
-                      if @retmsg != ''
+                    if @retmsg != ''
+                    begin
+                        goto goto_mk
+                    end
+                  end
+                  else
+                  begin
+                      set @retmsg =''
+                      select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+                      
+                      if @retmsg !=''
                       begin
-                          goto goto_mk
+                          select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+                          
+                          select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+                          goto aaa 
                       end
                   end
-
+                  
                   select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
                   goto aaa 
-              end 
+              end
 
               goto_mk:
 
@@ -4082,7 +4380,7 @@
 
               if @works_begin_branch@ = 'Y'
               begin
-                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+                  update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
                   where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'
               end
               else
@@ -4117,6 +4415,10 @@
       }
     } else if (_backCustomScript) {
       _sql += _backCustomScript
+    }
+
+    if (verifyValSql) {
+      _sql += verifyValSql
     }
 
     if (verify.workFlow === 'true' && process) {
@@ -4190,8 +4492,8 @@
       columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
 
         colreps.push(col.field)
   
@@ -4235,6 +4537,12 @@
       }
     })
 
+    if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+      decSql.push(`@mk_submit_type nvarchar(50)`)
+      secSql.push(`@mk_submit_type=@mk_submit_type@`)
+      reps.push('mk_submit_type')
+    }
+
     decSql = [...decSql, ..._declares]
 
     // INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2) 
@@ -4269,12 +4577,8 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
     if (btn.procMode === 'system') {
@@ -4283,15 +4587,20 @@
       }
     } else {
       if (/\$check@|@check\$/ig.test(_sql)) {
-        _sql = _sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+        _sql = _sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
         reps.push('mk_check_begin', 'mk_check_end')
       }
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -4301,6 +4610,7 @@
       return true
     })
 
+    colreps = Array.from(new Set(colreps))
     reps = [...reps, ...colreps]
     
     return { LText: _sql, md5: md5(_sql), reps }
@@ -4447,7 +4757,7 @@
         `
     }
 
-    let testSql = _prev + _back
+    let testSql = _prev + _back + (btn.output || '')
 
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (btn.Ot !== 'notRequired' && columns.length > 0) {
@@ -4455,8 +4765,8 @@
       columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(testSql)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(testSql)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(testSql)) return
 
         colreps.push(col.field)
   
@@ -4529,7 +4839,7 @@
         } else if (['mk_address'].includes(s)) {
           decSql.push(`@mk_address nvarchar(100)`)
         } else if (['mk_deleted'].includes(s)) {
-          secSql.push(`@mk_deleted int`)
+          decSql.push(`@mk_deleted int`)
         } else {
           decSql.push(`@${s} nvarchar(50)`)
         }
@@ -4545,6 +4855,12 @@
         }
       }
     })
+
+    if (new RegExp('@mk_submit_type[^0-9a-z_]', 'ig').test(_sql)) {
+      decSql.push(`@mk_submit_type nvarchar(50)`)
+      secSql.push(`@mk_submit_type=@mk_submit_type@`)
+      reps.push('mk_submit_type')
+    }
 
     decSql = [...decSql, ..._declares]
 
@@ -4578,19 +4894,20 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -4606,8 +4923,6 @@
   }
 
   let getDataSource = (item, mainSearch = [], type) => {
-    if (!item.setting || item.setting.interType !== 'system') return
-
     let searches = item.search || []
     if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
       searches = [...searches, ...mainSearch]
@@ -4658,7 +4973,7 @@
       _search = ''
     }
 
-    if (/\s/.test(_dataresource)) {
+    if (/\s/.test(_dataresource) && !/\)\s+tb$/.test(_dataresource)) {
       _dataresource = '(' + _dataresource + ') tb'
     }
 
@@ -4719,7 +5034,7 @@
     let DateCount = ''
     if (_dataresource) {
       /*system_query*/
-      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql) || (item.wrap && item.wrap.tree === 'true')) {
         LText = `select ${arr_field} from ${_dataresource} ${_search} `
       } else if (item.setting.laypage === 'true' && item.setting.order) {
         LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `
@@ -4762,8 +5077,14 @@
     // INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2) 
     // SELECT @appkey@,'sPC_Get_TableData',1,@menuname@,@UserID@,@username@,@fullname@,@SessionUid@,@LoginUID@
     let sql = ''
+    let e_sql = `select ${_columns.map(col => col.field).join(',')} from (select ${_columns.map(col => /date/ig.test(col.datatype) ? `'1949-10-01' as ${col.field}` : `'0' as ${col.field}`).join(',')}) a where ${item.setting.primaryKey || 'ID'} != '0'`
+    if (DateCount) {
+      e_sql += `
+      select 0 as total
+      `
+    }
 
-    if (item.setting.transact === 'true') {
+    if (item.setting.transact === 'true' && !/BEGIN\s+TRY\s+begin\s+TRAN/.test(_customScript)) {
       sql = `/* ${item.setting.$name} */
         BEGIN TRY 
         begin TRAN
@@ -4772,9 +5093,31 @@
         arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
       `
 
-      _tailScript += `${_tailScript}
+      _tailScript = `${_tailScript}
         select @ErrorCode as ErrorCode,@retmsg as retmsg
-        ${callback}
+
+        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, @ErrorSeverity, @ErrorState);
+        END CATCH
+
+        aaa:
+        ${e_sql}
+        select @ErrorCode as ErrorCode,@retmsg as retmsg
+        GOTO_RETURN:
+          ROLLBACK TRAN
       `
     } else {
       sql = `/* ${item.setting.$name} */
@@ -4782,8 +5125,18 @@
         arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
       `
 
-      _tailScript += `${_tailScript}
-        select @ErrorCode as ErrorCode,@retmsg as retmsg
+      let tail = 'aaa:'
+      if (/\sgoto\s+aaa([^0-9a-z_]|$)/ig.test(_customScript) && !/BEGIN\s+TRY\s+begin\s+TRAN/.test(_customScript)) {
+        tail = `if 1=2
+        begin
+          aaa:
+          ${e_sql}
+        end`
+      }
+
+      _tailScript = `${_tailScript}
+        ${tail}
+          select @ErrorCode as ErrorCode,@retmsg as retmsg
       `
     }
 
@@ -4816,22 +5169,22 @@
 
       return true
     })
-    
+
+    if (/\$@/ig.test(sql)) {
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
     reps.forEach(n => {
-      if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+      if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
 
       sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
     })
-    if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      reps.push('datam_begin', 'datam_end')
-    }
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
     reps.push('mk_obj_name')
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5024,7 +5377,9 @@
         sql += `
         /* 宸ヤ綔娴佸紓甯竤ql */
         if @works_flow_error@ != ''
-        select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+        begin
+          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+        end
 
         /* 宸ヤ綔娴侀粯璁ql */
         insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
@@ -5120,23 +5475,25 @@
       return true
     })
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
     if (/\$check@|@check\$/ig.test(sql)) {
-      sql = sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@')
+      sql = sql.replace(/\$check@/ig, ' @mk_check_begin@ ').replace(/@check\$/ig, ' @mk_check_end@ ')
       reps.push('mk_check_begin', 'mk_check_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end', 'mk_check_begin', 'mk_check_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
+    
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5251,6 +5608,7 @@
         let _fields = unique.field.split(',')
         let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
         _fields_ = _fields_.join(' and ')
+        _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}`
 
         let _where = []
         _fields.forEach(f => {
@@ -5307,6 +5665,7 @@
 
     let declarefields = []
     let fields = []
+    let upFields = []
 
     forms.forEach(col => {
       let key = col.field.toLowerCase()
@@ -5314,15 +5673,27 @@
 
       declarefields.push(`${col.field} ${col.datatype}`)
       fields.push(col.field)
+      upFields.push(`${col.field}=t.${col.field}`)
     })
 
     fields = fields.join(',')
+    upFields = upFields.join(',')
 
     let _insert = ''
     if (btn.default !== 'false') {
       _insert = `
         /* 榛樿sql */
-        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
+        update a set ${upFields},modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname,deleted=0
+        from (select * from #${sheet} where data_type='upt') t
+        inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        update a set deleted=1,modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname 
+        from (select * from #${sheet} where data_type='del') t
+        inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
         Select ${fields},@UserID@,@username,@fullname,@BID@ From #${sheet}
       `
     }
@@ -5396,19 +5767,20 @@
       return true
     })
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5448,6 +5820,23 @@
     }
 
     item.scripts = btn.verify.scripts || []
+
+    let msg = getDataSource(item, [])
+
+    return msg
+  }
+
+  let getDoubleExcelOutSql = (btn, component) => {
+    let item = fromJS(component).toJS()
+    item.search = item.$searches || []
+
+    if (item.subtype === 'dualdatacard') {
+      item.columns = [...item.columns, ...item.subColumns]
+    }
+    item.subtype = 'datacard'
+
+    item.setting.laypage = btn.pagination
+    item.setting.$name = btn.logLabel || ''
 
     let msg = getDataSource(item, [])
 
@@ -5544,8 +5933,8 @@
       component.columns.forEach(col => {
         let _key = col.field.toLowerCase()
 
-        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return
-        if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
+        if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(msg.LText)) return
+        // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return
 
         colreps.push(col.field)
   
@@ -5631,8 +6020,8 @@
     component.columns.forEach(col => {
       let _key = col.field.toLowerCase()
 
-      if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(_sql)) return
-      if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
+      if (syses.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_@]', 'ig').test(_sql)) return
+      // if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(_sql)) return
 
       colreps.push(col.field)
       
@@ -5663,19 +6052,20 @@
       return true
     })
 
-    reps.forEach(n => {
-      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(_sql)) {
-      _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      _sql = _sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(_sql)) {
       reps.push('db')
     }
 
-    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5776,21 +6166,22 @@
 
     reps.push(...sysVars)
 
-    reps.forEach(n => {
-      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
-    })
-
     if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
       reps.push('datam_begin', 'datam_end')
     }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
 
     // reps.push('mk_obj_name')
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5901,20 +6292,20 @@
       return true
     })
 
+    if (/\$@/ig.test(sql)) {
+      sql = sql.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
     reps.forEach(n => {
-      if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return
+      if (['orderBy', 'pageSize', 'pageIndex', 'datam_begin', 'datam_end'].includes(n)) return
 
       sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
     })
-    if (/\$@/ig.test(sql)) {
-      sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@')
-      reps.push('datam_begin', 'datam_end')
-    }
     if (/@db@/ig.test(sql)) {
       reps.push('db')
     }
 
-    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '')
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
 
     reps = reps.filter(n => {
       if (sysVars.includes(n.toLowerCase())) {
@@ -5925,6 +6316,213 @@
     })
 
     return {LText: sql, md5: md5(sql), reps}
+  }
+
+  let getInvoicePreSql = (btn, logLabel) => {
+    let reps = []
+    let sysVars = ['loginuid', 'sessionuid', 'userid', 'appkey', 'lang', 'username', 'fullname', 'menuname']
+    let _script = ''
+    btn.scripts.forEach(item => {
+      if (item.status === 'false') return
+      _script += `
+      ${item.sql}
+      `
+    })
+
+    _script = _script.replace(/@typename@/ig, `'admin'`)
+    
+    let regs = ['ID', 'BID', 'time_id', 'datam', ...sysVars]
+
+    regs.forEach(s => {
+      if (new RegExp('@' + s + '@', 'ig').test(_script)) {
+        reps.push(s)
+      }
+    })
+
+    if (/\$@/ig.test(_script)) {
+      _script = _script.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _script = _script.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
+    if (/@db@/ig.test(_script)) {
+      reps.push('db')
+    }
+
+    let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
+    let decSql = []
+    let secSql = []
+  
+    syses.forEach(s => {
+      if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_script)) {
+        if (['RoleID', 'mk_departmentcode', 'mk_organization'].includes(s)) {
+          decSql.push(`@${s} nvarchar(512)`)
+        } else if (['mk_address'].includes(s)) {
+          decSql.push(`@mk_address nvarchar(100)`)
+        } else {
+          decSql.push(`@${s} nvarchar(50)`)
+        }
+        secSql.push(`@${s}='@${s}@'`)
+        reps.push(s)
+      }
+    })
+    decSql = decSql.join(',')
+    secSql = secSql.join(',')
+
+    let sql = `/* ${logLabel} */
+      BEGIN TRY 
+      begin TRAN
+
+      Declare @ErrorCode nvarchar(50), @retmsg nvarchar(4000), @account_id nvarchar(50), @account_year_id nvarchar(50), @account_code nvarchar(50), @account_year_code nvarchar(50), @tbid nvarchar(50)${decSql ? ',' + decSql : ''}
+
+      Select @ErrorCode='S', @retmsg='', @account_id='@account_id@', @account_year_id='@account_year_id@', @account_code='@account_code@', @account_year_code='@account_year_code@'${secSql ? ',' + secSql : ''}
+
+      /* 鍙戠エ涓昏〃瀛楁 */
+      Declare @invoice_type Nvarchar(50), @from_to_name Nvarchar(50), @from_to_tax_no Nvarchar(50), @from_to_addr Nvarchar(100), @from_to_tel Nvarchar(50), @from_to_bank_name Nvarchar(50), @from_to_account_no Nvarchar(50), @from_to_mob Nvarchar(50), @from_to_email Nvarchar(50), @from_to_code Nvarchar(50), @orgname Nvarchar(50), @tax_no Nvarchar(50), @addr Nvarchar(100), @tel Nvarchar(50), @bank_name Nvarchar(50), @account_no Nvarchar(50), @remark Nvarchar(512), @payee Nvarchar(50), @reviewer Nvarchar(50), @drawer Nvarchar(50), @io Nvarchar(50), @orgcode Nvarchar(50), @total_net_amount Decimal(18,2), @total_tax Decimal(18,2), @total_amount Decimal(18,2), @business_type Nvarchar(20)
+
+      Select @invoice_type='@invoice_type@', @from_to_name='@from_to_name@', @from_to_tax_no='@from_to_tax_no@', @from_to_addr='@from_to_addr@', @from_to_tel='@from_to_tel@', @from_to_bank_name='@from_to_bank_name@', @from_to_account_no='@from_to_account_no@', @from_to_mob='@from_to_mob@', @from_to_email='@from_to_email@', @from_to_code='@from_to_code@', @orgname='@orgname@', @tax_no='@tax_no@', @addr='@addr@', @tel='@tel@', @bank_name='@bank_name@', @account_no='@account_no@', @remark='@remark@', @payee='@payee@', @reviewer='@reviewer@', @drawer='@drawer@', @io='@io@', @orgcode='@orgcode@', @total_net_amount=@total_net_amount@, @total_tax=@total_tax@, @total_amount=@total_amount@, @business_type='@business_type@'
+
+      /* 鍙戠エ鏄庣粏涓存椂琛� */
+
+      Declare @details_list table (productcode Nvarchar(50), productname Nvarchar(50), spec Nvarchar(50), unit Nvarchar(50), bill_count Decimal(18,10), unitprice Decimal(18,10), amount_line Decimal(18,2), tax_classify_code Nvarchar(50), tax_classify_name Nvarchar(50), tax_rate Decimal(18,2), tax_amount Decimal(18,2), free_tax_mark Nvarchar(50), vat_special_management Nvarchar(50), invoice_lp Nvarchar(50), tax_item Nvarchar(50), tax_method Nvarchar(50), jskey Nvarchar(50), data_type Nvarchar(50))
+
+      Insert into @details_list (productcode, productname, spec, unit, bill_count, unitprice, amount_line, tax_classify_code, tax_classify_name, tax_rate, tax_amount, free_tax_mark, vat_special_management, invoice_lp, tax_item, tax_method, jskey, data_type)
+
+      @mk_excel_data@
+
+      /* 鑷畾涔夎剼鏈� */
+      ${_script}
+      `
+
+    if (btn.type === 'billout') {
+      sql += callback
+    } else {
+      sql += `
+        select @ErrorCode as ErrorCode,@retmsg as retmsg
+        ${callback}
+        `
+    }
+
+    reps = reps.filter(n => {
+      if (sysVars.includes(n.toLowerCase())) {
+        return false
+      }
+
+      return true
+    })
+
+    sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
+
+    return {LText: sql, md5: md5(sql), reps}
+  }
+
+  let getInvoiceSysBackSql = (btn, logLabel) => {
+    let _prev = ''
+    let _back = ''
+    let tables = []
+    let reps = []
+
+    btn.cbScripts.forEach(script => {
+      if (script.status === 'false') return
+
+      if (/\s#[a-z0-9_]+(\s|\()/ig.test(script.sql)) {
+        tables.push(...script.sql.match(/\s#[a-z0-9_]+(\s|\()/ig))
+      }
+
+      if (script.position === 'front') {
+        _prev += `
+        /* 鑷畾涔夎剼鏈� */
+        ${script.sql}
+        `
+      } else {
+        _back += `
+        /* 鑷畾涔夎剼鏈� */
+        ${script.sql}
+        `
+      }
+    })
+
+    tables = tables.map(tb => tb.replace(/\s|\(/g, ''))
+
+    let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
+    let decSql = []
+    let secSql = []
+    let testSql = _prev + _back
+
+    _prev = _prev.replace(/@typename@/ig, `'admin'`)
+    _back = _back.replace(/@typename@/ig, `'admin'`)
+
+    let regs = ['ID', 'BID', 'time_id', 'datam', ...sysVars]
+
+    regs.forEach(s => {
+      if (new RegExp('@' + s + '@', 'ig').test(testSql)) {
+        reps.push(s)
+      }
+    })
+
+    if (/\$@/ig.test(testSql)) {
+      _prev = _prev.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      _back = _back.replace(/\$@/ig, ' @datam_begin@ ').replace(/@\$/ig, ' @datam_end@ ')
+      reps.push('datam_begin', 'datam_end')
+    }
+    reps.forEach(n => {
+      if (['datam_begin', 'datam_end'].includes(n)) return
+
+      _prev = _prev.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+      _back = _back.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`)
+    })
+    if (/@db@/ig.test(testSql)) {
+      reps.push('db')
+    }
+  
+    syses.forEach(s => {
+      if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(testSql)) {
+        if (['RoleID', 'mk_departmentcode', 'mk_organization'].includes(s)) {
+          decSql.push(`@${s} nvarchar(512)`)
+        } else if (['mk_address'].includes(s)) {
+          decSql.push(`@mk_address nvarchar(100)`)
+        } else {
+          decSql.push(`@${s} nvarchar(50)`)
+        }
+        secSql.push(`@${s}='@${s}@'`)
+        reps.push(s)
+      }
+    })
+    decSql = decSql.join(',')
+    secSql = secSql.join(',')
+  
+    // 闇�瑕佸０鏄庣殑鍙橀噺闆�
+
+    let _sql = `/* ${logLabel} */
+      BEGIN TRY 
+      begin TRAN
+
+      Declare @ErrorCode nvarchar(50), @retmsg nvarchar(4000), @account_id nvarchar(50), @account_year_id nvarchar(50), @account_code nvarchar(50), @account_year_code nvarchar(50), @tbid nvarchar(50)${decSql ? ',' + decSql : ''}
+
+      Select @ErrorCode='S', @retmsg='', @account_id='@account_id@', @account_year_id='@account_year_id@', @account_code='@account_code@', @account_year_code='@account_year_code@'${secSql ? ',' + secSql : ''}
+
+      ${_prev}
+      /* 澶栭儴鎺ュ彛鍏ュ弬 */
+      @mk_outer_params@
+      ${_back}
+      select @ErrorCode as ErrorCode,@retmsg as retmsg
+      ${callback}
+      `
+
+    _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, ' ')
+
+    reps = reps.filter(n => {
+      if (sysVars.includes(n.toLowerCase())) {
+        return false
+      }
+
+      return true
+    })
+
+    return { LText: _sql, md5: md5(_sql), reps, tbs: tables }
   }
 
   let _mainSearch = []
@@ -6000,5 +6598,32 @@
 
   filterComponent(config.components, _mainSearch)
 
+  let keys = sqls.map(item => item.uuid)
+  if (keys.length > Array.from(new Set(keys)).length) {
+    if (window.backend) {
+      let m = new Map()
+      let n = new Map()
+      sqls.forEach(item => {
+        if (m.has(item.uuid)) {
+          if (!n.has(item.uuid)) {
+            window.mkInfo(m.get(item.uuid))
+            n.set(item.uuid, true)
+          }
+          window.mkInfo(item)
+        } else {
+          m.set(item.uuid, item)
+        }
+      })
+  
+      notification.warning({
+        top: 92,
+        message: '瀛樺湪閲嶅鐨勫悗绔剼鏈琁D锛�',
+        duration: 5
+      })
+    }
+
+    return []
+  }
+
   return sqls
 }
\ No newline at end of file

--
Gitblit v1.8.0