diff --git a/src/api/purchase/purOrder.js b/src/api/purchase/purOrder.js
index aea76f21..b31981ea 100644
--- a/src/api/purchase/purOrder.js
+++ b/src/api/purchase/purOrder.js
@@ -146,4 +146,12 @@ export function getDetailList(params) {
});
}
+export function filterSupList(data) {
+ return request({
+ url: "/purchase/order/filterSupList",
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 4a1a83f9..61012b6c 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -98,6 +98,7 @@
+
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index c080f14b..af7a7393 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -25,7 +25,7 @@
-
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index c8b39e77..44b430f5 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -18,13 +18,13 @@
@@ -45,12 +45,12 @@
@@ -64,10 +64,10 @@
+ v-for="item in invCodeList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.code">
{{ item.name }}
{{ item.warehouseName }}
@@ -77,25 +77,25 @@
{{ item.name }}
@@ -127,7 +127,8 @@
- 产品录入
+ 产品录入
+
@@ -154,7 +155,21 @@
-
+
+
+
+
+
+
+
+
@@ -214,7 +229,8 @@ import {
listOrderDetail,
addOrderId,
selectOrderDetail,
- updateDetail
+ updateDetail,
+ filterSupList
} from "@/api/purchase/purOrder";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
@@ -267,6 +283,7 @@ export default {
formVisible: false,
deleteLoading: false,
orderNo: null,
+ suppliers: [],
statusMap: {
1: "草稿",
2: "未审核",
@@ -364,18 +381,18 @@ export default {
type: 1,
}
inserThrOrderWeb(tQuery)
- .then(response => {
- this.loading = false;
- if (response.code === 20000) {
- this.$message.success(tMessage + "成功");
- this.closeDialog(true);
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- this.loading = false;
- })
+ .then(response => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.$message.success(tMessage + "成功");
+ this.closeDialog(true);
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ })
},
selectProductFunction() {
if (this.$isBlank(this.formData.supId)) {
@@ -405,23 +422,30 @@ export default {
orderIdFk: this.pId
}
selectOrderDetail(this.query) //查找该单号下的所有条码
- .then((response) => {
- this.codeArray = response.data.list || [];
- this.total = response.data.total || 0;
- if (this.total > 0) {
- this.corpOrderIdDisabled = true;
- }
- this.loading = false;
- })
- .catch(() => {
- this.loading = false;
- this.list = [];
- this.total = 0;
- });
+ .then((response) => {
+ this.codeArray = response.data.list || [];
+ this.total = response.data.total || 0;
+ if (this.total > 0) {
+ this.corpOrderIdDisabled = true;
+ }
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
},
rowChange(val) {
this.currentRow = val;
this.selectedIndex = val.index;
+ filterSupList({productId:val.productId}) //查找该单号下的所有条码
+ .then((response) => {
+ this.suppliers = response.data.list || [];
+ })
+ .catch(() => {
+
+ });
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
@@ -457,19 +481,19 @@ export default {
let delIds = [];
delIds.push(row.id)
delOrderDetail(delIds)
- .then(response => {
- this.detailLoading = false;
- if (response.code === 20000) {
- this.$message.success(response.data);
- // this.getStockOrderDetailList();
- this.codeArray.splice(index, 1);
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- this.detailLoading = false;
- })
+ .then(response => {
+ this.detailLoading = false;
+ if (response.code === 20000) {
+ this.$message.success(response.data);
+ // this.getStockOrderDetailList();
+ this.codeArray.splice(index, 1);
+ } else {
+ this.$message.error(response.message);
+ }
+ })
+ .catch(() => {
+ this.detailLoading = false;
+ })
} else {
this.$message.success('删除成功');
this.codeArray.splice(index, 1);
@@ -485,17 +509,17 @@ export default {
getStockOrderDetailList() {
this.loading = true;
listOrderDetail(this.query) //查找该单号下的所有条码
- .then((response) => {
- console.log(response)
- this.codeArray = response.data.list || [];
- this.total = response.data.total || 0;
- this.loading = false;
- })
- .catch(() => {
- this.loading = false;
- this.list = [];
- this.total = 0;
- });
+ .then((response) => {
+ console.log(response)
+ this.codeArray = response.data.list || [];
+ this.total = response.data.total || 0;
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
},
findSubInvs() {
this.invCodeList = [];
@@ -503,14 +527,14 @@ export default {
filter: 3
};
filterSubByInv(query)
- .then((response) => {
- this.invCodeList = response.data || [];
- if (this.invCodeList != null && this.invCodeList.length == 1) {
- this.formData.invCode = this.invCodeList[0].code;
- }
- })
- .catch(() => {
- });
+ .then((response) => {
+ this.invCodeList = response.data || [];
+ if (this.invCodeList != null && this.invCodeList.length == 1) {
+ this.formData.invCode = this.invCodeList[0].code;
+ }
+ })
+ .catch(() => {
+ });
},
selectApply() {
this.selectApplyVisible = true;
@@ -538,13 +562,13 @@ export default {
limit: 20,
};
getBasicUnitMaintains(cQuery)
- .then((response) => {
- this.loading = false;
- this.fromOptions = response.data.list || [];
- })
- .catch(() => {
- this.loading = false;
- });
+ .then((response) => {
+ this.loading = false;
+ this.fromOptions = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ });
},
},
@@ -577,8 +601,8 @@ export default {
deptCode: null,
incCode: null,
createTime: parseTime(
- date,
- "{y}-{m}-{d} {h}:{i}:{s}"
+ date,
+ "{y}-{m}-{d} {h}:{i}:{s}"
),
};
this.orderEditor = false;