From ec98e336b79afc2a43c998134b46b71e0e201049 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 20 八月 2021 18:24:09 +0800
Subject: [PATCH] 2021-08-20

---
 src/utils/utils.js |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 93d0120..aaa6d10 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1188,6 +1188,10 @@
       if (!_initvars.includes(_key)) {
         let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
 
+        if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
+          _val = '1900-01-01'
+        }
+
         _initvars.push(_key)
         _initColfields.push(`@${_key}='${_val}'`)
       }
@@ -1754,6 +1758,9 @@
     _sql += `
       aaa: if @ErrorCode!=''
       insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
+  } else if (btn.output) {
+    _sql += `
+      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id`
   } else {
     _sql += `
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`

--
Gitblit v1.8.0