+ @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
}
From b7688afd7db20ca1772de10c03c5c1f60deb2a02 Mon Sep 17 00:00:00 2001
From: yewj
Date: Fri, 30 Aug 2024 19:41:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/collect/CollectOrderAllot.vue | 42 ++-
.../CollectOrderAllotCardComponents.vue | 8 +-
src/views/collect/CollectOrderAllotDetail.vue | 339 ++++++++++++++++++
src/views/collect/CollectOrderTabs.vue | 4 +-
src/views/collect/IoCreateOrder.vue | 1 +
5 files changed, 371 insertions(+), 23 deletions(-)
create mode 100644 src/views/collect/CollectOrderAllotDetail.vue
diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue
index 5ed5a9a6..0274d45a 100644
--- a/src/views/collect/CollectOrderAllot.vue
+++ b/src/views/collect/CollectOrderAllot.vue
@@ -1,28 +1,36 @@
+
+
+
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index ad974f86..355d3bf2 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -351,10 +351,10 @@
-
+ >
@@ -393,7 +393,7 @@ import {convertDate} from "@/utils/date";
import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
-import prescribeOriginDiPanel from "./PannelOrderBiz";
+import CollectOrderAllotDetail from "./CollectOrderAllotDetail";
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder";
@@ -491,7 +491,7 @@ export default {
},
components: {
- addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
+ addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, CollectOrderAllotDetail
},
methods: {
changeInvRemind(val) {
diff --git a/src/views/collect/CollectOrderAllotDetail.vue b/src/views/collect/CollectOrderAllotDetail.vue
new file mode 100644
index 00000000..e95cae91
--- /dev/null
+++ b/src/views/collect/CollectOrderAllotDetail.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.lableRuleObj[scope.row[item.columnName]]
+ }}
+
+
+
+
+
+ {{
+ item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+ }}
+
+
+
+
+
+ {{ buttonItem.name }}
+
+
+
+
+
+ {{
+ scope.row[item.columnName]
+ }}
+
+
+
+
+ {{
+ convertDateFun(scope.row[item.columnName])
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+