From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10

---
 src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 86d94de..99a32d2 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -135,7 +135,7 @@
         width: '10%',
         editable: true,
         inputType: 'radio',
-        render: (text, record) => record.required === 'true' ? '鏄�' : '鍚�',
+        render: (text, record) => record.required === 'true' ? <span style={{color: 'red'}}>鏄�</span> : '鍚�',
         options: [
           {value: 'true', text: '鏄�'},
           {value: 'false', text: '鍚�'}
@@ -731,7 +731,7 @@
         }
 
         param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-        param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+        param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam)@/ig, `'${param.timestamp}'`)
         param.LText = param.LText.replace(/\n/g, ' ')
         
         param.LText = Utils.formatOptions(param.LText)
@@ -975,7 +975,7 @@
     }
   }
 
-  scriptsChange = (values, callback) => {
+  scriptsChange = (values, callback, skip) => {
     let verify = JSON.parse(JSON.stringify(this.state.verify))
 
     if (values.uuid) {
@@ -991,20 +991,27 @@
       verify.scripts.push(values)
     }
 
-    this.setState({loading: true})
-
-    this.sqlverify(() => { // 楠岃瘉鎴愬姛
+    if (skip) {
       this.setState({
-        loading: false,
         verify: verify
       })
       callback(true)
-    }, () => {             // 楠岃瘉澶辫触
-      this.setState({
-        loading: false
-      })
-      callback(false)
-    }, verify.scripts)
+    } else {
+      this.setState({loading: true})
+  
+      this.sqlverify(() => { // 楠岃瘉鎴愬姛
+        this.setState({
+          loading: false,
+          verify: verify
+        })
+        callback(true)
+      }, () => {             // 楠岃瘉澶辫触
+        this.setState({
+          loading: false
+        })
+        callback(false)
+      }, verify.scripts)
+    }
   }
 
   sqlverify = (_resolve, _reject, scripts) => {

--
Gitblit v1.8.0