diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index ee685cda..ea76f08c 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -117,13 +117,13 @@ > - {{ item.workplaceName }} + {{ item.label }} {{ - item.workplaceId + item.code }} @@ -330,6 +330,7 @@ import {printSplitLabel} from "@/api/collect/splitCreateOrder"; import chooseDraftOrderDialog from "./chooseDraftOrderDialog" import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments' +import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' export default { name: "ioCreateOrder", @@ -1005,19 +1006,37 @@ export default { }, //获取当前工位 + // findCurWorkPlaces(val) { + // let query = { + // userId: this.userInfo.userId, + // page: 1, + // limit: 100, + // } + // getUserBindWork(query).then((res) => { + // this.curWorkPlaces = res.data.list || []; + // if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) { + // this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId; + // this.defaultSplitType() + // } + // }) + // }, findCurWorkPlaces(val) { let query = { - userId: this.userInfo.userId, + // chargeUser: _this.$store.getters.userId, + userIdFlag: true, + key: val, page: 1, - limit: 100, + limit: 10, } - getUserBindWork(query).then((res) => { - this.curWorkPlaces = res.data.list || []; - if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) { - this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId; - this.defaultSplitType() - } - }) + filterWorkOptimize(query) + .then((response) => { + this.loading = false; + this.curWorkPlaces = response.data || []; + }) + .catch(() => { + this.loading = false; + this.curWorkPlaces = []; + }); }, diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue index eb4595ba..8d8817a0 100644 --- a/src/views/collect/IoSplitFifoCodePanel.vue +++ b/src/views/collect/IoSplitFifoCodePanel.vue @@ -37,7 +37,7 @@ :label="item.columnDesc+`:`" :key="item.id">