diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js index 58a89fe..48f3dde 100644 --- a/src/api/basic/busLocalType.js +++ b/src/api/basic/busLocalType.js @@ -66,3 +66,10 @@ export function updateLocalBusType(query) { }); } +export function filterForThirdSys() { + return axios({ + url: "/udiwms/localBusType/filterForThirdSys", + method: "get", + param: null + }) +} diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue index 9043efb..0fb4fc7 100644 --- a/src/views/basic/BasicThirdSys.vue +++ b/src/views/basic/BasicThirdSys.vue @@ -246,7 +246,7 @@ import { import modifyDialog from "./BasicThirdSysModify"; import modifyDetailDialog from "./BasicThirdSysDetailModify"; -import {getLocalBusType} from "../../api/basic/busLocalType"; +import {filterForThirdSys} from "../../api/basic/busLocalType"; export default { data() { @@ -440,19 +440,10 @@ export default { } }) }, - addBussinessType(){ + addBussinessType() { this.bussinessTypeFormVisible = true; - getLocalBusType().then((res) => { - this.bussinessTypeList = res.data.list; - this.busTypeList.forEach((item) => { - for (let i = 0; i < this.bussinessTypeList.length; i++) { - if (item.code === this.bussinessTypeList[i].action) { - this.bussinessTypeList.splice(i, 1); - i--; - break; - } - } - }) + filterForThirdSys().then((res) => { + this.bussinessTypeList = res.data; }) }, addBussinessTypeData() { diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index 54c5ff9..411ef71 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -142,14 +142,22 @@ -
+
- 平衡补单 + 平衡补单 + +
+ + + 提交 -
@@ -849,21 +857,47 @@ export default { type: 'warning', center: true, }).then(() => { - this.$message({ - type: 'success', - message: '补单成功!' - }); //补单 let orderQuery = { billNo: row.billNo } supplementOrder(orderQuery); + this.$message({ + type: 'success', + message: '补单成功!' + }); }).catch(() => { this.$message({ type: 'info', message: '取消补单' }); }); + }, + submitOrder(row){ + console.log(row.exportStatus) + if (row.exportStatus == 1) { + this.$confirm("单据已经提交,是否重复提交?","提示",{ + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + center: true + }).then(() => { + this.$message({ + type: "success", + message: "提交成功!" + }) + }).catch(() => { + this.$message({ + type: "info", + message: "已取消" + }) + }) + } else { + this.$message({ + type: "success", + message: "提交成功!" + }) + } } }, components: {