From b30a92b8c245c567fe06dade8f72a78810579516 Mon Sep 17 00:00:00 2001 From: yewj Date: Sun, 15 Sep 2024 17:20:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E8=BD=A6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectOrderAllotCardComponents.vue | 35 +- src/views/collect/CollectOrderNew.vue | 66 +- src/views/collect/IoDestroyLog.vue | 22 +- src/views/collect/IoDestroyOrder.vue | 22 +- src/views/collect/IoSplitFifoCodePanel.vue | 594 +++++++++--------- src/views/collect/IoSplitFifoRemind.vue | 12 +- src/views/collect/IoSplitFinishCode.vue | 20 +- src/views/collect/IoSplitOperateCode.vue | 20 +- src/views/collect/PanelOrderDeal.vue | 18 +- src/views/collect/PanelOrderEndSearch.vue | 19 +- src/views/collect/PanelOrderUpload.vue | 19 +- src/views/collect/chooseDraftOrderDialog.vue | 20 +- .../collect/selectCollectOrderDialog.vue | 14 +- 13 files changed, 463 insertions(+), 418 deletions(-) diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index c547ebcc..c25c441c 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -125,7 +125,7 @@ @click="onReset" >重置 - 查询 @@ -421,10 +421,10 @@ import bindWorkDialog from "@/views/collect/bindWorkDialog"; import prescribeOriginPanel from "./PannelOrderBiz"; import CollectOrderAllotDetail from "./CollectOrderAllotDetail"; import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; -import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace' -import { decideOrder, deleteByOrder, orderPage, orderTop } from '@/api/collect/collectOrder' +import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' +import {decideOrder, deleteByOrder, orderPage, orderTop} from '@/api/collect/collectOrder' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' -import { isBlank } from '@/utils/strUtil' +import {isBlank} from '@/utils/strUtil' export default { name: "prescribePanel", @@ -524,7 +524,7 @@ export default { getBusType: [], }, showType: 1, - routerParam:this.$route.query.routerParam + routerParam: this.$route.query.routerParam } }, @@ -532,8 +532,8 @@ export default { addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, CollectOrderAllotDetail }, methods: { - changePlace(_this,query) { - _this.getWorkBindBusTypes(_this,query) + changePlace(_this, query) { + _this.getWorkBindBusTypes(_this, query) }, getWorkBindBusTypes(_this, query) { _this.busQuery.workplaceCode = query @@ -547,7 +547,7 @@ export default { label: busType.busName }; }); - _this.options.getBusType = getWorkPlace + _this.options.getBusType = getWorkPlace if (_this.options.getBusType.length == 1) { _this.filterQuery.busType = _this.options.getBusType[0].code } else { @@ -592,12 +592,12 @@ export default { // return _this.$message.error("请先绑定工位") // } 2处理中 let query = { - workPlaceCode : row.workPlaceCode, + workPlaceCode: row.workPlaceCode, billNo: row.billNo, tagStatus: 2 } decideOrder(query).then(res => { - if (res.code == 20000){ + if (res.code == 20000) { //当前工位没有正在处理单据 if (row != null && row.invAlert == 2) { _this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", { @@ -611,19 +611,17 @@ export default { }) .catch(() => { }); - }else { + } else { let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType window.open(url, '_blank'); } - }else { + } else { return _this.$message.error(res.message) } }) .catch() - - }, //置顶 orderTop(_this, row) { @@ -700,9 +698,12 @@ export default { this.bindWorkPlaceVisible = false; this.getList(); }, - onSubmit() { - this.filterQuery.page = 1; - this.getList(); + onSubmit(_this) { + debugger + if (_this == null) + _this = this + _this.filterQuery.page = 1; + _this.getList(); }, getList() { diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue index 911617fd..36b25291 100644 --- a/src/views/collect/CollectOrderNew.vue +++ b/src/views/collect/CollectOrderNew.vue @@ -84,28 +84,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
高级查询 @@ -115,7 +115,7 @@ @click="onReset" >重置 - 查询 @@ -397,7 +397,7 @@ import { deleteByOrder, importOrder, downloadOrder, - errorHandle,errorHandleSubmit,deleteOriginOrder + errorHandle, errorHandleSubmit, deleteOriginOrder } from "@/api/collect/collectOrder"; import { orderPage, @@ -469,7 +469,7 @@ export default { showSearch: false, filterQuery: { // tagStatus: this.tagStatus, // - tagStatusList: [0,1,2], // + tagStatusList: [0, 1, 2], // billNo: null, busType: null, workPlaceCode: null, @@ -559,19 +559,19 @@ export default { }, onReset() { this.filterQuery = { - tagStatusList: [0,1,2], + tagStatusList: [0, 1, 2], billNo: null, busType: null, workPlaceCode: null, page: 1, limit: 10, }; - this.errQuery = { + this.errQuery = { tagStatusList: [4], // page: 1, limit: 10, }, - this.actDateRange = []; + this.actDateRange = []; this.getList(); this.getErrorList(this); }, @@ -636,10 +636,12 @@ export default { this.getErrorList(this); } , - onSubmit() { - this.filterQuery.page = 1; - this.getList(); - this.getErrorList(this); + onSubmit(_this) { + if (_this == null) + _this = this + _this.filterQuery.page = 1; + _this.getList(); + _this.getErrorList(_this); } , diff --git a/src/views/collect/IoDestroyLog.vue b/src/views/collect/IoDestroyLog.vue index 9f0338f6..d8c1a5a8 100644 --- a/src/views/collect/IoDestroyLog.vue +++ b/src/views/collect/IoDestroyLog.vue @@ -84,7 +84,7 @@ - + @@ -115,7 +115,7 @@ @click="onReset" >重置 - 查询 @@ -907,16 +907,18 @@ export default { this.actDateRange = []; this.getList(); }, - onSubmit() { - if (this.actDateRange !== null) { - this.filterQuery.startTime = this.actDateRange[0]; - this.filterQuery.endTime = this.actDateRange[1]; + onSubmit(_this) { + if (_this == null) + _this = this + if (_this.actDateRange !== null) { + _this.filterQuery.startTime = _this.actDateRange[0]; + _this.filterQuery.endTime = _this.actDateRange[1]; } else { - this.filterQuery.startTime = null; - this.filterQuery.endTime = null; + _this.filterQuery.startTime = null; + _this.filterQuery.endTime = null; } - this.filterQuery.page = 1; - this.getList(); + _this.filterQuery.page = 1; + _this.getList(); }, hideSearch() { this.showSearch = !this.showSearch; diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue index 41f48a35..244618c9 100644 --- a/src/views/collect/IoDestroyOrder.vue +++ b/src/views/collect/IoDestroyOrder.vue @@ -82,7 +82,7 @@ - + @@ -113,7 +113,7 @@ @click="onReset" >重置 - 查询 @@ -409,16 +409,18 @@ export default { this.actDateRange = []; // this.getList(); }, - onSubmit() { - if (this.actDateRange !== null) { - this.filterQuery.startTime = this.actDateRange[0]; - this.filterQuery.endTime = this.actDateRange[1]; + onSubmit(_this) { + if (_this == null) + _this = this + if (_this.actDateRange !== null) { + _this.filterQuery.startTime = _this.actDateRange[0]; + _this.filterQuery.endTime = _this.actDateRange[1]; } else { - this.filterQuery.startTime = null; - this.filterQuery.endTime = null; + _this.filterQuery.startTime = null; + _this.filterQuery.endTime = null; } - this.filterQuery.page = 1; - this.getList(); + _this.filterQuery.page = 1; + _this.getList(); }, getList() { getSplitCode(this.filterQuery).then(res => { diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue index 15facff2..eb4595ba 100644 --- a/src/views/collect/IoSplitFifoCodePanel.vue +++ b/src/views/collect/IoSplitFifoCodePanel.vue @@ -36,11 +36,11 @@ class="query-form-item" :label="item.columnDesc+`:`" :key="item.id"> @@ -62,19 +62,19 @@ class="query-form-item" :label="item.columnDesc+`:`"> + v-model="filterQuery[item.columnName]" + :placeholder="item.columnDesc" + @change="executeFuc($event,'5',item.checkRules)" + :disabled="executeEval(null,item.disabledFuc,false)" + filterable + remote + :remote-method="(query) => executeFuc(query,'5',item.clickFuc)" + clearable> @@ -82,26 +82,26 @@ class="query-form-item" :label="item.columnDesc+`:`">
@@ -134,12 +134,12 @@ 高级查询 重置 - 查询 @@ -154,36 +154,36 @@ @sort-change="handleSortChange">