From 4766b769a6aa894834a6defa21a03578ddab175b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 26 Apr 2023 10:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=A2=86=E7=94=A8=E6=8B=89?=
=?UTF-8?q?=E5=8F=96=E4=BA=A7=E5=93=81=E5=BA=93=E5=AD=98=E4=BD=9C=E5=8C=BA?=
=?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogSelectInvProduct.vue | 58 ++++++++++++++++----
src/views/inout/receive/DialogNewReceive.vue | 8 ++-
src/views/inout/receive/receiveAdd.vue | 22 +++++++-
3 files changed, 72 insertions(+), 16 deletions(-)
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index e6e4f0e8..278c7254 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -65,6 +65,8 @@ import {
} from "@/api/inventory/invPorduct";
import {addDetail} from "@/api/inout/receiveOrder";
import {addBizProduct} from "@/api/inout/orderDetailCode";
+import {getInvPreInProduct} from "@/api/inventory/invPreInSearch";
+import {getInvPreProduct} from "@/api/inventory/invPreProduct";
export default {
@@ -162,19 +164,51 @@ export default {
},
getList() {
+ debugger
this.loading = true;
- getInvProduct(this.filterQuery)
- .then((response) => {
- this.showSup = response.data.showSup;
- this.loading = false;
- this.list = response.data.list || [];
- this.total = response.data.total || 0;
- })
- .catch(() => {
- this.loading = false;
- this.list = [];
- this.total = 0;
- });
+ //寄售
+ if(this.invQueryData.advanceType==3){
+ getInvPreProduct(this.filterQuery)
+ .then((response) => {
+ this.showSup = response.data.showSup;
+ this.loading = false;
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ //预验收
+ }else if(this.invQueryData.advanceType==2){
+ getInvPreInProduct(this.filterQuery)
+ .then((response) => {
+ this.showSup = response.data.showSup;
+ this.loading = false;
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+
+ }else{
+ getInvProduct(this.filterQuery)
+ .then((response) => {
+ this.showSup = response.data.showSup;
+ this.loading = false;
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ }
},
hideSearch() {
this.showSearch = !this.showSearch;
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index bdaaa4d3..a5ed31e5 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -59,7 +59,7 @@
-
@@ -277,6 +277,7 @@ export default {
findFromInv() {
let cQuery = {
locInvCode: this.formData.invCode,
+ type:1,
};
findByFrom(cQuery)
.then((response) => {
@@ -301,7 +302,10 @@ export default {
hideSearch() {
this.showSearch = !this.showSearch;
},
-
+ getTargerType(){
+ this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
+ console.log(this.formData)
+ },
saveOrder(status) {
this.code = "";
this.$refs.multipleTable.setCurrentRow();
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index aad1f874..72303bf9 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -22,7 +22,14 @@
-
+
+
+
+
@@ -147,7 +154,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange";
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@@ -178,6 +185,7 @@ export default {
4: "已拒绝"
},
idQuery: {},
+ corpList: [],
total: 0,
thirdSys: [],
thirdSysDetail: null,
@@ -373,6 +381,15 @@ export default {
.catch(() => {
});
},
+ finCorpList(){
+ filterSubAll({})
+ .then((response) => {
+ this.corpList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
+
},
components: {
thrOrderNew,
@@ -382,6 +399,7 @@ export default {
created() {
this.finCurInv();
this.getBusType();
+ this.finCorpList();
},
};