From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/module/voucher/options.jsx | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/module/voucher/options.jsx b/src/menu/components/module/voucher/options.jsx
index 9867b17..2d78725 100644
--- a/src/menu/components/module/voucher/options.jsx
+++ b/src/menu/components/module/voucher/options.jsx
@@ -18,6 +18,17 @@
}
})
+ let menulist = sessionStorage.getItem('fstMenuList')
+ if (menulist) {
+ try {
+ menulist = JSON.parse(menulist)
+ } catch (e) {
+ menulist = []
+ }
+ } else {
+ menulist = []
+ }
+
modules = modules.filter(item => !bookids.includes(item.value))
const wrapForm = [
@@ -46,6 +57,7 @@
{field: 'voucherTypeText', values: ['createVoucher', 'checkVoucher']},
{field: 'voucherSign', values: ['createVoucher', 'checkVoucher']},
{field: 'supModule', values: ['checkTemp', 'checkVoucher']},
+ {field: 'attachStatus', values: ['createVoucher', 'checkVoucher']},
]
},
{
@@ -113,6 +125,36 @@
options: modules,
allowClear: true,
},
+ {
+ type: 'radio',
+ field: 'attachStatus',
+ label: '闄勪欢鐘舵��',
+ initval: wrap.attachStatus || 0,
+ tooltip: '娣诲姞鎴栦慨鏀瑰嚟璇佹椂锛屼笂浼犻檮浠剁殑鐘舵�併��',
+ required: true,
+ options: [
+ {value: 0, label: '寰呭鏍�'},
+ {value: 10, label: '宸插鏍�'},
+ ]
+ },
+ {
+ type: 'number',
+ field: 'space',
+ label: '鐣欑櫧',
+ initval: wrap.space || 0,
+ tooltip: '琛ㄦ牸涓讳綋閮ㄥ垎涓ょ鐨勭┖鐧借窛绂伙紝琛ㄦ牸鍦ㄧ紪杈戞椂涓ょ浼氭湁娣诲姞鍜屽垹闄ゅ浘鏍囥��',
+ required: false
+ },
+ {
+ type: 'cascader',
+ field: 'linkmenu',
+ label: '鍒锋柊鑿滃崟',
+ initval: wrap.linkmenu || [],
+ tooltip: '鐐瑰嚮鍏抽棴鏃堕渶瑕佸埛鏂扮殑鑿滃崟銆�',
+ required: false,
+ allowClear: true,
+ options: menulist
+ }
]
return wrapForm
--
Gitblit v1.8.0