From d84ce4c19f67b22cbca8cb14bda37ec0cbb718fd Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 05 三月 2025 15:43:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/productOrder/components/add.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index ccd6a25..6681783 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -28,9 +28,9 @@
<el-button v-if="active==1&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1" size="small" type="primary" @click="openAuxiliaryCore">杈呭姪绾胯姱閰嶇疆</el-button>
<el-button v-show="active==1||(tabIndex==4&&active==2)" :loading="saveLoad" size="small" type="primary" @click="save">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
- <el-button v-show="active==3&&addObj.companyId" :disabled="saveLoad" :loading="saveLoad" size="small"
+ <el-button v-show="active==3" :disabled="saveLoad" :loading="saveLoad" size="small"
@click="upInsOrderOfState(2)">涓嶉�氳繃</el-button>
- <el-button v-show="active==3&&addObj.companyId" :loading="saveLoad" size="small" type="primary"
+ <el-button v-show="active==3" :loading="saveLoad" size="small" type="primary"
@click="upInsOrderOfState(1)">閫氳繃</el-button>
<el-button size="small" @click="goBack">
<span style="color: #3A7BFA;">杩斿洖</span>
@@ -798,9 +798,10 @@
this.getInfo()
},
activated() {
- if (this.active==1) {
- this.getInfo();
- }
+ this.active = this.$route.query.active
+ this.tabIndex = this.$route.query.tabIndex
+ this.currentId = this.$route.query.currentId
+ this.getInfo();
},
methods: {
getInfo() {
--
Gitblit v1.9.3