diff --git a/public/config.json b/public/config.json index dc76ca6..7ca6b5f 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/", - "BASE_URL":"http://127.0.0.1:9991/", - "SERVER_IP": "http://127.0.0.1:9991/", - "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/" + "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", + "BASE_URL":"http://192.168.0.109:9991/", + "SERVER_IP": "http://192.168.0.109:9991/", + "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/store/modules/admin.js b/src/store/modules/admin.js index 733839a..60cd4ec 100644 --- a/src/store/modules/admin.js +++ b/src/store/modules/admin.js @@ -11,11 +11,13 @@ import { } from "../../utils/auth"; // import { $NOT_NETWORK } from '../../utils/errorCode' import { Message } from "element-ui"; +import {RECEIVE_ADMIN_EMPLOY_NAME} from "../mutation-types"; // initial state const state = { adminId: getAdminId(), // id userName: "", // 昵称 + employeeName:null, avatar: "", // 头像 token: getToken(), // 登录token authRules: [], // 权限列表 @@ -26,6 +28,7 @@ const state = { const getters = { adminId: state => state.adminId, userName: state => state.userName, + employeeName: state => state.employeeName, avatar: state => state.avatar, token: state => state.token, authRules: state => state.authRules, @@ -72,6 +75,7 @@ const actions = { const data = response.data || {}; console.log(data.userName + "--" + data.authRules); commit(types.RECEIVE_ADMIN_NAME, data.userName); + commit(types.RECEIVE_ADMIN_EMPLOY_NAME, data.employeeName); commit(types.RECEIVE_ADMIN_AVATAR, data.avatar); commit(types.RECEIVE_ADMIN_AUTH_RULES, data.authRules); resolve(data); @@ -147,6 +151,9 @@ const mutations = { [types.RECEIVE_ADMIN_AUTH_RULES](state, authRules) { state.authRules = authRules; }, + [types.RECEIVE_ADMIN_EMPLOY_NAME](state, employeeName) { + state.employeeName = employeeName; + }, [types.RECEIVE_ROUTERS](state, routers) { const tempRm = constantRouterMap.concat(routers); state.routers = JSON.parse(JSON.stringify(tempRm)); diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js index 703ef93..cdbda33 100644 --- a/src/store/mutation-types.js +++ b/src/store/mutation-types.js @@ -7,7 +7,8 @@ export const DEL_VISITED_VIEWS = "DEL_VISITED_VIEWS"; // user（用户）相关 export const RECEIVE_ADMIN_ID = "RECEIVE_ADMIN_ID"; // 用户ID export const RECEIVE_ADMIN_TOKEN = "RECEIVE_ADMIN_TOKEN"; // token -export const RECEIVE_ADMIN_NAME = "RECEIVE_ADMIN_NAME"; // 昵称 +export const RECEIVE_ADMIN_NAME = "RECEIVE_ADMIN_NAME"; //账号 +export const RECEIVE_ADMIN_EMPLOY_NAME = "RECEIVE_ADMIN_EMPLOY_NAME"; //账号 export const RECEIVE_ADMIN_AVATAR = "RECEIVE_ADMIN_AVATAR"; // 头像 export const RECEIVE_ADMIN_AUTH_RULES = "RECEIVE_ADMIN_AUTH_RULES"; // 权限列表 export const RECEIVE_ROUTERS = "RECEIVE_ROUTERS"; // 初始化路由表 diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index ad4161a..0a6eac7 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -20,7 +20,7 @@ 查询 - 新增 diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 158b840..1984459 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -43,6 +43,25 @@ + + +
+
+ 关联业务单据:  +
+ + + {{ item.localName }} + + + + +
+ @@ -60,28 +79,28 @@ - -
-
- 第三方单据类型:  -
- - - - - {{ item.name }} - {{ - item.thirdSysName - }} - - - -
- + + + + + + + + + + + + + + + + + + + + + + @@ -142,41 +161,19 @@ - -
-
- 关联业务单据:  -
- - - {{ item.localName }} - - - - -
- - - - +
备注: 
- - diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue index d75d9fc..2c6694d 100644 --- a/src/views/basic/BussinessTypeThird.vue +++ b/src/views/basic/BussinessTypeThird.vue @@ -42,7 +42,7 @@ - + diff --git a/src/views/business/selectThrOrder.vue b/src/views/business/selectThrOrder.vue index 4eb66e1..df2f5b5 100644 --- a/src/views/business/selectThrOrder.vue +++ b/src/views/business/selectThrOrder.vue @@ -31,7 +31,7 @@ - + +
- 业务类型： + 当前仓库：
+ - - + - {{ item.localName }} + v-for="item in storageList" + :key="item.name" + :label="item.name" + :value="item.code"> + {{ item.name }} + +
往来单位： @@ -147,26 +151,25 @@
- 当前仓库： + 业务类型：
- - - + + - {{ item.name }} + v-for="item in busTypes" + :key="item.localAction" + :label="item.localName" + :value="item.localAction"> + {{ item.localName }} -
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 65d30ca..c1df3bb 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -84,7 +84,7 @@
- {{ company }} + {{ employName }} - + { - this.filterQuery.billAction = response.data; + this.filterQuery.localAction = response.data; this.getList(); }) .catch(() => { diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 2b87284..d149253 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -14,7 +14,7 @@ - + - - - 导入单据 - - + + + + + + + + + + + + + diff --git a/src/views/smp/ErpOrderSmpUpload.vue b/src/views/smp/ErpOrderSmpUpload.vue index 6259fb2..93f4d3d 100644 --- a/src/views/smp/ErpOrderSmpUpload.vue +++ b/src/views/smp/ErpOrderSmpUpload.vue @@ -11,7 +11,7 @@ > - + { this.busTypes = response.data.list || []; - this.filterQuery.billAction = this.busTypes[0].action; + this.filterQuery.action = this.busTypes[0].action; }) .catch(() => { }); diff --git a/src/views/thrsys/ThrOrder.vue b/src/views/thrsys/ThrOrder.vue index dc189f2..5efea8e 100644 --- a/src/views/thrsys/ThrOrder.vue +++ b/src/views/thrsys/ThrOrder.vue @@ -116,14 +116,14 @@ - - + + - + + + - +