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/tabviews/custom/components/module/voucher/index.jsx | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/module/voucher/index.jsx b/src/tabviews/custom/components/module/voucher/index.jsx
index ec558e4..6e9f250 100644
--- a/src/tabviews/custom/components/module/voucher/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/index.jsx
@@ -38,6 +38,7 @@
remark: '',
attachments: 0,
vouAduited: false,
+ vouReadOnly: false,
attachlist: [],
oriAttachs: [],
tempTypes: [],
@@ -353,7 +354,8 @@
attachlist: files,
vouDate: res.fibvoucherdate ? moment(res.fibvoucherdate, 'YYYY-MM-DD') : null,
charType: res.voucher_class || 'keeping',
- vouAduited: res.voucher_status === 'true',
+ vouAduited: res.voucher_status === 'true' || res.read_only === 'true',
+ vouReadOnly: res.read_only === 'true',
charName: res.voucher_char,
charInt: res.voucher_char_int,
// orgcode: res.orgcode,
@@ -490,11 +492,11 @@
}
if (tip) {
- const _this = this
+ const that = this
confirm({
content: tip + '纭瑕佷繚瀛樺悧锛�',
onOk() {
- _this.voucherSave(list, t)
+ that.voucherSave(list, t)
},
onCancel() {}
})
@@ -698,7 +700,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
}
})
}
@@ -951,7 +953,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
}
})
}
@@ -1253,22 +1255,24 @@
}
render() {
- const { type, status, loading, config, orgcode, typeOptions, tempTypes, charType, charInt, data, vouDate, username, remark, attachments, title, attachlist, tempTypeClass, vouAduited } = this.state
+ const { type, status, loading, config, orgcode, typeOptions, tempTypes, charType, charInt, data, vouDate, username, remark, attachments, title, attachlist, tempTypeClass, vouAduited, vouReadOnly, voucherCode } = this.state
if (type === 'checkVoucher') {
return (
<div className="menu-voucher-wrap" style={config.style}>
<div className="voucher-header" style={{padding: `10px ${config.wrap.space || 0}px`}}>
- {!vouAduited ?<Button disabled={status === 'empty' || status === 'saved'} onClick={() => this.triggersave()}>淇濆瓨</Button> : null}
+ {!vouAduited ? <Button disabled={status === 'empty' || status === 'saved'} onClick={() => this.triggersave()}>淇濆瓨</Button> : null}
{/* <PrintVoucher ID={config.uuid + 'print'} data={data} orgname={orgname} vouDate={vouDate} charName={charName} charInt={charInt} attachments={attachments} disabled={status !== 'saved'}/> */}
<Button disabled={status !== 'saved'} onClick={this.triggerPrint}>鎵撳嵃</Button>
- {vouAduited ?
- <Button onClick={this.triggerUnAduit}>鍙栨秷瀹℃牳</Button> :
- <Button onClick={this.triggerAduit}>瀹℃牳</Button>}
+ {vouAduited && !vouReadOnly ? <Button onClick={this.triggerUnAduit}>鍙栨秷瀹℃牳</Button> : null}
+ {!vouAduited && !vouReadOnly ? <Button onClick={this.triggerAduit}>瀹℃牳</Button> : null}
<Button onClick={this.triggerclose}>鍏抽棴</Button>
</div>
<div className="voucher-body" style={{padding: `0px ${config.wrap.space || 0}px`}}>
<div className="pre-wrap">
+ <div className="voucher-number">
+ 鍑瘉鍙凤細{voucherCode}
+ </div>
<div className="voucher-code">
<Select value={charType} disabled={vouAduited} dropdownClassName="mk-vcode-dropdown" onChange={(val, option) => this.setState({status: 'change', charType: val, charName: option.props.charname, charInt: option.props.charint})}>
{typeOptions.map(option =>
@@ -1281,7 +1285,7 @@
鏃ユ湡锛�<DatePicker value={vouDate} disabled={vouAduited} onChange={this.changeVouDate}/>
</div>
<div className="voucher-text">
- <Input value={title} placeholder="鍑瘉鏂囨湰" disabled={vouAduited} autoComplete="off" onChange={(e) => this.setState({status: 'change', title: e.target.value})}/>
+ <Input value={title} placeholder={vouAduited ? '' : '鍑瘉鏂囨湰'} disabled={vouAduited} autoComplete="off" onChange={(e) => this.setState({status: 'change', title: e.target.value})}/>
</div>
<div className="voucher-affix">
闄勫崟鎹� <InputNumber precision={0} disabled={vouAduited} value={attachments || 0} autoComplete="off" onChange={this.changeAttach}/> 寮�
--
Gitblit v1.8.0