From 4a35288fe6230323b45b8396dd708334806fc13c Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Thu, 2 Dec 2021 13:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7-=E8=AF=AD=E8=A8=80=E5=88=87?= =?UTF-8?q?=E6=8D=A2=20=20sxm=202021-12-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sysLanguage.js | 4 +- src/assets/scss/global.scss | 11 + src/router/index.js | 4 - src/views/common/home.vue | 6 +- src/views/common/login.vue | 1 + src/views/main-content.vue | 2 +- src/views/main.vue | 1 + .../finishedProductWarehouse/boxingPrint.vue | 286 ++++++++++++++---- .../purchaseorder/procurementReview.vue | 11 +- src/views/modules/sys/language/common.vue | 22 +- 10 files changed, 271 insertions(+), 77 deletions(-) diff --git a/src/api/sysLanguage.js b/src/api/sysLanguage.js index 0a2d886..57da32d 100644 --- a/src/api/sysLanguage.js +++ b/src/api/sysLanguage.js @@ -31,8 +31,8 @@ export const saveSysLanguagePack = data => createAPI(`sysLanguagePack/saveSysLan // 保存多语言 单个 export const saveSysLanguageOne = data => createAPI(`sysLanguagePack/saveSysLanguageOne`,'post',data) - - +// 获取页面语言数据 +export const searchPageLanguageData = data => createAPI(`sysLanguagePack/searchPageLanguageData`,'post',data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 9951f87..1e6f4fe 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -290,3 +290,14 @@ div.el-time-width{ }*/ + +// 2021-11-29 13:29 sxm +//.el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label { +// line-height: 20px; +//} +// +//.el-input--medium .el-input__icon { +// line-height: 30px; +//} + + diff --git a/src/router/index.js b/src/router/index.js index daecaf0..63f5ccf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -152,10 +152,6 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) { { path: '*', redirect: { name: '404' } } ]) sessionStorage.setItem('dynamicMenuRoutes', JSON.stringify(mainRoutes.children || '[]')) - console.log('\n') - console.log('%c!<-------------------- 动态(菜单)路由 s -------------------->', 'color:blue') - console.log(mainRoutes.children) - console.log('%c!<-------------------- 动态(菜单)路由 e -------------------->', 'color:blue') } } diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 73451d6..cb4eaa1 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -11,11 +11,7 @@ export default { methods: { languageRefresh(){ - let bool = localStorage.getItem('refresh') - if (bool == '0'){ - this.$router.go(0); - localStorage.setItem('refresh','1') - } + console.log("欢迎使用 旭捷管理系统!!!") } }, computed: { diff --git a/src/views/common/login.vue b/src/views/common/login.vue index d87b0a0..45ac487 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -69,6 +69,7 @@ if (data && data.code === 0) { this.$cookie.set('token', data.token) this.$router.replace({ name: 'home' }) + this.$i18n.locale=data.language localStorage.setItem('locale', data.language) localStorage.setItem('refresh', "0") localStorage.setItem('userName', this.dataForm.userName) diff --git a/src/views/main-content.vue b/src/views/main-content.vue index f4b9f7a..4503db0 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -67,7 +67,7 @@ set (val) { this.$store.commit('common/updateMainTabsActiveName', val) } }, siteContentViewHeight () { - var height = this.documentClientHeight - 50 - 30 - 2 + var height = this.documentClientHeight - 50 - 2 if (this.$route.meta.isTab) { height -= 40 return isURL(this.$route.meta.iframeUrl) ? { height: height + 'px' } : { minHeight: height + 'px' } diff --git a/src/views/main.vue b/src/views/main.vue index 2686aa2..750e191 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -16,6 +16,7 @@ - diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue index fe86ffa..cad17f1 100644 --- a/src/views/modules/purchaseorder/procurementReview.vue +++ b/src/views/modules/purchaseorder/procurementReview.vue @@ -217,6 +217,8 @@ getReviewSteps, getFileList, } from '@/api/purchaseorder/procurementReview.js' + import axios from "axios"; + import Vue from "vue"; export default { components: { @@ -737,15 +739,14 @@ methods: { // 文件下载 fileDownload(row) { - this.$http({ - url: this.$http.adornUrl('ftp/file/downFtpFile'), - method: 'post', - data: JSON.stringify(row), + axios.get('/api/ftp/file/downFtpFile/' + row.id, { responseType: 'blob', headers: { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', + 'token':Vue.cookie.get('token') } }).then(({data}) => { + // 不限制文件下载类型 const blob = new Blob([data], {type: "application/octet-stream"}) // 下载文件名称 diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue index 3a7ed2f..ce7dfd2 100644 --- a/src/views/modules/sys/language/common.vue +++ b/src/views/modules/sys/language/common.vue @@ -87,6 +87,7 @@ + - @@ -141,7 +141,8 @@ import column from "../../common/column"; saveButtonList, searchSysLanguage, searchLanguageListByLanguageCode, - saveSysLanguageOne + saveSysLanguageOne, + searchPageLanguageData } from "@/api/sysLanguage.js" import getLodop from '@/utils/LodopFuncs.js' import { @@ -362,6 +363,8 @@ import column from "../../common/column"; settingTable: '设置列表', defaultTable: '设置默认配置' }, + pageLanguageData:{ + }, // 导出 start exportData: [], exportName: "页面功能语言", @@ -571,6 +574,21 @@ import column from "../../common/column"; this.languageList = data.rows }) }, + // 获取页面提示信息 + getMsgLanguage(){ + let queryLang = { + functionId: 9001, + table_id: 'common1001', + languageCode: this.$i18n.locale + } + + searchPageLanguageData(queryLang).then((data)=>{ + if (JSON.stringify(data.data) != '{}' ) { + this.pageLanguageData = data.data + } else { + } + }) + }, // 获取button的词典 getFunctionButtonList() { searchFunctionButtonList(this.queryButton).then(({data}) => {