From f6082c04ca8c98c1f130d88585d8e7cf67175279 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 17:41:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/materialOrder/copperOrder.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 12f55f1..15b20e2 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -617,11 +617,12 @@
mounted() {
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
activated() {
- if (this.active==1) {
- this.getInfoRow();
- }
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
methods: {
getInfoRow() {
@@ -1195,7 +1196,7 @@
},
getProNum() {
this.sampleSelectionList.forEach((m, i) => {
- Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ Vue.set(this.sampleSelectionList[i], 'proNum', 1)
})
this.$refs.sampleTable.doLayout()
},
--
Gitblit v1.9.3