diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index ff2f64f..8b256b6 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -63,6 +63,8 @@
+
@@ -148,54 +150,9 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
编辑
-
-
-
-
-
-
-
-
-
-
@@ -438,6 +343,7 @@ import {getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import dialogInvProduct from "@/views/inventory/DialogInvProduct";
export default {
name: "idQuery",
@@ -519,11 +425,16 @@ export default {
thisData: {},
storageList: [],
subInvList: [],
+ curAction: {
+ corpType: 0,
+ genUnit: false,
+ },
+ invQueryData: {},
};
},
components: {
draggable,
- stockOrderNewSelectProduct,
+ stockOrderNewSelectProduct, dialogInvProduct,
},
methods: {
saveOrder(status) {
@@ -645,6 +556,11 @@ export default {
event.target.select();
}
if (this.$isBlank(event)) {
+
+ if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
+ this.$message.error("往来信息和单据类型不能为空！")
+ return;
+ }
this.code = "";
this.$refs.multipleTable.setCurrentRow();
this.currentRow = {};
@@ -658,15 +574,24 @@ export default {
}
this.thisData.stockOrderLists = this.codeArray;
this.thisData.formData = this.formData;
- this.selectProductVisible = true;
let item = this.getActionItem(this.formData.billType);
- if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true)//内部单
- {
+ debugger
+ if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+ this.invQueryData = {
+ locStorageCode: this.formData.locStorageCode,
+ };
+ this.selectInvProductVisible = true;
+ } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+
+ this.invQueryData = {
+ locStorageCode: this.formData.corpId,
+ };
this.selectInvProductVisible = true;
} else {
this.selectProductVisible = true;
}
+
return;
}
this.code = this.code.trim();
@@ -707,35 +632,6 @@ export default {
}).catch(() => {
this.loading = false;
});
-
- // let tQuery2 = {
- // id: response.data.getId
- // };
- // if (this.orderEditor) {
- // tQuery2.orderId = this.formData.id;
- // console.log(tQuery2)
- // addStockOrderDetailFromCodeById(tQuery2).then((response) => {
- // this.loading = false;
- // if (response.code === 20000) {
- // this.closeDialogC2(response);
- // } else {
- // this.$message.error(response.message);
- // }
- // }).catch(() => {
- // this.loading = false;
- // });
- // } else {
- // getStockOrderDetailInstrumentById(tQuery2).then((response) => {
- // this.loading = false;
- // if (response.code === 20000) {
- // this.closeDialogC2(response.data);
- // } else {
- // this.$message.error(response.message);
- // }
- // }).catch(() => {
- // this.loading = false;
- // });
- // }
} else {
this.thisData = response.data;
this.thisData.code = this.code;
@@ -744,6 +640,7 @@ export default {
if (this.orderEditor) {
this.thisData.orderId = this.formData.id
}
+ this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true;
}
} else {
@@ -757,7 +654,6 @@ export default {
}
});
-
},
closeDialogC2(rData) {//01269354847080131120022617230227102002263 2100025
this.selectProductVisible = false;
@@ -1075,6 +971,9 @@ export default {
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
+ this.curAction = this.getActionItem(this.formData.billType);
+ if (this.curAction != null) {
+ }
})
.catch(() => {
});
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 0d1d2c8..242627b 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -105,11 +105,6 @@
-
-
-
-
-
{{ item.localName }}
-