From f4d17568f5dbdec033b83e06d54150c4e7076912 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 14:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052236=20=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=9A=E5=BD=93?=
 =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E5=AD=97=E6=AE=B5=E8=BE=93=E5=85=A5=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=97=A0=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 5 +++++
 .../foreignStandardsAndRegulations/index.vue                 | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ed735f70c..1e15fb23d 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1978,6 +1978,10 @@
                               :placeholder="$t('m.lookUpByAlternativeCriteria')"
                               clearable :maxlength="100"></el-input>
                   </el-form-item>
+                  <!--            部分代替标准号-->
+                  <el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.BFDTBZH" clearable placeholder="根据部分代替标准号查找"></el-input>
+                  </el-form-item>
                   <!--            采标编号-->
                   <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>
@@ -2424,6 +2428,7 @@ export default {
 
       //高级搜索映射
       advanceSearchMapping: {
+        BFDTBZH: '',
         txlbOption: '', //标准体系
         GXHBQ: '', //标签
         CYSD: '', //我司参与深度
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 5a82cc79c..62fa258af 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3160,7 +3160,7 @@ export default {
             connect: "and",
             field: key || '',
             type: 'regexp',
-            value: value.join(',')
+            value: Array.isArray(value) ? value.join(',') : [value]
           });
         } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
           advanceSearchVOList.push({
@@ -3949,7 +3949,7 @@ export default {
             connect: "and",
             field: key || '',
             type: 'regexp',
-            value: value.join(',')
+            value: Array.isArray(value) ? value.join(',') : [value]
           });
         } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
           advanceSearchVOList.push({