From 607b5dc4059be1843b6c0f670b93f107fc263375 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 三月 2020 16:08:29 +0800
Subject: [PATCH] 2020-03-19
---
src/tabviews/zshare/actionList/index.jsx | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index d8f3716..4832c00 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -236,6 +236,13 @@
let printlist = []
let templates = [btn.verify.Template]
+ let printCount = 1
+
+ if (formdata.printCount && typeof(formdata.printCount) === 'number' && formdata.printCount >= 1) {
+ printCount = formdata.printCount
+
+ delete formdata.printCount
+ }
this.setState({loadingUuid: btn.uuid})
@@ -244,23 +251,15 @@
formdata.TemplateID = btn.verify.Template
if (btn.Ot === 'notRequired') {
- if (formdata.printCount && typeof(formdata.printCount) === 'number' && formdata.printCount > 1) {
- for (let i = 0; i < formdata.printCount; i++) {
- printlist.push(JSON.parse(JSON.stringify(formdata)))
- }
- } else {
- printlist.push(formdata)
+ for (let i = 0; i < printCount; i++) {
+ printlist.push(JSON.parse(JSON.stringify(formdata)))
}
} else {
data.forEach(cell => {
let _cell = {...cell, ...formdata}
- if (formdata.printCount && typeof(formdata.printCount) === 'number' && formdata.printCount > 1) {
- for (let i = 0; i < formdata.printCount; i++) {
- printlist.push(JSON.parse(JSON.stringify(_cell)))
- }
- } else {
- printlist.push(_cell)
+ for (let i = 0; i < printCount; i++) {
+ printlist.push(JSON.parse(JSON.stringify(_cell)))
}
})
}
@@ -276,12 +275,14 @@
_cell.TemplateID = btn.verify.Template
}
- if (item.count && typeof(item.count) === 'number' && item.count > 1) {
- for (let i = 0; i < item.count; i++) {
- printlist.push(JSON.parse(JSON.stringify(_cell)))
- }
- } else {
- printlist.push(_cell)
+ let _count = printCount
+
+ if (item.count && typeof(item.count) === 'number' && item.count >= 1) {
+ _count = item.count
+ }
+
+ for (let i = 0; i < _count; i++) {
+ printlist.push({...formdata, ..._cell})
}
})
--
Gitblit v1.8.0