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

Merge remote-tracking branch 'origin/master'

master
rui_li 5 years ago
parent
3b5737e594 4a35288fe6
commit
b04f84e8d4
13 changed files with 768 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/api/finishedProductWarehouse/soBoxes.js
  2. 4
      src/api/sysLanguage.js
  3. 11
      src/assets/scss/global.scss
  4. 4
      src/router/index.js
  5. 6
      src/views/common/home.vue
  6. 1
      src/views/common/login.vue
  7. 2
      src/views/main-content.vue
  8. 1
      src/views/main.vue
  9. 1
      src/views/modules/common/upload.vue
  10. 711
      src/views/modules/finishedProductWarehouse/boxingPrint.vue
  11. 11
      src/views/modules/purchaseorder/procurementReview.vue
  12. 22
      src/views/modules/sys/language/common.vue
  13. 2
      src/views/modules/sys/menu.vue

13
src/api/finishedProductWarehouse/soBoxes.js
View File

@ -0,0 +1,13 @@
import { createAPI } from "@/utils/httpRequest.js";
// 获取箱数据
export const getSoBoxingList = data => createAPI('/soBoxing/getSoBoxingList','post',data)
// 获取打印模板数据
export const getReportFileListByCustomerId = data => createAPI('/packing/getReportFileListByCustomerId','post',data)
// 获取物料的对应的客户
export const getCustomerId = data => createAPI('/packing/getCustomerId','post',data)
// 外箱打印
export const printPacking = data => createAPI('/packing/printPacking','post',data)

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 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' } } { path: '*', redirect: { name: '404' } }
]) ])
sessionStorage.setItem('dynamicMenuRoutes', JSON.stringify(mainRoutes.children || '[]')) 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 { export default {
methods: { methods: {
languageRefresh(){ languageRefresh(){
let bool = localStorage.getItem('refresh')
if (bool == '0'){
// this.$router.go(0);
localStorage.setItem('refresh','1')
}
console.log("欢迎使用 旭捷管理系统!!!")
} }
}, },
computed: { computed: {

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

@ -69,6 +69,7 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.$cookie.set('token', data.token) this.$cookie.set('token', data.token)
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
this.$i18n.locale=data.language
localStorage.setItem('locale', data.language) localStorage.setItem('locale', data.language)
localStorage.setItem('refresh', "0") localStorage.setItem('refresh', "0")
localStorage.setItem('userName', this.dataForm.userName) 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) } set (val) { this.$store.commit('common/updateMainTabsActiveName', val) }
}, },
siteContentViewHeight () { siteContentViewHeight () {
var height = this.documentClientHeight - 50 - 30 - 2
var height = this.documentClientHeight - 50 - 2
if (this.$route.meta.isTab) { if (this.$route.meta.isTab) {
height -= 40 height -= 40
return isURL(this.$route.meta.iframeUrl) ? { height: height + 'px' } : { minHeight: height + 'px' } return isURL(this.$route.meta.iframeUrl) ? { height: height + 'px' } : { minHeight: height + 'px' }

1
src/views/main.vue
View File

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

1
src/views/modules/common/upload.vue
View File

@ -9,7 +9,6 @@
:show-file-list="false" :show-file-list="false"
style="text-align: center;"> style="text-align: center;">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</div> </div>
</template> </template>

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

@ -0,0 +1,711 @@
<template>
<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="searchShowDiv()" type="primary">{{ buttons.search }}</el-button>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
<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
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
{{ 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
fixed="right"
header-align="center"
align="center"
width="150"
:label="buttons.cz">
<template slot-scope="scope">
<a type="text" size="small" @click="openPrintDialog(scope.row)" herf="#">{{ buttons.boxPrint }}</a>
</template>
</el-table-column>
</el-table>
<!-- 模板列表 -->
<el-dialog
v-drag
:title="pageLanguageData.printDialog"
:visible.sync="printVisible"
width="220px"
center>
<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 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 column from "../common/column";
import search from "../common/search";
import {
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchPageLanguageData
} from "@/api/sysLanguage.js"
import {
saveTableDefaultList,
getTableDefaultListLanguage,
getTableUserListLanguage
} from "@/api/table.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
data() {
return {
printVisible: false,
searchVisible: false,
searchShow: false,
// table高度
height: 450,
// 是否收藏
favorite: false,
addLanguage: false,
functionId: 1001,
tableId: "1001BoxingPrint",
languageCode: this.$i18n.locale,
visible: false,
showDefault: false,
queryData: {
boxNo: '',
orderNo: '',
itemCode: '',
createdDate: this.dayjs().format('YYYY-MM-DD HH:mm:ss')
},
reportFileVo: '',
boxNumber: 0,
itemCode: '',
orderNo: '',
// 打印模板列表
printTemplates: [],
// 语言词典集合
sysLanguageParams: [],
columnList: [
{
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "id",
headerAlign: "center",
align: "center",
columnLabel: "主键",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintId'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "site",
headerAlign: "center",
align: "center",
columnLabel: "工厂编号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintSite'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "boxNo",
headerAlign: "center",
align: "center",
columnLabel: "箱编号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintBoxNo'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "orderNo",
headerAlign: "center",
align: "center",
columnLabel: "订单编号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintOrderNo'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "batchCode",
headerAlign: "center",
align: "center",
columnLabel: "批号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintBatchCode'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "itemCode",
headerAlign: "center",
align: "center",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintItemCode'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "status",
headerAlign: "center",
align: "center",
columnLabel: "状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintStatus'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "status2",
headerAlign: "center",
align: "center",
columnLabel: "状态2",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintStatus2'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "rollsQty",
headerAlign: "center",
align: "center",
columnLabel: "卷数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintRollsQty'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "boxType",
headerAlign: "center",
align: "center",
columnLabel: "箱类型",
columnHidden: true,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintBoxType'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "createdDate",
headerAlign: "center",
align: "center",
columnLabel: "创建时间",
columnHidden: true,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintCreatedDate'
}, {
userId: this.$store.state.user.name,
functionId: 1001,
tableId: "1001BoxingPrint",
tableName: "so_receive_boxes",
columnProp: "createdBy",
headerAlign: "center",
align: "center",
columnLabel: "创建人",
columnHidden: true,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
serialNumber: '1001BoxingPrintCreatedBy'
}
],
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: '编辑',
delete: '删除',
deleteList: '批量删除',
cz: '操作',
search: '搜索',
select: '查询',
download: '导出',
settingTable: '设置列表',
defaultTable: '设置默认配置',
print: '打印',
close: '取消',
boxPrint: '标签打印'
},
pageLanguageData: {
printDialog: "打印模板选择",
printTemplateMsg: "请选择模板",
},
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false
}
},
components: {
column,
search
},
mounted() {
this.getAutoHeight()
},
activated() {
this.searchList()
},
methods: {
// 打开搜索条件
searchShowDiv() {
if (this.searchShow) {
this.searchShow = false
} else {
this.searchShow = true
}
},
// 打开打印模态框
openPrintDialog(val) {
this.boxNumber = val.rollsQty
this.itemCode = val.itemCode
this.orderNo = val.orderNo
this.printVisible = true
this.getReportFileListByCustomerId(val.itemCode)
},
// 打印
printBox() {
this.printVisible = false
let reportFile = this.reportFileVo.split(":");
let reportFileVo = {
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) {
this.$message.success(data.msg)
}
if (data.code == 500) {
this.$message.error(data.msg)
}
})
},
// 获取打印模板数据
getReportFileListByCustomerId(partNo) {
let vo = {
partNo: partNo
}
getCustomerId(vo).then((data) => {
let reportFileVo = {
customerId: data.customerId,
reportFamily: '外箱标签'
}
getReportFileListByCustomerId(reportFileVo).then(({data}) => {
this.printTemplates = data.reportFileVos
this.reportFileVo = data.reportFileVos[0].reportIdVo
})
})
},
// 获取数据
searchList() {
getSoBoxingList(this.queryData).then(({data}) => {
this.dataList = data.data
})
},
// 这个方法用来动态设置 height
getAutoHeight() {
// 一定要使用 nextTick 来改变height 不然不会起作用
this.$nextTick(() => {
this.height = window.innerHeight - 174;
});
},
// 校验用户是否收藏
favoriteIsOk() {
let userFavorite = {
userId: this.$store.state.user.id,
languageCode: this.$i18n.locale
}
userFavoriteList(userFavorite).then(({data}) => {
let size = data.list.filter(item => item.menuId == this.$route.meta.menuId).length;
if (size > 0) {
this.favorite = true
} else {
this.favorite = false
}
})
},
// 收藏 OR 取消收藏
favoriteFunction() {
let userFavorite = {
userId: this.$store.state.user.id,
functionId: this.$route.meta.menuId,
}
if (this.favorite) {
// 取消收藏
this.$confirm(`确定取消收藏`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
removeUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg)
this.favorite = false
})
})
} else {
// 收藏
saveUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg)
this.favorite = true
})
}
},
// 获取页面所有语言数据
// 获取页面提示信息
getPageLanguageData() {
searchPageLanguageData(this.queryPageLang).then((data) => {
if (JSON.stringify(data.data) != '{}') {
this.pageLanguageData = data.data
} else {
}
})
},
// 获取button的词典
getFunctionButtonList() {
let queryButton = {
functionId: this.functionId,
tableId: this.tableId,
languageCode: this.languageCode,
objectType: 'button'
}
searchFunctionButtonList(queryButton).then(({data}) => {
if (data.data.length > 0) {
this.buttons = data.data
}
})
},
// 获取语言词典
getSysLanguageParamList() {
let querySysLanguageParam = {
languageCode: this.$i18n.locale
}
searchSysLanguageParam(querySysLanguageParam).then(({data}) => {
this.sysLanguageParams = data.rows
})
},
// 打开页面设置
userSetting() {
this.visible = true;
let queryTable = {
userId: this.userId,
functionId: this.functionId,
tableId: this.tableId,
languageCode: this.languageCode
}
this.$nextTick(() => {
this.$refs.column.init(queryTable);
});
},
// 获取 用户保存的 格式列
getTableUserColumn() {
let queryTableUser = {
userId: this.userId,
functionId: this.functionId,
tableId: this.tableId,
languageCode: this.languageCode,
status: true,
}
getTableUserListLanguage(queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList = []
this.columnList = data.rows
} else {
this.getColumnList()
}
})
},
// 保存 默认配置 列
saveColumnList() {
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)
this.showDefault = false
} else {
this.showDefault = true
this.$message.error(data.msg)
}
})
/* this.getFunctionButtonList();
this.getPageLanguageData()
this.getColumnList()*/
},
// 获取 tableDefault 列
getColumnList() {
let queryTable = {
functionId: this.functionId,
tableId: this.tableId,
languageCode: this.languageCode
}
getTableDefaultListLanguage(queryTable).then(({data}) => {
if (!data.rows.length == 0) {
this.showDefault = false
this.columnList = data.rows
} else {
this.showDefault = true
}
})
},
},
created() {
this.getTableUserColumn()
this.getSysLanguageParamList()
this.getFunctionButtonList()
this.favoriteIsOk()
}
}
</script>
<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, getReviewSteps,
getFileList, getFileList,
} from '@/api/purchaseorder/procurementReview.js' } from '@/api/purchaseorder/procurementReview.js'
import axios from "axios";
import Vue from "vue";
export default { export default {
components: { components: {
@ -737,15 +739,14 @@
methods: { methods: {
// 文件下载 // 文件下载
fileDownload(row) { 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', responseType: 'blob',
headers: { headers: {
'Content-Type': 'application/json'
'Content-Type': 'application/json',
'token':Vue.cookie.get('token')
} }
}).then(({data}) => { }).then(({data}) => {
// 不限制文件下载类型 // 不限制文件下载类型
const blob = new Blob([data], {type: "application/octet-stream"}) 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-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="'设置语言一'+querySysLanguagePack.languageCode" :visible.sync="addLanguage" width="1000px">
<el-table <el-table
height="450" height="450"
:data="languageDataList" :data="languageDataList"
@ -126,7 +127,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -141,7 +141,8 @@ import column from "../../common/column";
saveButtonList, saveButtonList,
searchSysLanguage, searchSysLanguage,
searchLanguageListByLanguageCode, searchLanguageListByLanguageCode,
saveSysLanguageOne
saveSysLanguageOne,
searchPageLanguageData
} from "@/api/sysLanguage.js" } from "@/api/sysLanguage.js"
import getLodop from '@/utils/LodopFuncs.js' import getLodop from '@/utils/LodopFuncs.js'
import { import {
@ -362,6 +363,8 @@ import column from "../../common/column";
settingTable: '设置列表', settingTable: '设置列表',
defaultTable: '设置默认配置' defaultTable: '设置默认配置'
}, },
pageLanguageData:{
},
// 导出 start // 导出 start
exportData: [], exportData: [],
exportName: "页面功能语言", exportName: "页面功能语言",
@ -571,6 +574,21 @@ import column from "../../common/column";
this.languageList = data.rows 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的词典 // 获取button的词典
getFunctionButtonList() { getFunctionButtonList() {
searchFunctionButtonList(this.queryButton).then(({data}) => { searchFunctionButtonList(this.queryButton).then(({data}) => {

2
src/views/modules/sys/menu.vue
View File

@ -7,7 +7,7 @@
</el-form> </el-form>
<el-table <el-table
:height="height"
:data="dataList" :data="dataList"
row-key="menuId" row-key="menuId"
border border

Write Preview
Loading…
Cancel
Save