From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/copperOrder.vue | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 18783ad..8227fdd 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -421,6 +421,7 @@
}
export default {
+ name: 'CopperOrder',
components: {},
dicts: ['check_type', 'urgency_level'],
data() {
@@ -616,12 +617,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
@@ -721,9 +730,8 @@
})
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.noNeedCheckLoad = false
})
@@ -1162,10 +1170,9 @@
})
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1187,7 +1194,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()
},
@@ -1781,9 +1788,16 @@
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
- }
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
}
</script>
--
Gitblit v1.9.3