From 9b0754adb7fbe595eef73010992c0ce53ef6571a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 十月 2023 17:22:36 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/verifycard/baseform/index.jsx | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/templates/zshare/verifycard/baseform/index.jsx b/src/templates/zshare/verifycard/baseform/index.jsx
index 6ea9c9e..83c366d 100644
--- a/src/templates/zshare/verifycard/baseform/index.jsx
+++ b/src/templates/zshare/verifycard/baseform/index.jsx
@@ -279,7 +279,7 @@
}
render() {
- const { unionFields, verify, notes, card, appType } = this.props
+ const { unionFields, verify, notes, card, appType, columns } = this.props
const { wxTemps, selectTemp } = this.state
const formItemLayout = {
labelCol: {
@@ -290,6 +290,17 @@
xs: { span: 24 },
sm: { span: 16 }
}
+ }
+
+ let _columns = []
+ if (window.GLOB.process) {
+ _columns = columns.filter(col => {
+ if (!col.field) return false
+ if (col.field.toLowerCase() === 'id') return false
+ if (col.type === 'text' && col.fieldlength > 100) return false
+
+ return true
+ })
}
return (
@@ -462,6 +473,22 @@
</Radio.Group>
</Form.Item>
</Col> : null}
+ {window.GLOB.process && verify.workFlow === 'true' && verify.flowType === 'approval' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="bottomLeft" title="濡傛灉瀹℃壒瀛樺湪澶氭潯鍒嗘敮锛屽彲娣诲姞瀹℃壒娴佺▼鐨勬帶鍒跺瓧娈碉紝閫氳繃琛屼俊鎭帶鍒舵祦绋嬭蛋鍚戙�傛敞锛氶渶鍦ㄦ祦绋嬪浘涓畬鍠勫垎鏀殑鎵ц鏉′欢銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 娴佺▼鎺у埗
+ </Tooltip>
+ }>
+ <Select allowClear value={verify.flowBranch} onChange={(val) => {this.onOptionChange(val || '', 'flowBranch')}}>
+ {_columns.map(option =>
+ <Select.Option key={option.field} value={option.field}>
+ {option.label}
+ </Select.Option>
+ )}
+ </Select>
+ </Form.Item>
+ </Col> : null}
<Col span={24}></Col>
<Col span={8}>
<Form.Item label={
--
Gitblit v1.8.0