diff --git a/src/api/receipts/bussinessType.js b/src/api/receipts/bussinessType.js index 2feea8e..3c010c5 100644 --- a/src/api/receipts/bussinessType.js +++ b/src/api/receipts/bussinessType.js @@ -30,4 +30,12 @@ export function insertBussinessType(query) { method: "post", data: query }); -} \ No newline at end of file +} + +export function getCandidateBussinessType(query) { + return axios({ + url: "/warehouse/bussinessType/candidateBussinessType", + method: 'get', + params: query + }); +} diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js index df474b5..3140c74 100644 --- a/src/api/warehouse/stockOrder.js +++ b/src/api/warehouse/stockOrder.js @@ -233,3 +233,11 @@ export function stockOrderGenerateBillNo(query) { params: query }); } + +export function supplementOrder(query) { + return axios({ + url: "/udiwms/stock/order/supplementOrder", + method: 'get', + params: query + }); +} diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 51a5fc3..6bf3bcd 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -187,6 +187,7 @@ export default { secCheckChange: null, corpType: null, storageCode: null, + supplementOrderType: null, }, enableMap: { true: "是", @@ -275,7 +276,6 @@ export default { }, handleModifyClick(row) { - this.inputQuery = { id: row.id, remark: row.remark, @@ -303,7 +303,8 @@ export default { secCheckWebNew: row.secCheckWebNew, secCheckChange: row.secCheckChange, corpType: row.corpType + "", - storageCode:row.storageCode, + storageCode: row.storageCode, + supplementOrderType: row.supplementOrderType, }; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 24d325b..f8ce770 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -132,6 +132,24 @@ > + + +
+
+ 补单单据类型:  +
+ + + {{ item.name }} + + +
+
@@ -287,6 +305,8 @@ import { getLocalBusType, } from "../../api/basic/busLocalType"; import {filterAll} from "@/api/basic/invWarehouse"; +import {getJoinBussinessType} from "../../api/basic/bussinessType"; +import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; export default { name: "inputQuery", @@ -304,6 +324,7 @@ export default { isBuType: true, }, storageList: [], + orderTypeList: [], thirdSys: [], localTypes: [], options: [{ @@ -349,11 +370,39 @@ export default { .catch(() => { }); }, + //获取单据类型 + getOrderType() { + this.orderTypeList = []; + let query = { + id: this.inputQuery.id + }; + getCandidateBussinessType(query).then((response) => { + this.orderTypeList = response.data || []; + }).catch(() => { + + }) + }, + }, + computed: { + corpType() { + return this.inputQuery.corpType; + } + }, + watch: { + corpType: function (val) { + if (val != 1) { + this.inputQuery.orderTypeEnable = true; + this.inputQuery.supplementOrderType = null; + } else { + this.inputQuery.orderTypeEnable = false; + } + } }, created() { this.getList(); this.getStorage(); + this.getOrderType(); }, }; diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index b2af023..c5f9f2c 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -93,6 +93,15 @@ + +
+ + 补单 + +
@@ -292,7 +301,7 @@ import { deleteStockOrderById, deleteStockOrderDetailById, copyStockOrderDetail, submitStockOrder, uploadStockOrderDetail, uploadStockOrderDetailCount, - generateStockOrderQRCodeText + generateStockOrderQRCodeText, supplementOrder } from "../../api/warehouse/stockOrder"; import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; @@ -669,6 +678,29 @@ export default { }); } }); + }, + supplementOrder(row) { + this.$confirm('是否确认补单?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + center: true, + }).then(() => { + this.$message({ + type: 'success', + message: '补单成功!' + }); + //补单 + let orderQuery = { + billNo: row.billNo + } + supplementOrder(orderQuery); + }).catch(() => { + this.$message({ + type: 'info', + message: '取消补单' + }); + }); } }, components: { @@ -716,4 +748,6 @@ export default { +