From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/templates/zshare/verifycard/index.jsx |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index cc17e6e..e6c8b75 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -861,7 +861,10 @@
       }),
       onceUniqueColumns: this.state.onceUniqueColumns.map(col => {
         if (col.dataIndex === 'field') {
-          col.options = _columns
+          col.options = fromJS(_columns).toJS().map(n => {
+            n.label = `${n.label}锛�${n.field}锛塦
+            return n
+          })
         }
         return col
       }),
@@ -2024,7 +2027,8 @@
       _lpline = `set @ModularDetailCode= right('${record.ModularDetailCode}',50)`
     }
 
-    let sql = `select @BillCode='', @${record.field}='', @ModularDetailCode=''
+    let sql = `Declare @BillCode nvarchar(50),@ModularDetailCode nvarchar(50)
+    select @BillCode='', @${record.field}='', @ModularDetailCode=''
     ${_lpline}
     exec s_get_BillCode
       @ModularDetailCode=@ModularDetailCode,

--
Gitblit v1.8.0