diff --git a/public/config.json b/public/config.json index 8195b20..e7474d4 100644 --- a/public/config.json +++ b/public/config.json @@ -1,7 +1,7 @@ { - "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/", - "hosp_name": "诏安县总医院（测试）" + "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/", + "hosp_name": "平和县医院" } diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js index cf9a727..aa1a777 100644 --- a/src/api/auth/authAdmin.js +++ b/src/api/auth/authAdmin.js @@ -21,6 +21,24 @@ export function authAdminRoleList(query) { }); } +//根据当前角色，获取是否为客户角色 +export function roleCustomers(query) { + return axios({ + url: "/admin/auth/admin/roleCustomers", + method: "get", + params: query + }); +} + +// 获取客户角色列表 +export function authCustomerRoles(query) { + return axios({ + url: "/admin/auth/admin/customerRoles", + method: "get", + params: query + }); +} + // 保存 export function authAdminSave(data, formName, method = "post") { let url = @@ -42,3 +60,12 @@ export function authAdminDelete(data) { data: data }); } + +export function updateInv(data) { + return axios({ + url: "/admin/auth/admin/updateInv", + method: "post", + data: data + }); +} + diff --git a/src/api/basic/invSubWarehouse.js b/src/api/basic/invSubWarehouse.js new file mode 100644 index 0000000..ba47c79 --- /dev/null +++ b/src/api/basic/invSubWarehouse.js @@ -0,0 +1,42 @@ +import axios from "../../utils/axios"; + + +export function filterSubAll(query) { + return axios({ + url: "/spms/sub/inv/warehouse/filter", + method: "get", + params: query + }); +} + +export function filterSubByInv(query) { + return axios({ + url: "/spms/sub/inv/warehouse/findByInv", + method: "get", + params: query + }); +} + + + +// 保存 +export function saveSubWarehouse(data, formName, method = "post") { + let url = + formName !== "edit" + ? "/spms/sub/inv/warehouse/save" + : "/spms/sub/inv/warehouse/edit"; + return axios({ + url: url, + method: method, + data: data + }); +} + +// 删除 +export function deleteSubWarehouse(data) { + return axios({ + url: "/spms/sub/inv/warehouse/delete", + method: "post", + data: data + }); +} diff --git a/src/store/modules/admin.js b/src/store/modules/admin.js index 60cd4ec..bb292bb 100644 --- a/src/store/modules/admin.js +++ b/src/store/modules/admin.js @@ -11,7 +11,7 @@ import { } from "../../utils/auth"; // import { $NOT_NETWORK } from '../../utils/errorCode' import { Message } from "element-ui"; -import {RECEIVE_ADMIN_EMPLOY_NAME} from "../mutation-types"; +import {RECEIVE_ADMIN_EMPLOY_NAME, RECEIVE_LOCINVCODE, RECEIVE_LOCSUBINVCODE} from "../mutation-types"; // initial state const state = { @@ -21,7 +21,9 @@ const state = { avatar: "", // 头像 token: getToken(), // 登录token authRules: [], // 权限列表 - routers: constantRouterMap // 路由列表 + routers: constantRouterMap, // 路由列表 + locInvCode:"", + locSubInvCode:"" }; // getters @@ -32,20 +34,22 @@ const getters = { avatar: state => state.avatar, token: state => state.token, authRules: state => state.authRules, - routers: state => state.routers + routers: state => state.routers, + locInvCode:state => state.locInvCode, + locSubInvCode:state => state.locSubInvCode, }; // actions const actions = { // 用户名登录 loginName({ commit }, userInfo) { - console.log(userInfo.userName + "=----" + userInfo.pwd); const userName = userInfo.userName ? userInfo.userName.trim() : ""; const pwd = userInfo.pwd ? userInfo.pwd : ""; return new Promise((resolve, reject) => { loginName(userName, pwd) .then(response => { - if (response.code != 20000) { + console.log(response); + if (response.code!=20000) { Message({ message: response.message, type: "error", @@ -68,16 +72,14 @@ const actions = { return new Promise((resolve, reject) => { userInfo() .then(response => { - console.log(response.code + "---" + response.data); - if (response.code != 20000) { + if (response.code !== 20000) { reject("登录失效"); } 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); }) .catch(error => { @@ -93,6 +95,8 @@ const actions = { commit(types.RECEIVE_ADMIN_ID, ""); commit(types.RECEIVE_ADMIN_TOKEN, ""); commit(types.RECEIVE_ADMIN_AUTH_RULES, []); + commit(types.RECEIVE_LOCINVCODE, ""); + commit(types.RECEIVE_LOCSUBINVCODE, ""); resolve(); }) .catch(error => { @@ -107,6 +111,8 @@ const actions = { commit(types.RECEIVE_ADMIN_ID, ""); commit(types.RECEIVE_ADMIN_TOKEN, ""); commit(types.RECEIVE_ADMIN_AUTH_RULES, []); + commit(types.RECEIVE_LOCINVCODE, ""); + commit(types.RECEIVE_LOCSUBINVCODE, ""); resolve(); }); }, @@ -151,13 +157,16 @@ 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)); - } + }, + [types.RECEIVE_LOCINVCODE](state, locInvCode) { + state.locInvCode = locInvCode; + }, + [types.RECEIVE_LOCSUBINVCODE](state, locSubInvCode) { + state.locSubInvCode = locSubInvCode; + }, }; export default { diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js index cdbda33..3f78e5b 100644 --- a/src/store/mutation-types.js +++ b/src/store/mutation-types.js @@ -12,3 +12,5 @@ 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"; // 初始化路由表 +export const RECEIVE_LOCINVCODE = "RECEIVE_LOCINVCODE"; // 当前仓库 +export const RECEIVE_LOCSUBINVCODE = "RECEIVE_LOCSUBINVCODE"; // 当前分库 diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 0ab707c..7440138 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -131,6 +131,8 @@ export default { entrustAction: null, finishRece: false, curInv: "", + entrustSubInv: "", + invWarehouseCode: "", }, enableMap: { true: "是", @@ -196,11 +198,11 @@ export default { return; } if (this.$isBlank(this.inputQuery.entrustInv)) { - this.$message.error("请输入委托验收人仓库！"); + this.$message.error("请输入接受委托仓库！"); return; } if (this.$isBlank(this.inputQuery.entrustInv)) { - this.$message.error("请输入委托验收人！"); + this.$message.error("请输入接受委托人！"); return; } @@ -226,11 +228,11 @@ export default { return; } if (this.$isBlank(this.inputQuery.entrustInv)) { - this.$message.error("请输入委托验收人仓库！"); + this.$message.error("请输入接受委托仓库！"); return; } if (this.$isBlank(this.inputQuery.entrustInv)) { - this.$message.error("请输入委托验收人！"); + this.$message.error("请输入接受委托人！"); return; } insertEntrustRece(this.inputQuery) diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index 8e8f170..6aa685d 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -23,6 +23,30 @@ + + +
+
+ 当前分库:  +
+ + + {{ item.name }} + + + + +
+ + + +
@@ -40,7 +64,14 @@
+ +
+ 是否直接验收完成 + +
+ +
@@ -61,18 +92,22 @@
+ +
- 接受委托人:  + 接受委托分库: 
- + - {{ item.employeeName }} + v-for="item in entrustSubInvList" + :key="item.code" + :label="item.name" + :value="item.code"> + {{ item.name }} @@ -101,12 +136,26 @@
- +
- 是否直接验收完成 - +
+ 接受委托人:  +
+ + + {{ item.employeeName }} + + + +
+ +
@@ -124,6 +173,7 @@ import { import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {filterNoUseBusType} from "@/api/basic/EntrustRece"; +import {filterSubByInv} from "@/api/basic/invSubWarehouse"; export default { @@ -143,6 +193,8 @@ export default { isFilterBind: true, }, storageList: [], + subInvList: [], + entrustSubInvList:[], entrustStorageList: [], orderTypeList: [], fromSpecialOptions: [], @@ -158,10 +210,10 @@ export default { {required: true, message: "请输入委托仓库", trigger: "blur"} ], entrustInv: [ - {required: true, message: "请输入接受委托仓库", trigger: "blur"} + {required: true, message: "请输入委托验收人仓库", trigger: "blur"} ], entrustUser: [ - {required: true, message: "请输入接受委托人", trigger: "blur"} + {required: true, message: "请输入委托验收人", trigger: "blur"} ], }, } @@ -193,24 +245,57 @@ export default { filterAll() .then((response) => { this.storageList = response.data || []; + this.findSubInvByInv(); + this.getEntrustStorage(); + }) + .catch(() => { + }); + }, + + findSubInvByInv() { + this.subInvList = []; + let query = { + pcode: this.inputQuery.curInv + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + this.getOrderType(); }) .catch(() => { }); }, + + findEntrustSubInvByInv() { + this.entrustSubInvList = []; + let query = { + pcode: this.inputQuery.entrustInv + }; + filterSubByInv(query) + .then((response) => { + this.entrustSubInvList = response.data || []; + this.entrustSubInvChange(); + }) + .catch(() => { + }); + }, + + getEntrustStorage() { this.entrustStorageList = []; let nextQuery = {pcode: this.inputQuery.curInv}; filterNext(nextQuery) .then((response) => { this.entrustStorageList = response.data || []; + this.findEntrustSubInvByInv(); }) .catch(() => { }); }, - getOrderType(code) { + getOrderType() { let query = { - locInvCode: code + locSubInvCode: this.inputQuery.invWarehouseCode } filterNoUseBusType(query).then((response) => { this.busTypes = response.data || []; @@ -218,28 +303,35 @@ export default { }) }, - invChange(code) { - this.getOrderType(code); + invChange() { + + this.findSubInvByInv(); this.$set(this.inputQuery, "entrustUser", ""); this.$set(this.inputQuery, "entrustInv", ""); this.getEntrustStorage(); }, - entrustInvChange(code) { + subInvChange(){ + this.getOrderType(); + }, + + entrustInvChange() { + + this.findEntrustSubInvByInv(); + this.$forceUpdate(); + + }, + + entrustSubInvChange(){ + let query = { - code: code + code: this.inputQuery.entrustSubInv, } - // this.$set(this.inputQuery, "entrustUser",""); - // this.$set(this.inputQuery, "entrustAction",""); - this.$forceUpdate(); //加载用户数据 warehouseUserList(query).then((res) => { this.entrustUserArray = []; this.entrustUserArray = res.data; - if (this.inputQuery.entrustUser != null && this.inputQuery.entrustUser != '') { - this.inputQuery.entrustUser = Number(this.inputQuery.entrustUser); - } }).catch((error) => { this.$message.error("用户数据加载失败") }); @@ -247,11 +339,10 @@ export default { //加载单据类型数据 warehouseBussinessTypeList(query).then((res) => { this.entrustBusArray = res.data; + }).catch((error) => { this.$message.error("单据类型数据加载失败") }); - - }, }, @@ -263,10 +354,10 @@ export default { created() { - this.getOrderType(); + this.getList(); this.getStorage(); - this.getEntrustStorage(); + if (this.$isNotBlank(this.inputQuery.entrustInv)) { this.entrustInvChange(this.inputQuery.entrustInv); } diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index b5696e5..d46d257 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -48,8 +48,6 @@ 导出 - - @@ -58,11 +56,13 @@ style="width: 100%;margin-bottom: 20px;" row-key="id" border - default-expand-all highlight-current-row - @row-click="loadLinkData" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> - + @current-change="handInvCurrentChange"> + + + - - - - - - -