From bd9dfa6b6ff25dbab21ba9a249fc9d9f4d03dce2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 20 二月 2024 14:08:39 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/billprint/index.jsx | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx index d64cb91..453d8a0 100644 --- a/src/views/billprint/index.jsx +++ b/src/views/billprint/index.jsx @@ -851,9 +851,9 @@ param.menuname = MenuName } - param.exec_type = 'y' - param.LText = Utils.formatOptions(LText.join(' union all ')) - param.custom_script = Utils.formatOptions(LText_field.join(' union all ')) + param.exec_type = window.GLOB.execType || 'y' + param.LText = Utils.formatOptions(LText.join(' union all '), param.exec_type) + param.custom_script = Utils.formatOptions(LText_field.join(' union all '), param.exec_type) param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') param.secretkey = Utils.encrypt('', param.timestamp) -- Gitblit v1.8.0