From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/module/voucher/options.jsx | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/module/voucher/options.jsx b/src/menu/components/module/voucher/options.jsx
index 66f968a..2f268e6 100644
--- a/src/menu/components/module/voucher/options.jsx
+++ b/src/menu/components/module/voucher/options.jsx
@@ -1,3 +1,4 @@
+import React from 'react'
import MenuUtils from '@/utils/utils-custom.js'
/**
@@ -17,6 +18,17 @@
bookids.push(item.uuid)
}
})
+
+ 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))
@@ -45,6 +57,7 @@
{field: 'voucherType', values: ['createVoucher', 'checkVoucher']},
{field: 'voucherTypeText', values: ['createVoucher', 'checkVoucher']},
{field: 'voucherSign', values: ['createVoucher', 'checkVoucher']},
+ {field: 'printTemp', values: ['createVoucher', 'checkVoucher']},
{field: 'supModule', values: ['checkTemp', 'checkVoucher']},
{field: 'attachStatus', values: ['createVoucher', 'checkVoucher']},
]
@@ -126,6 +139,44 @@
{value: 10, label: '宸插鏍�'},
]
},
+ {
+ type: 'printTemps',
+ field: 'printTemp',
+ label: '鎵撳嵃妯℃澘',
+ initval: wrap.printTemp || '',
+ help: (record) => {
+ if (record.printTemp) {
+ return <span onClick={() => {
+ sessionStorage.setItem('mk-print-temp', record.printTemp)
+ window.open('#/hs')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('mk-print-temp')
+ }, 50)
+ }} style={{color: '#1890ff', cursor: 'pointer', fontSize: '13px'}}>#鏌ョ湅妯℃澘</span>
+ }
+ return ''
+ },
+ required: true
+ },
+ {
+ 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