From b91661fdbfbea0199c8d3e5b5ef791c9e25695a4 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 14 Mar 2022 09:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E8=A1=A1=E8=A1=A5=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E7=BC=BA=E9=87=8F=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=8D=95=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=AD=98=E8=A1=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basic/busLocalType.js | 9 +++ src/api/basic/invWarehouse.js | 8 +++ src/views/basic/BussinessTypeModify.vue | 55 ++++++++++--------- src/views/warehouse/addHosOrder.vue | 10 ++-- src/views/warehouse/addOrder.vue | 4 +- src/views/warehouse/stockHospOrderNew.vue | 10 ++-- src/views/warehouse/stockOrder.vue | 4 +- src/views/warehouse/stockOrderDelSearch.vue | 4 +- .../warehouse/stockOrderEditDistribution.vue | 6 +- src/views/warehouse/stockOrderEditor.vue | 4 +- src/views/warehouse/stockOrderNew.vue | 4 +- .../warehouse/stockOrderNewDistribution.vue | 4 +- src/views/warehouse/stockOrderSearch.vue | 4 +- src/views/warehouse/stockOrderWaitCheck.vue | 4 +- 14 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js index 01a8f9f..3846349 100644 --- a/src/api/basic/busLocalType.js +++ b/src/api/basic/busLocalType.js @@ -16,6 +16,15 @@ export function getLocalJoinBusType(query) { }); } + +export function getLocalJoinByUser(query) { + return axios({ + url: "/udiwms/localBusType/filterJoinByUser", + method: "get", + params: query + }); +} + export function getLocalJoinNoUse(query) { return axios({ url: "/udiwms/localBusType/filterUnUse", diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index 32875ed..3f3ecf6 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -19,6 +19,14 @@ export function filterAll(query) { }); } +export function filterAllByUser(query) { + return axios({ + url: "/spms/inv/warehouse/filterAllByUser", + method: "get", + params: query + }); +} + // 保存 export function saveWarehouse(data, formName, method = "post") { diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 793b8d0..013ac59 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -103,30 +103,49 @@
- 当前仓库:  + 内部进出平衡补单: 
- + + :value="item.action"> {{ item.name }}
+ + + + + + + + + + + + + + + + + - +
备注: 
- -
-
- 内部进出平衡补单:  -
- - - {{ item.name }} - - -
- + @@ -310,7 +311,7 @@ import { import { getLocalBusType, getLocalJoinNoUse } from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {getJoinBussinessType} from "../../api/basic/bussinessType"; import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 572f9cf..5d7886e 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -242,8 +242,8 @@ import draggable from "vuedraggable"; import {parseTime} from "../../filtres/index"; import store from "../../store"; import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" -import {filterAll} from "@/api/basic/invWarehouse"; -import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; +import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; export default { name: "idQuery", @@ -461,7 +461,7 @@ export default { let query = { enabled: true, }; - getLocalJoinBusType(query) + getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; this.filterQuery.billAction = this.busTypes[0].action; @@ -501,7 +501,7 @@ export default { let cQuery = { key: query, }; - filterAll(cQuery) + filterAllByUser(cQuery) .then((response) => { this.fromStorageOptions = response.data || []; }) @@ -514,7 +514,7 @@ export default { // }; this.storageList = []; // this.formData.locStorageCode = null; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; this.fromStorageOptions = response.data || []; diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 22f959f..526a039 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -203,7 +203,7 @@ import {saveAs} from "file-saver"; import {getBussinessType} from "../../api/basic/bussinessType"; import {parseTime} from "../../filtres/index"; import store from "../../store"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; const formJson = { @@ -440,7 +440,7 @@ export default { // }; this.storageList = []; // this.formData.locStorageCode = null; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index ca243c6..4342dbf 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -511,8 +511,8 @@ import store from "../../store"; import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBussinessType} from "../../api/basic/bussinessType"; -import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import dialogInvProduct from "../inventory/DialogInvProduct" export default { @@ -702,7 +702,7 @@ export default { }, getStorage(event) { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) @@ -723,7 +723,7 @@ export default { let cQuery = { key: query, }; - filterAll(cQuery) + filterAllByUser(cQuery) .then((response) => { this.fromStorageOptions = response.data || []; }) @@ -1202,7 +1202,7 @@ export default { let query = { enabled: true, }; - getLocalJoinBusType(query) + getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; }) diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue index eb56ffa..ab1f8a7 100644 --- a/src/views/warehouse/stockOrder.vue +++ b/src/views/warehouse/stockOrder.vue @@ -367,7 +367,7 @@ import addOrder from "./addOrder"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrder", @@ -763,7 +763,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 24fe404..69b23ed 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -434,7 +434,7 @@ import draggable from "vuedraggable"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrderDelSearch", @@ -909,7 +909,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index 9aca2ec..8cdf114 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -460,7 +460,7 @@ import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBussinessType} from "../../api/basic/bussinessType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "idQuery", @@ -1154,7 +1154,7 @@ export default { }, getStorage(event) { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) @@ -1181,7 +1181,7 @@ export default { let cQuery = { key: query, }; - filterAll(cQuery) + filterAllByUser(cQuery) .then((response) => { this.fromStorageOptions = response.data || []; }) diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue index 9992134..688489c 100644 --- a/src/views/warehouse/stockOrderEditor.vue +++ b/src/views/warehouse/stockOrderEditor.vue @@ -495,7 +495,7 @@ import store from "../../store"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrderEditor", @@ -913,7 +913,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue index 52c7f89..ef7a0d6 100644 --- a/src/views/warehouse/stockOrderNew.vue +++ b/src/views/warehouse/stockOrderNew.vue @@ -449,7 +449,7 @@ import store from "../../store"; import draggable from "vuedraggable"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {selectSysParamByKey} from "../../api/param/systemParamConfig"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrder", @@ -892,7 +892,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 2a4ba56..5fe24fa 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -440,7 +440,7 @@ import { } from "../../api/warehouse/stockOrder"; import draggable from "vuedraggable"; import { - filterAll + filterAll, filterAllByUser } from "../../api/basic/invWarehouse"; import {saveAs} from "file-saver"; @@ -1097,7 +1097,7 @@ export default { advanceType: this.getActionName(event), }; this.storageList = []; - filterAll(query) + filterAllByUser(query) .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index 455fe05..e9b4d30 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -477,7 +477,7 @@ import draggable from "vuedraggable"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrderSearch", @@ -932,7 +932,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue index f8edb55..1f57fc9 100644 --- a/src/views/warehouse/stockOrderWaitCheck.vue +++ b/src/views/warehouse/stockOrderWaitCheck.vue @@ -340,7 +340,7 @@ import addOrder from "./addOrder"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; import {getLocalJoinBusType} from "../../api/basic/busLocalType"; -import {filterAll} from "@/api/basic/invWarehouse"; +import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; export default { name: "stockOrderWaitCheck", @@ -750,7 +750,7 @@ export default { }, getStorage() { this.storageList = []; - filterAll() + filterAllByUser() .then((response) => { this.storageList = response.data || []; })