From b64d6db597d332c699f84e4928f6d3e5551851f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 16:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/materialOrder/copperOrder.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 9e264b3..12f55f1 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -617,12 +617,19 @@
mounted() {
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
- this.getUserNowInfo()
- this.selectStandardTreeList()
- this.selectStandardMethods()
- this.getInfo() // 鑾峰彇鏁版嵁
+ },
+ activated() {
+ if (this.active==1) {
+ this.getInfoRow();
+ }
},
methods: {
+ getInfoRow() {
+ this.getUserNowInfo()
+ this.selectStandardTreeList()
+ this.selectStandardMethods()
+ this.getInfo() // 鑾峰彇鏁版嵁
+ },
// 鎷嗗垎
handleSplitCountNum () {
this.sample.joinName = null
@@ -1782,7 +1789,11 @@
},
goBack () {
- this.$router.go(-1)
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
},
closeOpenPage() {
this.$router.go(-1)
--
Gitblit v1.9.3