From a7345d50d26c17028381c09edcaac2781aac6157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 25 Feb 2023 09:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=B3=BB=E7=BB=9F=E9=A1=B5=E5=A4=B4?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E7=9A=84?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/page/GlobalHeader.vue | 21 +++++++++++++++++--
.../financial/modules/AdvanceInModal.vue | 3 ++-
.../src/views/financial/modules/GiroModal.vue | 3 ++-
.../views/financial/modules/ItemInModal.vue | 3 ++-
.../views/financial/modules/ItemOutModal.vue | 1 +
.../views/financial/modules/MoneyInModal.vue | 3 ++-
.../views/financial/modules/MoneyOutModal.vue | 3 ++-
7 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/jshERP-web/src/components/page/GlobalHeader.vue b/jshERP-web/src/components/page/GlobalHeader.vue
index cd18079d..2614b61a 100644
--- a/jshERP-web/src/components/page/GlobalHeader.vue
+++ b/jshERP-web/src/components/page/GlobalHeader.vue
@@ -12,7 +12,7 @@
:type="collapsed ? 'menu-fold' : 'menu-unfold'"
@click="toggle">
-
+ {{ companyName }}
{{ systemTitle }}
@@ -45,6 +45,7 @@
import UserMenu from '../tools/UserMenu'
import SMenu from '../menu/'
import Logo from '../tools/Logo'
+ import { getCurrentSystemConfig } from '@/api/api'
import { mixin } from '@/utils/mixin.js'
@@ -86,6 +87,7 @@
return {
headerBarFixed: false,
systemTitle: window.SYS_TITLE,
+ companyName: '',
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
topMenuStyle: {
headerIndexLeft: {},
@@ -118,6 +120,9 @@
}
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
},
+ created () {
+ this.initSystemConfig()
+ },
methods: {
handleScroll() {
if (this.autoHideHeader) {
@@ -154,7 +159,14 @@
},
searchGlobalHeader(key, id, title, component){
this.$emit("searchGlobalLayout", key, id, title, component)
- }
+ },
+ initSystemConfig() {
+ getCurrentSystemConfig().then((res) => {
+ if(res.code === 200 && res.data){
+ this.companyName = res.data.companyName
+ }
+ })
+ },
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
}
}
@@ -212,6 +224,11 @@
line-height: @height;
}
+ .company-name {
+ font-size:16px;
+ padding-left:10px
+ }
+
/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
\ No newline at end of file
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index 5eeaec8f..ddf0c89b 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -128,6 +128,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
visible: false,
+ prefixNo: 'SYF',
model: {},
fileList:[],
labelCol: {
@@ -185,7 +186,7 @@
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
- this.addInit("SYF")
+ this.addInit(this.prefixNo)
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index d26b9cfa..efc059b7 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -134,6 +134,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
visible: false,
+ prefixNo: 'ZZ',
model: {},
fileList:[],
labelCol: {
@@ -196,7 +197,7 @@
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
- this.addInit("ZZ")
+ this.addInit(this.prefixNo)
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 50ed184b..fe45d1dc 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -142,6 +142,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
visible: false,
+ prefixNo: 'SR',
model: {},
fileList:[],
labelCol: {
@@ -209,7 +210,7 @@
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
- this.addInit("SR")
+ this.addInit(this.prefixNo)
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 825594b7..f3942810 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -142,6 +142,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
visible: false,
+ prefixNo: 'ZC',
model: {},
fileList:[],
labelCol: {
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 6f3eeb89..da1872bf 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -174,6 +174,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 0,
visible: false,
+ prefixNo: 'SK',
model: {},
fileList:[],
labelCol: {
@@ -231,7 +232,7 @@
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
- this.addInit("SK")
+ this.addInit(this.prefixNo)
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 2f539249..4bcd3e6a 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -174,6 +174,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 0,
visible: false,
+ prefixNo: 'FK',
model: {},
fileList:[],
labelCol: {
@@ -234,7 +235,7 @@
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
- this.addInit("FK")
+ this.addInit(this.prefixNo)
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr