From d800d56f5b5728fe55772bc022e6fedba46b6ec5 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 30 Aug 2024 19:25:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectOrderAllotCardComponents.vue | 4 +- src/views/collect/CollectOrderTabs.vue | 98 +++++++------------ src/views/collect/PanelOrderUpload.vue | 2 + 3 files changed, 37 insertions(+), 67 deletions(-) diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index 020e080a..ad974f86 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -271,7 +271,7 @@ - + @@ -341,7 +341,7 @@ :total="total" :limit.sync="filterQuery.limit" :page.sync="filterQuery.page" - :page-sizes="[12, 24, 48]" + :page-sizes="[9, 18, 36]" @pagination="handleCurrentChange" > diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index 6d0302b4..61825ca6 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -6,54 +6,19 @@
- - - - - - {{ item.workplaceName }} - {{ - item.workplaceId - }} - - - + + +
当前工位:    {{this.formData.workplaceName}}
 - - - - - {{ item.busName }} - {{ item.documentTypeCode }} - - - - 切换业务 - + +
当前业务类型:    {{this.formData.busName}} +      切换业务 +
+ - + @@ -97,7 +62,7 @@ 已完成单 - + 单据上传 @@ -110,10 +75,10 @@ - 工位存量 + 工位库存 - + 损耗出库 @@ -128,23 +93,15 @@ :label="item.title" :name="item.name" @contextmenu.stop.prevent="handleTabContextMenu($event, item)" + style="background-color: white" >
    -
  • 关闭当前
    • -
  • 关闭其他
  • 关闭所有
- - -
- - - -
@@ -172,7 +129,7 @@
+ @click="selectBusType(info)">

{{ info.busName }}

@@ -185,10 +142,10 @@
-

+

{{ info.remark }}

开始作业 + @click="selectBusType(info)">开始作业
@@ -239,7 +196,10 @@ export default { page: 1, limit: 100 }, - formData: {}, + formData: { + busName: null, + workplaceName: null + }, curWorkPlaces: [], busTypeList: [], logo: logoImg, @@ -261,7 +221,7 @@ export default { component: DealOrder, // 假设你需要传递的参数 componentProps: { - title: '这是单据的标题', + // title: '这是单据的标题', } }, { @@ -286,7 +246,7 @@ export default { }, { number: 3, - title: '工位存量', + title: '工位库存', name: 'ioSplitFifoCode', component: ioSplitFifoCode, // 假设你需要传递的参数 @@ -331,7 +291,7 @@ export default { component: DealOrder, // 假设你需要传递的参数 componentProps: { - title: '这是单据的标题' + // title: '这是单据的标题' } } ], @@ -346,12 +306,14 @@ export default { // this.$refs.selectHeadEmpId.blur(); this.selectBusTypeDisabled = true }, - selectBusType(val) { + selectBusType(info) { + let val = info.documentTypeCode this.formData.busType = val let newQuery = {...this.$route.query}; delete newQuery.billNo; newQuery.busType = val this.$router.push({query: newQuery, path: this.$route.path}); + this.formData.busName = info.busName; this.editableTabs = [] this.clickMenuItem(0) this.showChild = false; @@ -439,6 +401,10 @@ export default { } listPage(query).then((res) => { this.curWorkPlaces = res.data.list || []; + if (this.$route.query.workplaceId != null){ + let item = this.curWorkPlaces.find(item => item.workplaceId == this.$route.query.workplaceId); + this.formData.workplaceName = item.workplaceName + } }) }, getWorkBindBusTypes(workplaceId) { @@ -450,10 +416,12 @@ export default { if (this.$route.query.busType != null) { this.formData.busType = this.$route.query.busType + this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName; }else if (this.busTypeList.length == 1) { this.formData.busType = this.busTypeList[0].documentTypeCode this.$router.push({query: {...this.$route.query, busType: this.formData.busType}, path: this.$route.path}) this.selectBusTypeDisabled = false + this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName; } else { this.selectBusTypeDisabled = true this.formData.busType = null @@ -526,7 +494,7 @@ export default { margin-left: 25px; } .context-menu { - zIndex: 1000; + zIndex: 100000; position: fixed ; list-style-type: none; padding: 0; diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue index b183f1a0..941a6276 100644 --- a/src/views/collect/PanelOrderUpload.vue +++ b/src/views/collect/PanelOrderUpload.vue @@ -327,6 +327,7 @@ export default { curRow: null, panelALive: false, + isLinkDisabled: false, options: { findWorkPlace: [] }, @@ -426,6 +427,7 @@ export default { created() { this.filterQuery.tagStatus = this.tagStatus if (this.$route.query.workplaceId != null) { + this.isLinkDisabled=true this.filterQuery.workPlaceCode = this.$route.query.workplaceId this.showType = 2 }