From cc810edac6aec3c858fb352091ad8c11332447a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:12:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/verifycard/index.jsx | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 2dcdd58..57ba2b9 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -42,6 +42,7 @@
activeKey: 'base',
appType: sessionStorage.getItem('appType'),
notes: [], // 鐭俊妯℃澘
+ emailCodes: [], // 閭妯℃澘
verify: {},
fields: [],
usefulfields: '',
@@ -571,9 +572,9 @@
_verify.default = _verify.default || 'true'
_verify.wxNote = _verify.wxNote || 'false' // 鍏紬鍙锋秷鎭帹閫佹槸鍚﹀紑鍚�
_verify.noteEnable = _verify.noteEnable || 'false' // 鐭俊鍙戦�佹槸鍚﹀紑鍚�
+ _verify.emailEnable = _verify.emailEnable || 'false' // 閭欢鍙戦�佹槸鍚﹀紑鍚�
_verify.printEnable = _verify.printEnable || 'false' // 鍗曟嵁鎵撳嵃鏄惁寮�鍚�
- _verify.noteType = _verify.noteType || 'N' // 鐭俊鍙戦�佹ā寮忥細Y锛堝疄鏃讹級銆丯锛堝畾鏃讹級
- _verify.noteTemp = _verify.noteTemp || 'Y' // 鐭俊鍙戦�佹ā鏉匡細Y锛堢浉鍚岋級銆丯锛堜笉鍚岋級
+ _verify.preHandle = _verify.preHandle || 'false' // 鎸夐挳棰勫鐞嗘槸鍚﹀紑鍚�
_verify.invalid = _invalid
_verify.uniques = _verify.uniques || []
_verify.contrasts = _verify.contrasts || []
@@ -1063,6 +1064,11 @@
LText: window.btoa(window.encodeURIComponent(`select t.id,templatecode,'['+SignName+']'+describe as describe from (select * from bd_msn_sms_temp where deleted=0 and TypeDesc='QX' and status=20 ) t inner join (select openid from susers where uid=@userid@) u on t.openid =t.openid`))
},
{
+ obj_name: 'emailCodes',
+ arr_field: 'msn_email_temp_no,remark,id',
+ LText: window.btoa(window.encodeURIComponent(`select t.id,t.msn_email_temp_no,t.remark from (select * from bd_msn_email_temp where deleted=0) t inner join (select openid from susers where uid=@userid@) u on t.openid=t.openid`))
+ },
+ {
obj_name: 'scripts',
arr_field: 'funcname,longparam',
LText: window.btoa(window.encodeURIComponent(`Select distinct func+Remark as funcname,longparam, s.Sort from s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`))
@@ -1101,6 +1107,13 @@
return {
name: item.describe,
value: item.templatecode,
+ id: item.id
+ }
+ }),
+ emailCodes: res.emailCodes.map(item => {
+ return {
+ name: item.remark,
+ value: item.msn_email_temp_no,
id: item.id
}
}),
@@ -1559,7 +1572,7 @@
render() {
const { card, columns } = this.props
- const { activeKey, verifyInter, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
+ const { activeKey, verifyInter, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, emailCodes, appType } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -1581,7 +1594,7 @@
{verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
</span>
} key="base">
- <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} verify={verify} notes={notes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
+ <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} verify={verify} notes={notes} emailCodes={emailCodes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
</TabPane> : null}
{verifyInter === 'system' ? <TabPane tab={
<span>
--
Gitblit v1.8.0