From 44cb329de733d38d52a0afb38a0dda9448879358 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 14:54:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/materialOrder/copperOrder.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 1ca4a5f..a78b5cd 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -396,7 +396,6 @@
</template>
<script>
-// import ValueTable from '../../tool/value-table.vue'
import Vue from 'vue'
import {
addRawCopperOrder,
@@ -617,12 +616,20 @@
mounted() {
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
- this.getUserNowInfo()
- this.selectStandardTreeList()
- this.selectStandardMethods()
- this.getInfo() // 鑾峰彇鏁版嵁
+ this.getInfoRow();
+ },
+ activated() {
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
methods: {
+ getInfoRow() {
+ this.getUserNowInfo()
+ this.selectStandardTreeList()
+ this.selectStandardMethods()
+ this.getInfo() // 鑾峰彇鏁版嵁
+ },
// 鎷嗗垎
handleSplitCountNum () {
this.sample.joinName = null
@@ -722,7 +729,6 @@
})
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.closeOpenPage()
}).catch(e=>{
@@ -1163,7 +1169,6 @@
})
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
@@ -1188,7 +1193,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