From 2060aeb0076a308ed2c369dd815d6993bdddd30f Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:31:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E4=B8=9A?=
=?UTF-8?q?=E6=A0=87=E5=87=86=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E7=82=B9=E5=87=BB=E5=88=86=E9=A1=B5?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BC=9A=E4=B8=A2=E5=A4=B1=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/EnterpriseStandardDatabase.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 45a56c146..b30887217 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2117,6 +2117,7 @@ export default {
props: {},
data () {
return {
+ advancedSearchOrNot: false, // 是否为高级检索
editCheckd:[],
rootNode: '', // 左侧树当前选中的数据的根节点(企业标准,技术体系)
systemCategoryId: [], // 表格选中数据的体系标准Id
@@ -5245,6 +5246,7 @@ export default {
},
// 搜索
getBussionStandTableBtn (item, advancedSearch, type) {
+ this.advancedSearchOrNot = type === 'sel'
item.page = 1
this.tableFlag = item
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
@@ -5253,6 +5255,7 @@ export default {
},
// 清空搜索框
clearAllSearch (flag) {
+ this.advancedSearchOrNot = false
if (flag === 'sarBussionessSearch') {
console.log('1');
// 标准搜索
@@ -5406,7 +5409,7 @@ export default {
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
formData.userId = this.$store.getters.userInfo.userId
- if (type === 'sel') {
+ if (type === 'sel' || this.advancedSearchOrNot) {
const advanceSearchVOList = [];
if (this.formFieldListData !== undefined && this.formFieldListData !== null) {
const formFieldList = this.formFieldListData
From a3d01771d6e6b40c8b9f4a370564f4c9e6c2f5ac Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:48:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?=
=?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?=
=?UTF-8?q?=E5=87=86=20=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/creatProcess/qbrk/step1-2.vue | 8 +++++---
.../processCenter/pages/creatProcess/qbrk/step10.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/step11-1.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/step11.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/step12.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/step13.vue | 6 ++++--
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 8 +++++---
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 8 +++++---
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 8 +++++---
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 6 ++++--
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 7 +++++--
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 6 ++++--
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 6 ++++--
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/stepC1.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/stepC3.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/stepC6.vue | 6 ++++--
.../processCenter/pages/creatProcess/qbrk/stepDetail.vue | 6 ++++--
18 files changed, 77 insertions(+), 40 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 0431fbba0..b5ede3c32 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -3,7 +3,7 @@