wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

用户-语言切换 sxm 2021-12-2

master
[li_she] 4 years ago
parent
2eaa9abc9c
commit
4a35288fe6
10 changed files with 271 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/sysLanguage.js
  2. 11
      src/assets/scss/global.scss
  3. 4
      src/router/index.js
  4. 6
      src/views/common/home.vue
  5. 1
      src/views/common/login.vue
  6. 2
      src/views/main-content.vue
  7. 1
      src/views/main.vue
  8. 286
      src/views/modules/finishedProductWarehouse/boxingPrint.vue
  9. 11
      src/views/modules/purchaseorder/procurementReview.vue
  10. 22
      src/views/modules/sys/language/common.vue

4
src/api/sysLanguage.js
View File

@ -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)

11
src/assets/scss/global.scss
View File

@ -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;
//}

4
src/router/index.js
View File

@ -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')
}
}

6
src/views/common/home.vue
View File

@ -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: {

1
src/views/common/login.vue
View File

@ -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)

2
src/views/main-content.vue
View File

@ -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' }

1
src/views/main.vue
View File

@ -16,6 +16,7 @@
<script>
import MainNavbar from './main-navbar'
import MainSidebar from './main-sidebar'
import MainContent from './main-content'
export default {

286
src/views/modules/finishedProductWarehouse/boxingPrint.vue
View File

@ -1,19 +1,41 @@
<template>
<div class="mod-config">
<div>
<div class="sl">
<div ref="sl_search">
<span @click="favoriteFunction()">
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
</span>
<el-button @click="searchList()" type="primary">{{ buttons.search }}</el-button>
<el-button @click="searchShowDiv()" type="primary">{{ buttons.search }}</el-button>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
<el-button v-if="isAuth('sys:setting')" @click="saveColumnList()" type="primary" v-show="showDefault">{{ buttons.defaultTable }}
</el-button>
<el-form :inline="true" label-position="top" :model="queryData" @keyup.enter.native="searchList()"
v-show="searchShow">
<el-form-item label="箱号">
<el-input style="width: 150px" v-model="queryData.boxNo" clearable>
</el-input>
</el-form-item>
<el-form-item label="销售单号">
<el-input style="width: 150px" v-model="queryData.orderNo" clearable>
</el-input>
</el-form-item>
<el-form-item label="物料编号">
<el-input style="width: 150px" v-model="queryData.itemCode" clearable>
</el-input>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker style="width: 150px" value-format="yyyy-MM-dd HH:mm:ss" type="date"
v-model="queryData.createdDate">
</el-date-picker>
</el-form-item>
<el-form-item label=" - ">
<el-button @click="searchList()" type="primary">{{ buttons.select }}</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:height="height"
:data="dataList"
border
@ -30,9 +52,10 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
{{ scope.row[item.columnProp] }}
<!-- <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
<!-- <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
<!-- style="width: 100px; height: 80px"/></span>-->
</template>
</el-table-column>
<el-table-column
@ -40,41 +63,55 @@
header-align="center"
align="center"
width="150"
label="操作">
:label="buttons.cz">
<template slot-scope="scope">
<a type="text" size="small" @click="openPrintDialog(scope.row)" herf="#">补打标签</a>
<a type="text" size="small" @click="openPrintDialog(scope.row)" herf="#">{{ buttons.boxPrint }}</a>
</template>
</el-table-column>
</el-table>
<!-- 设置列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<!-- 模板列表 -->
<el-dialog
:title="msgData.printDialog"
v-drag
:title="pageLanguageData.printDialog"
:visible.sync="printVisible"
width="30%"
width="220px"
center>
<el-select :placeholder="msgData.printTemplateMsg" v-model="reportFileVo">
<el-option v-for="(item,index) in printTemplates" :key="index" :label="item.reportFileVo" :value="item"></el-option>
</el-select>
<dev style="margin: 0 auto">
<el-select style="width: 200px" :placeholder="pageLanguageData.printTemplateMsg" v-model="reportFileVo">
<el-option v-for="(item,index) in printTemplates" :key="index" :label="item.reportFileVo"
:value="item.reportIdVo"></el-option>
</el-select>
</dev>
<span slot="footer" class="dialog-footer">
<el-button @click="printVisible = false">取 消</el-button>
<el-button type="primary" @click="printBox()">打印</el-button>
<el-button type="primary" @click="printBox()">{{ buttons.print }}</el-button>
<el-button @click="printVisible = false">{{ buttons.close }}</el-button>
</span>
</el-dialog>
<!-- 设置列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
</div>
</template>
<script>
import {getSoBoxingList,getReportFileListByCustomerId,getCustomerId,printPacking} from '@/api/finishedProductWarehouse/soBoxes.js'
import {
getSoBoxingList,
getReportFileListByCustomerId,
getCustomerId,
printPacking
} from '@/api/finishedProductWarehouse/soBoxes.js'
import column from "../common/column";
import search from "../common/search";
import {
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchPageLanguageData
} from "@/api/sysLanguage.js"
import {
saveTableDefaultList,
@ -100,16 +137,15 @@ export default {
visible: false,
showDefault: false,
queryData: {
day: '',
rollno: '',
partno: ''
},
reportFileVo:{
reportFamily: '',
reportId: '',
isCustomer: ''
boxNo: '',
orderNo: '',
itemCode: '',
createdDate: this.dayjs().format('YYYY-MM-DD HH:mm:ss')
},
reportFileVo: '',
boxNumber: 0,
itemCode: '',
orderNo: '',
// 打印模板列表
printTemplates: [],
// 语言词典集合
@ -310,6 +346,98 @@ export default {
}
],
dataList: [],
pageLanguageDataList: [
{
functionId: "1001",
languageValue: '操作',
objectId: 'operate',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '销售单号',
objectId: 'shopOrderNo',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '箱号',
objectId: 'boxNo',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '物料编号',
objectId: 'partNo',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '创建时间',
objectId: 'createdDate',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '搜索',
objectId: 'search',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '设置列表',
objectId: 'setting',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '取消',
objectId: 'recall',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '打印',
objectId: 'print',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '请选择模板',
objectId: 'printTemplateMsg',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '打印模板选择',
objectId: 'printDialog',
objectType: "page",
tableId: "boxingPrint"
},
{
functionId: "1001",
languageValue: '标签打印',
objectId: 'labelPrint',
objectType: "page",
tableId: "boxingPrint"
}
],
queryPageLang: {
functionId: "1001",
objectType: "page",
tableId: "boxingPrint",
languageCode: this.$i18n.locale
},
buttons: {
add: '添加',
edit: '编辑',
@ -317,11 +445,15 @@ export default {
deleteList: '批量删除',
cz: '操作',
search: '搜索',
select: '查询',
download: '导出',
settingTable: '设置列表',
defaultTable: '设置默认配置'
defaultTable: '设置默认配置',
print: '打印',
close: '取消',
boxPrint: '标签打印'
},
msgData: {
pageLanguageData: {
printDialog: "打印模板选择",
printTemplateMsg: "请选择模板",
},
@ -335,64 +467,83 @@ export default {
search
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 165;
})
this.getAutoHeight()
},
activated() {
this.searchList()
},
methods: {
// 打开搜索条件
searchShowDiv() {
if (this.searchShow) {
this.searchShow = false
} else {
this.searchShow = true
}
},
// 打开打印模态框
openPrintDialog(val){
this.boxNumber =val.rollsQty
openPrintDialog(val) {
this.boxNumber = val.rollsQty
this.itemCode = val.itemCode
this.orderNo = val.orderNo
this.printVisible = true
this.getReportFileListByCustomerId(val.itemCode)
},
// 打印
printBox(){
printBox() {
this.printVisible = false
let reportFile = this.reportFileVo.split(":");
let reportFileVo = {
reportFamily: this.reportFileVo.reportFamily,
reportId: this.reportFileVo.reportId,
isCustomer: this.reportFileVo.isCustomer,
pickingNumber: this.boxNumber
reportFile: reportFile[2],
reportId: reportFile[1],
isCustomer: reportFile[0],
pickingNumber: this.boxNumber,
partNo: this.itemCode,
orderNo: this.orderNo
}
printPacking(reportFileVo).then(({data})=>{
if (data.code == 0){
printPacking(reportFileVo).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
}
if (data.code == 500){
if (data.code == 500) {
this.$message.error(data.msg)
}
}).error(({data})=>{
this.$message.error(data.msg)
})
},
// 获取打印模板数据
getReportFileListByCustomerId(partNo){
getReportFileListByCustomerId(partNo) {
let vo = {
partNo: partNo
}
getCustomerId(vo).then((data)=>{
getCustomerId(vo).then((data) => {
let reportFileVo = {
customerId: data. customerId,
customerId: data.customerId,
reportFamily: '外箱标签'
}
getReportFileListByCustomerId(reportFileVo).then(({data}) =>{
this.printTemplates = data.reportFileVos
getReportFileListByCustomerId(reportFileVo).then(({data}) => {
this.printTemplates = data.reportFileVos
this.reportFileVo = data.reportFileVos[0].reportIdVo
})
})
},
// 获取数据
searchList() {
let soBoxing = {}
getSoBoxingList(soBoxing).then(({data}) => {
getSoBoxingList(this.queryData).then(({data}) => {
this.dataList = data.data
})
},
// 这个方法用来动态设置 height
getAutoHeight() {
// 一定要使用 nextTick 来改变height 不然不会起作用
this.$nextTick(() => {
this.height = window.innerHeight - 174;
});
},
// 校验用户是否收藏
favoriteIsOk() {
let userFavorite = {
@ -435,6 +586,16 @@ export default {
}
},
// 获取页面所有语言数据
// 获取页面提示信息
getPageLanguageData() {
searchPageLanguageData(this.queryPageLang).then((data) => {
if (JSON.stringify(data.data) != '{}') {
this.pageLanguageData = data.data
} else {
}
})
},
// 获取button的词典
getFunctionButtonList() {
let queryButton = {
@ -495,6 +656,8 @@ export default {
this.showDefault = false
saveButtonList(this.buttonList).then(({data}) => {
})
saveButtonList(this.buttonList).then(({data}) => {
})
saveTableDefaultList(this.columnList).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
@ -504,8 +667,9 @@ export default {
this.$message.error(data.msg)
}
})
this.getFunctionButtonList();
this.getColumnList()
/* this.getFunctionButtonList();
this.getPageLanguageData()
this.getColumnList()*/
},
// 获取 tableDefault 列
getColumnList() {
@ -533,9 +697,15 @@ export default {
}
}
</script>
<style scoped>
<style>
.sl-svg {
overflow: hidden;
float: right;
}
.el-dialog--center .el-dialog__body {
text-align: center;
padding: 0;
}
</style>

11
src/views/modules/purchaseorder/procurementReview.vue
View File

@ -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"})
// 下载文件名称

22
src/views/modules/sys/language/common.vue
View File

@ -87,6 +87,7 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="'设置语言一'+querySysLanguagePack.languageCode" :visible.sync="addLanguage" width="1000px">
<el-table
height="450"
:data="languageDataList"
@ -126,7 +127,6 @@
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@ -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}) => {

Write Preview
Loading…
Cancel
Save