From ee635de6fc758c044db0761faa003d0db1e82563 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:32:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 023cfb2..3321ff8 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -281,11 +281,6 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
{ reg: /@fullName@/ig, value: `'${fullName}'` }
@@ -631,11 +626,6 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
let LText = params.map((item, index) => {
let _sql = item.sql
@@ -658,7 +648,9 @@
func: 'sPC_Get_structured_data',
LText: LText.join(' union all '),
LText_field: LText_field.join(' union all '),
- BID: BID || ''
+ BID: BID || '',
+ username: userName,
+ fullName: fullName
}
param.LText = Utils.formatOptions(param.LText)
--
Gitblit v1.8.0