diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index 801605aa..a7235f09 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -172,3 +172,11 @@ export function downloadOrder(query) { data: query }); } + +export function orderUpload(query) { + return axios({ + url: "/udiwms/basic/collect/order/upload", + method: "post", + data: query + }); +} \ No newline at end of file diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index f88b22a6..eff1899f 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -198,8 +198,8 @@ import logoImg from '@/assets/logo/logo_dm.png' import DealOrder from '@/views/collect/DealOrder.vue' import CollectOrderAllot from '@/views/collect/CollectOrderAllot.vue' import CollectOrderEnd from '@/views/collect/CollectOrderEnd.vue' -import IoCreateOrderReturn from '@/views/collect/IoSplitOperateCode.vue' -import IoCreateOrderOut from '@/views/collect/IoSplitOperateCode.vue' +import IoCreateOrderReturn from '@/views/collect/IoCreateOrder.vue' +import IoCreateOrderOut from '@/views/collect/IoCreateOrder.vue' import ioSplitFifoCode from '@/views/collect/ioSplitFifoCode.vue' import CollectOrderUpload from '@/views/collect/CollectOrderUpload.vue' import IoDestroyOrder from '@/views/collect/IoDestroyOrder.vue' diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue index 13204f82..059eaa4d 100644 --- a/src/views/collect/IoSplitOperateCode.vue +++ b/src/views/collect/IoSplitOperateCode.vue @@ -230,6 +230,7 @@ > @@ -741,12 +742,12 @@ export default { }, title: "add", filterQuery: { + statusType: 'draft', busType: null, id: "", billNo: null, mainAction: null, action: null, - statusType: "scan_code", page: 1, limit: 10, startTime: null, @@ -880,7 +881,7 @@ export default { methods: { createOrder(splitType){ this.splitType = splitType - + this.idQuery = {}; this.addOrderVisible = true; }, changePlace(_this,query) { @@ -960,7 +961,6 @@ export default { editOrder(row) { this.idQuery = row; - this.title = "edit"; this.addOrderVisible = true; }, @@ -982,6 +982,7 @@ export default { //获取订单列表 getList() { this.loading = true; + this.filterQuery.workPlaceCode = this.workplaceId getOrderList(this.filterQuery) .then((response) => { this.loading = false; diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue index 2123cefd..1fb18841 100644 --- a/src/views/collect/PanelOrderUpload.vue +++ b/src/views/collect/PanelOrderUpload.vue @@ -263,7 +263,7 @@ import PanelOrderManuTagCode from './PanelOrderManuTagCode' import prescribeOriginPanel from '@/views/collect/PannelOrderBiz' import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail' -import { orderPage } from '@/api/collect/collectOrder' +import { orderPag,orderUpload } from '@/api/collect/collectOrder' import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' @@ -453,6 +453,27 @@ export default { _this.loading = false _this.options.findWorkPlace = [] }) + }, + orderUpload(_this, row){ + let params = row; + orderUpload({billNo:params.billNo}) + .then((response) => { + if (response.code == 20000) { + this.getList(); + this.$message({ + type: "success", + message: "上传成功!", + }); + } else if (response.code == 520) { + this.$message.error(response.message); + this.getList(); + } else { + this.$message.error(response.message); + this.getList(); + } + }) + .catch(() => { + }); } },