From 9627ed7d7351ef2115a0616cfaac56d39bd17137 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 30 Aug 2024 15:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=87=AA=E5=8A=A8=E8=B5=8B?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8D=95=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/workplace/addBusTypeDialog.vue | 31 +++---- src/views/basic/workplace/workplaceManage.vue | 38 +++++---- .../CollectOrderAllotCardComponents.vue | 82 ++++++++++--------- 3 files changed, 82 insertions(+), 69 deletions(-) diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue index d00859db..bd4134d8 100644 --- a/src/views/basic/workplace/addBusTypeDialog.vue +++ b/src/views/basic/workplace/addBusTypeDialog.vue @@ -55,11 +55,11 @@ - - + - + @@ -166,15 +166,15 @@ - - - - - + + + + + @@ -215,7 +215,7 @@ import {getInvListByUser} from '@/api/system/invWarehouse' import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType' import {getBusTypeList} from '@/api/basic/busType' import {addBusType, updateType} from '@/api/basic/workPlace/sysWorkplaceDocuments' -import { getOriginBusType } from '@/api/thrsys/busOriginType' +import {getOriginBusType} from '@/api/thrsys/busOriginType' export default { props: { @@ -251,7 +251,8 @@ export default { documentTypeCode: null, orderCirType: 1, warnType: 2, - workplaceType:3 + workplaceType: 3, + autoTag: 0, }, invList: [], busTypes: [], @@ -278,7 +279,7 @@ export default { {required: true, message: '请选择单据流通方式', trigger: 'blur'} ], workplaceType: [ - { required: true, message: '请选择作业类型', trigger: 'blur' } + {required: true, message: '请选择作业类型', trigger: 'blur'} ] // corpType: [ // // { required: true, message: '请选择往来单位类型', trigger: 'blur' } diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue index 75af6e7d..d2d4a5ca 100644 --- a/src/views/basic/workplace/workplaceManage.vue +++ b/src/views/basic/workplace/workplaceManage.vue @@ -215,9 +215,9 @@ {{ workplaceTypeMap[scope.row.workplaceType] }} - + @@ -660,17 +660,17 @@ import { deleteWorkplace, createWorkplaceId, printWorkLabel, getUsers } from '@/api/basic/workPlace/sysWorkplaceManage' -import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse' -import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage' -import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType' +import {filterAllByUser, getInvListByUser} from '@/api/system/invWarehouse' +import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage' +import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType' import panelGroup from '@/views/dashboard/PanelGroup' -import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace' +import {delUserBindWork, getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import selectBusType from './selectBusType' import addBusTypeDialog from './addBusTypeDialog' -import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments' +import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' export default { - components: { selectBusType, addBusTypeDialog }, + components: {selectBusType, addBusTypeDialog}, data() { return { query: { @@ -721,31 +721,31 @@ export default { filterBadInv: true, formRules: { workplaceName: [ - { required: true, message: '请输入工位名称', trigger: 'blur' } + {required: true, message: '请输入工位名称', trigger: 'blur'} ], operationType: [ - { required: true, message: '请选择作业方式', trigger: 'blur' } + {required: true, message: '请选择作业方式', trigger: 'blur'} ], checkInsert: [ - { required: true, message: '处理结果不能为空', trigger: 'blur' } + {required: true, message: '处理结果不能为空', trigger: 'blur'} ], // invRemindNumber: [ // { required: true, message: '请输入工位存量提醒数', trigger: 'blur' } // ], warnType: [ - { required: true, message: '请选择提醒方式', trigger: 'blur' } + {required: true, message: '请选择提醒方式', trigger: 'blur'} ], corpType: [ - { required: true, message: '请选择往来单位类型', trigger: 'blur' } + {required: true, message: '请选择往来单位类型', trigger: 'blur'} ], orderId: [ - { required: true, message: '请选择单据类型', trigger: 'blur' } + {required: true, message: '请选择单据类型', trigger: 'blur'} ], unitTittle: [ - { required: true, message: '请输入往来类型标题', trigger: 'blur' } + {required: true, message: '请输入往来类型标题', trigger: 'blur'} ], workplaceStatus: [ - { required: true, message: '请选择工位状态', trigger: 'blur' } + {required: true, message: '请选择工位状态', trigger: 'blur'} ], // workplaceType: [ // { required: true, message: '请选择工位类型', trigger: 'blur' } @@ -770,6 +770,10 @@ export default { 1: '是', 2: '否' }, + autoTagTypes: { + 1: '是', + 0: '否' + }, corpTypeMap: { 1: '客户', 2: '供应商', @@ -1034,7 +1038,7 @@ export default { const binaryData = [] binaryData.push(response) let url = window.URL.createObjectURL( - new Blob(binaryData, { type: 'application/pdf' }) + new Blob(binaryData, {type: 'application/pdf'}) ) this.loading = false window.open(url) diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index a9ff28f4..bfbd04f9 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -3,12 +3,12 @@ - - + + + + + + - - + + + + + +
@@ -394,7 +394,7 @@ import bindWorkDialog from "@/views/collect/bindWorkDialog"; import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginDiPanel from "./PannelOrderBiz"; import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; -import {deleteByOrder, orderPage,orderTop} from "@/api/collect/collectOrder"; +import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder"; export default { name: "prescribePanel", @@ -509,47 +509,56 @@ export default { }, handleClick(index) { // this.$router.push({ path: '/tagCodeBlank', query: { workplaceId: this.list[index].workPlaceCode , billNo: this.list[index].billNo }}); - this.$router.push({ query: { ...this.$route.query, billNo: this.list[index].billNo }, path: this.$route.path }) + + let temp = this.list[index]; + if (temp != null && temp.invAlert == 2) { + this.$message.warning("工位存量不足，请及时上货！"); + return; + } + this.$router.push({query: {...this.$route.query, billNo: this.list[index].billNo}, path: this.$route.path}) this.callParentMethod(index) }, callParentMethod(index) { let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo // 触发自定义事件 'parent-method' - this.$emit('parent-method', "DealOrder",url); // someData 是你想要传递给父组件的数据 + this.$emit('parent-method', "DealOrder", url); // someData 是你想要传递给父组件的数据 }, linkPage(_this, row) { - + if (row != null && row.invAlert == 2) { + _this.$message.warning("工位存量不足，请及时上货！"); + return; + } let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo window.open(url, '_blank'); }, //置顶 orderTop(_this, row) { let data = row; - orderTop({id:data.id}).then(res => { - if (res.code == 20000){ + orderTop({id: data.id}).then(res => { + if (res.code == 20000) { _this.$message.success("置顶成功") _this.getList() - }else { + } else { _this.$message.error(res.message) _this.getList() } }).catch(() => { }) - // .then((response) => { - // if (response.code == 20000) { - // this.getList(); - // this.$message.success("指定成功") - // } else if (response.code == 520) { - // this.$message.error(response.message); - // this.getList(); - // } else { - // this.$message.error(response.message); - // this.getList(); - // } - // }) - // .catch(() => { - // }); + // .then((response) => { + // if (response.code == 20000) { + // this.getList(); + // this.$message.success("指定成功") + // } else if (response.code == 520) { + // this.$message.error(response.message); + // this.getList(); + // } else { + // this.$message.error(response.message); + // this.getList(); + // } + // }) + // .catch(() => { + // }); }, //界面配置相关------------ executeFuc(row, type, clickFuc, value) { @@ -608,7 +617,7 @@ export default { this.loading = false this.list = res.data.list || [] this.total = res.data.total || 0 - if (this.filterQuery.workPlaceCode != null){ + if (this.filterQuery.workPlaceCode != null) { this.changeInvRemind(this.filterQuery.workPlaceCode) } @@ -685,7 +694,7 @@ export default { .then((response) => { _this.loading = false; _this.options.findWorkPlace = response.data || []; - if (_this.options.findWorkPlace .length == 1){ + if (_this.options.findWorkPlace.length == 1) { _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code; } }) @@ -696,7 +705,6 @@ export default { }, - }, created() { if (this.$route.query.workplaceId != null) { @@ -704,7 +712,7 @@ export default { this.filterQuery.workPlaceCode = this.$route.query.workplaceId this.showType = 2 } - this.findWorkPlace(this,""); + this.findWorkPlace(this, ""); getHead("prescribeAllot", "1").then((re) => { // 处理返回的数据 this.tableObj = re.data;