diff --git a/src/api/business/storageLocation/storageLocation.js b/src/api/business/storageLocation/storageLocation.js
new file mode 100644
index 0000000..f2076c2
--- /dev/null
+++ b/src/api/business/storageLocation/storageLocation.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function storageLocation_list(query) {
+ return request({
+ url: '/system/business/storageLocation/list',
+ method: 'get',
+ params: query
+ })
+}
+export function storageLocation_add(data) {
+ return request({
+ url: '/system/business/storageLocation/save',
+ method: 'post',
+ data: data
+ })
+}
+
+export function storageLocation_edit(data) {
+ return request({
+ url: '/system/business/storageLocation/edit',
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/src/lang/en.js b/src/lang/en.js
index 5201f74..95b1c92 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -75,7 +75,8 @@ import gsp from './en/business/resource/gsp'
import archive from './en/business/archive/archive'
//日志管理
import systemLog from './en/system/systemLog'
-
+// 存储位置
+import storageLocation from './en/system/storageLocation'
export default {
system: {
name: 'WestChina-Frontier PharmaTech ELN',
@@ -166,6 +167,7 @@ export default {
user,
template,
systemLog,
+ storageLocation,
dict
},
business: {
diff --git a/src/lang/en/system/storageLocation.js b/src/lang/en/system/storageLocation.js
new file mode 100644
index 0000000..ba547b8
--- /dev/null
+++ b/src/lang/en/system/storageLocation.js
@@ -0,0 +1,13 @@
+export default {
+ fzdd: 'Location',
+ sbmc: 'Name or Id',
+ fzhj: 'Shelf placement',
+ wc: 'Compartment',
+ zt: 'Status',
+ ssbm: 'Department',
+ add: 'Add',
+ addStroageLocation: 'Add Storage Location',
+ editStroageLocation: 'Edit Storage Location',
+ no: 'disable',
+ yes: 'normal'
+}
\ No newline at end of file
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 754280b..fe0b989 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -74,6 +74,8 @@ import gsp from './zh/business/resource/gsp'
import archive from './zh/business/archive/archive'
//日志管理
import systemLog from './zh/system/systemLog'
+//存储位置
+import storageLocation from './zh/system/storageLocation'
export default {
system: {
@@ -161,6 +163,7 @@ export default {
user,
template,
systemLog,
+ storageLocation,
dict
},
business: {
diff --git a/src/lang/zh/system/storageLocation.js b/src/lang/zh/system/storageLocation.js
new file mode 100644
index 0000000..f5a35e4
--- /dev/null
+++ b/src/lang/zh/system/storageLocation.js
@@ -0,0 +1,13 @@
+export default {
+ fzdd: '放置地点',
+ sbmc: '设备名称或编号',
+ fzhj: '放置货架',
+ wc: '温层',
+ zt: '状态',
+ ssbm: '所属部门',
+ add: '新增',
+ addStroageLocation: '新增存储位置',
+ editStroageLocation: '编辑存储位置',
+ no: '禁用',
+ yes: '正常'
+}
\ No newline at end of file
diff --git a/src/utils/menu.js b/src/utils/menu.js
index 82a0161..6b49d04 100644
--- a/src/utils/menu.js
+++ b/src/utils/menu.js
@@ -35,7 +35,7 @@ let menuObj = {
模板管理: 'Function',
字典管理: 'Term Book',
日志管理: 'Log',
-
+ 存储位置: 'Storage Location',
字典数据: 'Term Book Data'
}
export function getMenuName(menuName) {
diff --git a/src/views/business/storageLocation/list.vue b/src/views/business/storageLocation/list.vue
new file mode 100644
index 0000000..f16b36a
--- /dev/null
+++ b/src/views/business/storageLocation/list.vue
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('form.search')
+ }}
+ {{ $t('form.reset') }}
+
+
+
+
+
+ {{
+ $t('page.system.storageLocation.add') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('page.system.storageLocation.no') }}
+ {{ $t('page.system.storageLocation.yes') }}
+
+
+
+
+ {{
+ $t('form.detail') }}
+ {{
+ $t('form.edit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..56dd747 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://localhost:8080`,
- target: `http://39.99.251.173:8080`,
+ target: `http://localhost:8080`,
+ // target: `http://39.99.251.173:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''