国际化支持
This commit is contained in:
@@ -21,7 +21,7 @@ import com.ruoyi.system.service.ISysMenuService;
|
||||
|
||||
/**
|
||||
* 登录验证
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@RestController
|
||||
@@ -41,7 +41,7 @@ public class SysLoginController
|
||||
|
||||
/**
|
||||
* 登录方法
|
||||
*
|
||||
*
|
||||
* @param loginBody 登录信息
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -58,7 +58,7 @@ public class SysLoginController
|
||||
|
||||
/**
|
||||
* 获取用户信息
|
||||
*
|
||||
*
|
||||
* @return 用户信息
|
||||
*/
|
||||
@GetMapping("getInfo")
|
||||
@@ -84,7 +84,7 @@ public class SysLoginController
|
||||
|
||||
/**
|
||||
* 获取路由信息
|
||||
*
|
||||
*
|
||||
* @return 路由信息
|
||||
*/
|
||||
@GetMapping("getRouters")
|
||||
@@ -94,4 +94,10 @@ public class SysLoginController
|
||||
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
|
||||
return AjaxResult.success(menuService.buildMenus(menus));
|
||||
}
|
||||
|
||||
@GetMapping("/changeLanguage")
|
||||
public AjaxResult changeLanguage(String lang)
|
||||
{
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
|
||||
|
||||
/**
|
||||
* spring security配置
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
|
||||
@@ -35,7 +35,7 @@ public class SecurityConfig
|
||||
*/
|
||||
@Autowired
|
||||
private UserDetailsService userDetailsService;
|
||||
|
||||
|
||||
/**
|
||||
* 认证失败处理类
|
||||
*/
|
||||
@@ -53,7 +53,7 @@ public class SecurityConfig
|
||||
*/
|
||||
@Autowired
|
||||
private JwtAuthenticationTokenFilter authenticationTokenFilter;
|
||||
|
||||
|
||||
/**
|
||||
* 跨域过滤器
|
||||
*/
|
||||
@@ -114,7 +114,7 @@ public class SecurityConfig
|
||||
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
|
||||
// 静态资源,可匿名访问
|
||||
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
|
||||
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
|
||||
.antMatchers("/swagger-ui.html","/changeLanguage", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
|
||||
// 除上面外的所有请求全部需要鉴权认证
|
||||
.anyRequest().authenticated();
|
||||
})
|
||||
|
||||
@@ -46,7 +46,8 @@
|
||||
"vue-cropper": "0.5.5",
|
||||
"vue-router": "3.4.9",
|
||||
"vuedraggable": "2.24.3",
|
||||
"vuex": "3.6.0"
|
||||
"vuex": "3.6.0",
|
||||
"vue-i18n": "7.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "4.4.6",
|
||||
|
||||
@@ -31,6 +31,20 @@ export function register(data) {
|
||||
})
|
||||
}
|
||||
|
||||
// 修改语言
|
||||
export function changeLanguage(lang){
|
||||
return request({
|
||||
url: '/changeLanguage',
|
||||
method: 'get',
|
||||
headers: {
|
||||
isToken: false,
|
||||
},
|
||||
params: {
|
||||
lang: lang
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获取用户详细信息
|
||||
export function getInfo() {
|
||||
return request({
|
||||
@@ -57,4 +71,4 @@ export function getCodeImg() {
|
||||
method: 'get',
|
||||
timeout: 20000
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
38
ruoyi-ui/src/components/LangSelect/index.vue
Normal file
38
ruoyi-ui/src/components/LangSelect/index.vue
Normal file
@@ -0,0 +1,38 @@
|
||||
<template>
|
||||
<el-dropdown trigger="click" class="international" @command="handleSetLanguage">
|
||||
<div>
|
||||
<svg-icon class-name="international-icon" icon-class="language" />
|
||||
</div>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :disabled="language==='zh_CN'" command="zh_CN">
|
||||
中文
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :disabled="language==='en_US'" command="en_US">
|
||||
English
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { changeLanguage } from "@/api/login";
|
||||
|
||||
|
||||
export default {
|
||||
computed: {
|
||||
language() {
|
||||
return this.$store.getters.language
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleSetLanguage(value) {
|
||||
this.$i18n.locale = value
|
||||
this.$store.dispatch('app/setLanguage', value)
|
||||
this.$message({ message: '设置语言成功', type: 'success' })
|
||||
changeLanguage(value).then(response => {
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
68
ruoyi-ui/src/lang/en.js
Normal file
68
ruoyi-ui/src/lang/en.js
Normal file
@@ -0,0 +1,68 @@
|
||||
// en.js
|
||||
export default {
|
||||
login: {
|
||||
title: 'RuoYi Login Form',
|
||||
logIn: 'Login in',
|
||||
username: 'Username',
|
||||
password: 'Password',
|
||||
code: 'Code',
|
||||
rememberMe: 'Remember Me'
|
||||
},
|
||||
tagsView: {
|
||||
refresh: 'Refresh',
|
||||
close: 'Close',
|
||||
closeOthers: 'Close Others',
|
||||
closeAll: 'Close All'
|
||||
},
|
||||
settings: {
|
||||
title: 'Page style setting',
|
||||
theme: 'Theme Color',
|
||||
tagsView: 'Open Tags-View',
|
||||
fixedHeader: 'Fixed Header',
|
||||
sidebarLogo: 'Sidebar Logo'
|
||||
},
|
||||
receiveStockinAdd:{
|
||||
title: 'Add Receive Stockin',
|
||||
warehouse: 'Warehouse',
|
||||
supplier: 'Supplier',
|
||||
remark: 'Remark',
|
||||
InboundMaterials: 'Inbound Materials',
|
||||
AddMaterials: 'Add Materials',
|
||||
ImportMaterials: 'Import Materials',
|
||||
selectWarehouse: 'Please select warehouse',
|
||||
selectSupplier: 'Please select supplier',
|
||||
inputRemark: 'Please input remark',
|
||||
warehouseRequired: 'Please select warehouse',
|
||||
supplierRequired: 'Please select supplier',
|
||||
addMaterialsRequired: 'Please add inbound materials',
|
||||
materialInfoRequired: 'Please fill in correct material information',
|
||||
addSuccess: 'Add stockin successfully',
|
||||
uploadTitle: 'Import Materials',
|
||||
dragText: 'Drag files here, or',
|
||||
clickUpload: 'click to upload',
|
||||
uploadTip: 'Only xlsx and xls files are allowed.',
|
||||
downloadTemplate: 'Download Template',
|
||||
confirm: 'Confirm',
|
||||
cancel: 'Cancel',
|
||||
serialNumber: 'No.',
|
||||
guid: 'GUID',
|
||||
parentId: 'Parent ID',
|
||||
productCode: 'Product Code',
|
||||
productName: 'Product Name',
|
||||
price: 'Price',
|
||||
brand: 'Brand',
|
||||
unit: 'Unit',
|
||||
spec: 'Specification',
|
||||
description: 'Description',
|
||||
batchNumber: 'Batch No.',
|
||||
quantity: 'Quantity',
|
||||
unitPrice: 'Unit Price',
|
||||
amount: 'Amount',
|
||||
operation: 'Operation',
|
||||
delete: 'Delete',
|
||||
totalQuantity: 'Total Quantity',
|
||||
totalAmount: 'Total Amount',
|
||||
submit: 'Submit',
|
||||
selectProduct: 'Select Product'
|
||||
}
|
||||
}
|
||||
29
ruoyi-ui/src/lang/index.js
Normal file
29
ruoyi-ui/src/lang/index.js
Normal file
@@ -0,0 +1,29 @@
|
||||
import Vue from 'vue'
|
||||
import VueI18n from 'vue-i18n'
|
||||
import Cookies from 'js-cookie'
|
||||
import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
|
||||
import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
|
||||
import enLocale from './en'
|
||||
import zhLocale from './zh'
|
||||
|
||||
Vue.use(VueI18n)
|
||||
|
||||
const messages = {
|
||||
en_US: {
|
||||
...enLocale,
|
||||
...elementEnLocale
|
||||
},
|
||||
zh_CN: {
|
||||
...zhLocale,
|
||||
...elementZhLocale
|
||||
}
|
||||
}
|
||||
|
||||
const i18n = new VueI18n({
|
||||
// 设置语言 选项 en | zh
|
||||
locale: Cookies.get('language') || 'zh_CN',
|
||||
// 设置文本内容
|
||||
messages
|
||||
})
|
||||
|
||||
export default i18n
|
||||
67
ruoyi-ui/src/lang/zh.js
Normal file
67
ruoyi-ui/src/lang/zh.js
Normal file
@@ -0,0 +1,67 @@
|
||||
export default {
|
||||
login: {
|
||||
title: '若依后台管理系统',
|
||||
logIn: '登录',
|
||||
username: '账号',
|
||||
password: '密码',
|
||||
code: '验证码',
|
||||
rememberMe: '记住密码'
|
||||
},
|
||||
tagsView: {
|
||||
refresh: '刷新',
|
||||
close: '关闭',
|
||||
closeOthers: '关闭其它',
|
||||
closeAll: '关闭所有'
|
||||
},
|
||||
settings: {
|
||||
title: '系统布局配置',
|
||||
theme: '主题色',
|
||||
tagsView: '开启 Tags-View',
|
||||
fixedHeader: '固定 Header',
|
||||
sidebarLogo: '侧边栏 Logo'
|
||||
},
|
||||
receiveStockinAdd:{
|
||||
title: '新增收货单据',
|
||||
warehouse: '仓库',
|
||||
supplier: '供应商',
|
||||
remark: '备注',
|
||||
InboundMaterials: '入库物料',
|
||||
AddMaterials: '添加物料',
|
||||
ImportMaterials: '导入物料',
|
||||
selectWarehouse: '请选择仓库',
|
||||
selectSupplier: '请选择供应商',
|
||||
inputRemark: '请输入备注信息',
|
||||
warehouseRequired: '请选择仓库',
|
||||
supplierRequired: '请选择供应商',
|
||||
addMaterialsRequired: '请添加入库物料',
|
||||
materialInfoRequired: '请填写正确的物料信息',
|
||||
addSuccess: '新增收货单成功',
|
||||
uploadTitle: '物料导入',
|
||||
dragText: '将文件拖到此处,或',
|
||||
clickUpload: '点击上传',
|
||||
uploadTip: '仅允许导入xls、xlsx格式文件。',
|
||||
downloadTemplate: '下载模板',
|
||||
confirm: '确 定',
|
||||
cancel: '取 消',
|
||||
serialNumber: '序号',
|
||||
guid: 'GUID',
|
||||
parentId: '父节点ID',
|
||||
productCode: '物料编码',
|
||||
productName: '物料名称',
|
||||
price: '价格',
|
||||
brand: '品牌',
|
||||
unit: '单位',
|
||||
spec: '规格',
|
||||
description: '描述',
|
||||
batchNumber: '批号',
|
||||
quantity: '数量',
|
||||
unitPrice: '单价',
|
||||
amount: '金额',
|
||||
operation: '操作',
|
||||
delete: '删除',
|
||||
totalQuantity: '总数量',
|
||||
totalAmount: '总金额',
|
||||
submit: '提交',
|
||||
selectProduct: '选择物料'
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ import './permission' // permission control
|
||||
import { getDicts } from "@/api/system/dict/data"
|
||||
import { getConfigKey } from "@/api/system/config"
|
||||
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"
|
||||
import i18n from './lang'
|
||||
// 分页组件
|
||||
import Pagination from "@/components/Pagination"
|
||||
// 自定义表格工具组件
|
||||
@@ -70,7 +71,8 @@ DictData.install()
|
||||
*/
|
||||
|
||||
Vue.use(Element, {
|
||||
size: Cookies.get('size') || 'medium' // set element-ui default size
|
||||
i18n: (key, value) => i18n.t(key, value),
|
||||
size: Cookies.get('size') || 'medium'
|
||||
})
|
||||
|
||||
Vue.config.productionTip = false
|
||||
@@ -79,5 +81,6 @@ new Vue({
|
||||
el: '#app',
|
||||
router,
|
||||
store,
|
||||
i18n,
|
||||
render: h => h(App)
|
||||
})
|
||||
|
||||
@@ -16,6 +16,7 @@ const getters = {
|
||||
permission_routes: state => state.permission.routes,
|
||||
topbarRouters: state => state.permission.topbarRouters,
|
||||
defaultRoutes: state => state.permission.defaultRoutes,
|
||||
language: state => state.app.language,
|
||||
sidebarRouters: state => state.permission.sidebarRouters
|
||||
}
|
||||
export default getters
|
||||
|
||||
@@ -7,7 +7,8 @@ const state = {
|
||||
hide: false
|
||||
},
|
||||
device: 'desktop',
|
||||
size: Cookies.get('size') || 'medium'
|
||||
size: Cookies.get('size') || 'medium',
|
||||
language: Cookies.get('language') || 'en'
|
||||
}
|
||||
|
||||
const mutations = {
|
||||
@@ -37,6 +38,10 @@ const mutations = {
|
||||
},
|
||||
SET_SIDEBAR_HIDE: (state, status) => {
|
||||
state.sidebar.hide = status
|
||||
},
|
||||
SET_LANGUAGE: (state, language) => {
|
||||
state.language = language
|
||||
Cookies.set('language', language)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,6 +60,9 @@ const actions = {
|
||||
},
|
||||
toggleSideBarHide({ commit }, status) {
|
||||
commit('SET_SIDEBAR_HIDE', status)
|
||||
},
|
||||
setLanguage({ commit }, language) {
|
||||
commit('SET_LANGUAGE', language)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
<template>
|
||||
<div class="login">
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
||||
<h3 class="title">{{title}}</h3>
|
||||
<h3 class="title">{{ $t('login.title') }}</h3>
|
||||
<lang-select class="set-language" />
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
v-model="loginForm.username"
|
||||
type="text"
|
||||
auto-complete="off"
|
||||
placeholder="账号"
|
||||
:placeholder="$t('login.username')"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
@@ -17,7 +18,7 @@
|
||||
v-model="loginForm.password"
|
||||
type="password"
|
||||
auto-complete="off"
|
||||
placeholder="密码"
|
||||
:placeholder="$t('login.password')"
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
||||
@@ -27,7 +28,7 @@
|
||||
<el-input
|
||||
v-model="loginForm.code"
|
||||
auto-complete="off"
|
||||
placeholder="验证码"
|
||||
:placeholder="$t('login.code')"
|
||||
style="width: 63%"
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
@@ -37,7 +38,7 @@
|
||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">{{ $t('login.rememberMe') }}</el-checkbox>
|
||||
<el-form-item style="width:100%;">
|
||||
<el-button
|
||||
:loading="loading"
|
||||
@@ -46,7 +47,7 @@
|
||||
style="width:100%;"
|
||||
@click.native.prevent="handleLogin"
|
||||
>
|
||||
<span v-if="!loading">登 录</span>
|
||||
<span v-if="!loading">{{ $t('login.logIn') }}</span>
|
||||
<span v-else>登 录 中...</span>
|
||||
</el-button>
|
||||
<div style="float: right;" v-if="register">
|
||||
@@ -56,21 +57,22 @@
|
||||
</el-form>
|
||||
<!-- 底部 -->
|
||||
<div class="el-login-footer">
|
||||
<span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
|
||||
<span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getCodeImg } from "@/api/login"
|
||||
import Cookies from "js-cookie"
|
||||
import LangSelect from '@/components/LangSelect'
|
||||
import { getCodeImg } from "@/api/login";
|
||||
import Cookies from "js-cookie";
|
||||
import { encrypt, decrypt } from '@/utils/jsencrypt'
|
||||
|
||||
export default {
|
||||
name: "Login",
|
||||
components: { LangSelect },
|
||||
data() {
|
||||
return {
|
||||
title: process.env.VUE_APP_TITLE,
|
||||
codeUrl: "",
|
||||
loginForm: {
|
||||
username: "admin",
|
||||
@@ -94,66 +96,66 @@ export default {
|
||||
// 注册开关
|
||||
register: false,
|
||||
redirect: undefined
|
||||
}
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
$route: {
|
||||
handler: function(route) {
|
||||
this.redirect = route.query && route.query.redirect
|
||||
this.redirect = route.query && route.query.redirect;
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getCode()
|
||||
this.getCookie()
|
||||
this.getCode();
|
||||
this.getCookie();
|
||||
},
|
||||
methods: {
|
||||
getCode() {
|
||||
getCodeImg().then(res => {
|
||||
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
|
||||
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
|
||||
if (this.captchaEnabled) {
|
||||
this.codeUrl = "data:image/gif;base64," + res.img
|
||||
this.loginForm.uuid = res.uuid
|
||||
this.codeUrl = "data:image/gif;base64," + res.img;
|
||||
this.loginForm.uuid = res.uuid;
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
getCookie() {
|
||||
const username = Cookies.get("username")
|
||||
const password = Cookies.get("password")
|
||||
const username = Cookies.get("username");
|
||||
const password = Cookies.get("password");
|
||||
const rememberMe = Cookies.get('rememberMe')
|
||||
this.loginForm = {
|
||||
username: username === undefined ? this.loginForm.username : username,
|
||||
password: password === undefined ? this.loginForm.password : decrypt(password),
|
||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
||||
}
|
||||
};
|
||||
},
|
||||
handleLogin() {
|
||||
this.$refs.loginForm.validate(valid => {
|
||||
if (valid) {
|
||||
this.loading = true
|
||||
this.loading = true;
|
||||
if (this.loginForm.rememberMe) {
|
||||
Cookies.set("username", this.loginForm.username, { expires: 30 })
|
||||
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 })
|
||||
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
|
||||
Cookies.set("username", this.loginForm.username, { expires: 30 });
|
||||
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
|
||||
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
|
||||
} else {
|
||||
Cookies.remove("username")
|
||||
Cookies.remove("password")
|
||||
Cookies.remove('rememberMe')
|
||||
Cookies.remove("username");
|
||||
Cookies.remove("password");
|
||||
Cookies.remove('rememberMe');
|
||||
}
|
||||
this.$store.dispatch("Login", this.loginForm).then(() => {
|
||||
this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
|
||||
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
|
||||
}).catch(() => {
|
||||
this.loading = false
|
||||
this.loading = false;
|
||||
if (this.captchaEnabled) {
|
||||
this.getCode()
|
||||
this.getCode();
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
@@ -176,7 +178,6 @@ export default {
|
||||
background: #ffffff;
|
||||
width: 400px;
|
||||
padding: 25px 25px 5px 25px;
|
||||
z-index: 1;
|
||||
.el-input {
|
||||
height: 38px;
|
||||
input {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
<div class="app-container">
|
||||
<div>
|
||||
<div class="page-header">
|
||||
<span>新增入库单</span>
|
||||
<span>{{ $t('receiveStockinAdd.title') }}</span>
|
||||
</div>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<el-select v-model="form.warehouseId" placeholder="请选择仓库">
|
||||
<el-form-item :label="$t('receiveStockinAdd.warehouse')" prop="warehouseId">
|
||||
<el-select v-model="form.warehouseId" :placeholder="$t('receiveStockinAdd.selectWarehouse')">
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.warehouseId"
|
||||
@@ -19,8 +19,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="供应商" prop="supplierId">
|
||||
<el-select v-model="form.supplierId" placeholder="请选择供应商">
|
||||
<el-form-item :label="$t('receiveStockinAdd.supplier')" prop="supplierId">
|
||||
<el-select v-model="form.supplierId" :placeholder="$t('receiveStockinAdd.selectSupplier')">
|
||||
<el-option
|
||||
v-for="item in supplierOptions"
|
||||
:key="item.supplierNo"
|
||||
@@ -36,8 +36,8 @@
|
||||
</el-form-item>
|
||||
</el-col>-->
|
||||
<el-col :span="8">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注信息"/>
|
||||
<el-form-item :label="$t('receiveStockinAdd.remark')" prop="remark">
|
||||
<el-input v-model="form.remark" :placeholder="$t('receiveStockinAdd.inputRemark')"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -46,35 +46,37 @@
|
||||
|
||||
<div class="mt-3">
|
||||
<div class="page-header">
|
||||
<span>入库物料</span>
|
||||
<span>{{ $t('receiveStockinAdd.InboundMaterials') }}</span>
|
||||
<el-row>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['bas:BasProduct:list']">添加物料</el-button>
|
||||
<el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['bas:BasProduct:list']">
|
||||
{{ $t('receiveStockinAdd.AddMaterials') }}</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleImport" v-hasPermi="['receive:stockin:import']">导入物料</el-button>
|
||||
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleImport" v-hasPermi="['receive:stockin:import']">
|
||||
{{ $t('receiveStockinAdd.ImportMaterials') }}</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<el-table :data="productList" border>
|
||||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||
<el-table-column label="GUID" align="center" prop="productGuid"/>
|
||||
<el-table-column label="父节点id" align="center" prop="parentId"/>
|
||||
<el-table-column label="物料编码" align="center" prop="productId"/>
|
||||
<el-table-column label="物料名称" align="center" prop="productName"/>
|
||||
<el-table-column label="价格" align="center" prop="price"/>
|
||||
<el-table-column label="品牌" align="center" prop="cargoNo"/>
|
||||
<el-table-column label="单位" align="center" prop="unit"/>
|
||||
<el-table-column label="规格" align="center" prop="spec"/>
|
||||
<el-table-column label="描述" align="center" prop="remark"/>
|
||||
<el-table-column type="index" :label="$t('receiveStockinAdd.serialNumber')" width="50" align="center"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.guid')" align="center" prop="productGuid"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.parentId')" align="center" prop="parentId"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.productCode')" align="center" prop="productId"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.productName')" align="center" prop="productName"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.brand')" align="center" prop="cargoNo"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.spec')" align="center" prop="spec"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.description')" align="center" prop="remark"/>
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" v-if="false"/> -->
|
||||
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
|
||||
<!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
|
||||
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
|
||||
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
|
||||
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
|
||||
<el-table-column label="批号" width="120" align="center">
|
||||
<el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.lotNo"
|
||||
@@ -83,7 +85,7 @@
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入库数量" width="120" align="center">
|
||||
<el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number
|
||||
v-model="scope.row.quantity"
|
||||
@@ -94,7 +96,7 @@
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价" width="120" align="center">
|
||||
<el-table-column :label="$t('receiveStockinAdd.unitPrice')" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number
|
||||
v-model="scope.row.price"
|
||||
@@ -105,48 +107,48 @@
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="金额" width="120" align="center">
|
||||
<el-table-column :label="$t('receiveStockinAdd.amount')" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ (scope.row.quantity * scope.row.price).toFixed(2) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100" align="center">
|
||||
<el-table-column :label="$t('receiveStockinAdd.operation')" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDeleteProduct(scope.$index)"
|
||||
>删除
|
||||
</el-button>
|
||||
>{{ $t('receiveStockinAdd.delete') }}</el-button>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div class="total-info" style="margin-top: 15px; text-align: right">
|
||||
<span>总数量:{{ totalQuantity }}</span>
|
||||
<span style="margin-left: 20px">总金额:{{ totalAmount }}</span>
|
||||
<span>{{ $t('receiveStockinAdd.totalQuantity') }}:{{ totalQuantity }}</span>
|
||||
<span style="margin-left: 20px">{{ $t('receiveStockinAdd.totalAmount') }}:{{ totalAmount }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="submit-block" style="margin-top: 20px; text-align: right">
|
||||
<el-button type="primary" @click="submitForm" v-hasPermi="['receive:stockin:add']">提交收货单</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
<el-button type="primary" @click="submitForm" v-hasPermi="['receive:stockin:add']">{{ $t('receiveStockinAdd.submit') }}</el-button>
|
||||
<el-button @click="cancel">{{ $t('receiveStockinAdd.cancel') }}</el-button>
|
||||
</div>
|
||||
|
||||
<!-- 选择物料对话框 -->
|
||||
<el-dialog :title="'选择物料'" :visible.sync="productSelectVisible" width="800px" append-to-body>
|
||||
<el-dialog :title="$t('receiveStockinAdd.selectProduct')" :visible.sync="productSelectVisible" width="800px" append-to-body>
|
||||
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column label="GUID" align="center" prop="productGuid"/>
|
||||
<el-table-column label="父节点id" align="center" prop="parentId"/>
|
||||
<el-table-column label="物料编码" align="center" prop="productId"/>
|
||||
<el-table-column label="物料名称" align="center" prop="productName"/>
|
||||
<el-table-column label="价格" align="center" prop="price"/>
|
||||
<el-table-column label="品牌" align="center" prop="cargoNo"/>
|
||||
<el-table-column label="单位" align="center" prop="unit"/>
|
||||
<el-table-column label="规格" align="center" prop="spec"/>
|
||||
<el-table-column label="描述" align="center" prop="remark"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.guid')" align="center" prop="productGuid"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.parentId')" align="center" prop="parentId"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.productCode')" align="center" prop="productId"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.productName')" align="center" prop="productName"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.brand')" align="center" prop="cargoNo"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.spec')" align="center" prop="spec"/>
|
||||
<el-table-column :label="$t('receiveStockinAdd.description')" align="center" prop="remark"/>
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" v-if="false"/> -->
|
||||
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
|
||||
<!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
|
||||
@@ -163,8 +165,8 @@
|
||||
/>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="confirmSelectProduct">确 定</el-button>
|
||||
<el-button @click="productSelectVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="confirmSelectProduct">{{ $t('receiveStockinAdd.confirm') }}</el-button>
|
||||
<el-button @click="productSelectVisible = false">{{ $t('receiveStockinAdd.cancel') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@@ -172,15 +174,15 @@
|
||||
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
||||
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
<div class="el-upload__text">{{ $t('receiveStockinAdd.dragText') }}<em>{{ $t('receiveStockinAdd.clickUpload') }}</em></div>
|
||||
<div class="el-upload__tip text-center" slot="tip">
|
||||
<span>仅允许导入xls、xlsx格式文件。</span>
|
||||
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
|
||||
<span>{{ $t('receiveStockinAdd.uploadTip') }}</span>
|
||||
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">{{ $t('receiveStockinAdd.downloadTemplate') }}</el-link>
|
||||
</div>
|
||||
</el-upload>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitFileForm">确 定</el-button>
|
||||
<el-button @click="upload.open = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submitFileForm">{{ $t('receiveStockinAdd.confirm') }}</el-button>
|
||||
<el-button @click="upload.open = false">{{ $t('receiveStockinAdd.cancel') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@@ -210,10 +212,10 @@ export default {
|
||||
// 表单校验
|
||||
rules: {
|
||||
warehouseId: [
|
||||
{required: true, message: "请选择仓库", trigger: "change"}
|
||||
{required: true, message: this.$t('receiveStockinAdd.warehouseRequired'), trigger: "change"}
|
||||
],
|
||||
supplierId: [
|
||||
{required: true, message: "请选择供应商", trigger: "change"}
|
||||
{required: true, message: this.$t('receiveStockinAdd.supplierRequired'), trigger: "change"}
|
||||
],
|
||||
|
||||
|
||||
@@ -336,12 +338,12 @@ export default {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.productList.length === 0) {
|
||||
this.$modal.msgError("请添加入库物料");
|
||||
this.$modal.msgError(this.$t('receiveStockinAdd.addMaterialsRequired'));
|
||||
return;
|
||||
}
|
||||
//校验lotNo productGuid quantity 不能为空
|
||||
if (this.productList.some(item => !item.lotNo || !item.productGuid || !item.quantity)) {
|
||||
this.$modal.msgError("请填写正确的物料信息");
|
||||
this.$modal.msgError(this.$t('receiveStockinAdd.materialInfoRequired'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -359,7 +361,7 @@ export default {
|
||||
|
||||
// 提交收货单
|
||||
addStockin(data).then(() => {
|
||||
this.$modal.msgSuccess("新增收货单成功");
|
||||
this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
|
||||
// 重置表单数据
|
||||
this.form = {
|
||||
warehouseId: undefined,
|
||||
@@ -384,7 +386,7 @@ export default {
|
||||
},
|
||||
/** 导入按钮操作 */
|
||||
handleImport() {
|
||||
this.upload.title = "物料导入"
|
||||
this.upload.title = this.$t('receiveStockinAdd.uploadTitle')
|
||||
this.upload.open = true
|
||||
},
|
||||
/** 下载模板操作 */
|
||||
|
||||
Reference in New Issue
Block a user