diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js new file mode 100644 index 0000000..79766ec --- /dev/null +++ b/src/api/basic/invWarehouse.js @@ -0,0 +1,43 @@ +import axios from "../../utils/axios"; + +// 权限管理 + +// 获取列表 +export function filterList(query) { + return axios({ + url: "/spms/inv/warehouse/filter", + method: "get", + params: query + }); +} + +export function filterAll(query) { + return axios({ + url: "/spms/inv/warehouse/filterAll", + method: "get", + params: query + }); +} + + +// 保存 +export function saveWarehouse(data, formName, method = "post") { + let url = + formName !== "edit" + ? "/spms/inv/warehouse/save" + : "/spms/inv/warehouse/edit"; + return axios({ + url: url, + method: method, + data: data + }); +} + +// 删除 +export function deleteWarehouse(data) { + return axios({ + url: "/spms/inv/warehouse/delete", + method: "post", + data: data + }); +} diff --git a/src/router/index.js b/src/router/index.js index a1c4d66..5bf82d3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -22,6 +22,7 @@ import thirdSysApiDownload from "../views/userManage/param/ThirdSysApiDownload.v import showText from "../views/other/showText"; //基础数据维护 +import invWarehouse from "../views/basic/invWarehouse" import BussinessType from "../views/basic/BussinessType.vue"; import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue"; import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue"; @@ -510,6 +511,15 @@ export const asyncRouterMap = [ authRule: ["basic"] }, children: [ + { + path: "invWarehouse", + component: invWarehouse, + name: "仓库信息", + icon: "", + meta: { + authRule: ["basicProduct/invWarehouse"] + } + }, { path: "/udiinfo", redirect: "/udiinfo/udiinfomg", diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue new file mode 100644 index 0000000..5e9dfa4 --- /dev/null +++ b/src/views/basic/invWarehouse.vue @@ -0,0 +1,569 @@ + + + + + diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 0c91a19..a38f2f9 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -65,13 +65,14 @@
- 供应商： + 往来信息：
- + - + + @@ -112,6 +114,38 @@ + + + + + {{ item.name }} + {{ + item.code + }} + + + + + +
@@ -123,7 +157,8 @@ - + + -
- 采购类别： + 当前仓库：
+ - - - - + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + @@ -372,767 +432,809 @@ diff --git a/src/views/inout/DialogSelectInvStorage.vue b/src/views/inout/DialogSelectInvStorage.vue new file mode 100644 index 0000000..3e5b175 --- /dev/null +++ b/src/views/inout/DialogSelectInvStorage.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index ef2a791..3b5b02d 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -53,11 +53,12 @@
- 往来单位： + 往来信息：
- + + + + + {{ item.name }} + {{ item.code }} + + + + + +
@@ -87,7 +117,8 @@ - + + + + +
+ 当前仓库： +
+ + + + + + + + + + {{ item.name }} + + + + + @@ -177,304 +233,361 @@ diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue index 96ec9da..0578556 100644 --- a/src/views/inout/IOErrorOrder.vue +++ b/src/views/inout/IOErrorOrder.vue @@ -144,6 +144,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="选择往来单位" + append-to-body :visible.sync="dialogTableVisible" width="70%" > @@ -192,6 +193,19 @@ + + + + + { }); }, - + selectStorage(row) { + console.log(row.id); + this.unitUpdateQuery.id = this.curIndex; + this.unitUpdateQuery.fromCorp = row.name; + this.unitUpdateQuery.fromCorpId = row.code; + updateUnit(this.unitUpdateQuery) + .then((response) => { + this.dialogStorageVisible = false; + this.getList(); + }) + .catch(() => { + this.dialogStorageVisible = false; + }); + }, deleteDialog(rowId) { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { confirmButtonText: "确定", @@ -460,6 +498,13 @@ export default { this.codeDetailVisible = true; this.idQuery.id = row.id; }, + getActionItem(action) { + for (let i = 0; i < this.busTypes.length; i++) { + if (this.busTypes[i].action === action) { + return this.busTypes[i]; + } + } + }, }, filters: { statusFilterType(status) { diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index eca8148..b1c484c 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -517,9 +517,10 @@ export default { if (row.id !== null && row.id !== undefined && row.id !== '') { this.idQuery = row; this.idQuery.id = row.id; - + this.idQuery.locStorageCode = row.locStorageCode; this.idQuery.actDate = row.actDate; this.idQuery.corpOrderId = row.corpOrderId; + this.idQuery.billType = row.action; } this.addOrderVisible = true; },