国内外标准高级搜索功能

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -341,24 +341,28 @@
           :wrapperClosable="false"
           :visible.sync="isAdvancedSearch">
         <div class="demo-drawer-content">
-          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
+          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice"
+                   style="display: flex;flex-wrap: wrap">
             <!--            标准号-->
-            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
+              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
+                        :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准名称-->
             <el-form-item :label="$t('m.standName')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
+              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
+                        :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准英文名称-->
             <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+              <el-input v-model="sarStandardsSearch.standEnName"
+                        :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            标准类别-->
-            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
               <search-select
                   v-model="sarStandardsSearch.standSort"
                   :placeholder="$t('m.standardCategoryTips')"
@@ -366,59 +370,88 @@
                   :options="standSortOptions"
                   clearable/>
             </el-form-item>
-            <!--            文本状态-->
-            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
-              </el-select>
-            </el-form-item>
             <!--            代替标准号-->
-            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
+            <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+              <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
+                        clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            被代替标准号-->
+            <el-form-item label="被代替标准号">
+              <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
             <!--            标准年份-->
-            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+            <el-form-item :label="$t('m.standardYear')" class="serch-form-item">
               <el-input
                   v-model="sarStandardsSearch.standYear"
                   placeholder="根据标准年份查找">
               </el-input>
             </el-form-item>
+
             <!--            标准发布日期-->
-            <el-form-item label="标准发布日期"  class="serch-form-item">
+            <el-form-item label="标准发布日期" class="serch-form-item">
               <el-date-picker
                   v-model="sarStandardsSearch.issueTime"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据标准发布日期查找">
               </el-date-picker>
             </el-form-item>
+            <!--            适用车型-->
+            <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.applyArctic"
+                         :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <!--            是否纳入标准清单-->
+            <el-form-item label="是否纳入标准清单" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
+                <el-option value="1" label="是"></el-option>
+                <el-option value="0" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+
+
+            <!--            文本状态-->
+            <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
+              </el-select>
+            </el-form-item>
             <!--            标准性质-->
             <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
               <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
-              </el-select>
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                </el-option>
-            <!--            是否纳入标准清单-->
-            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
-                <el-option value="yes" label="是"></el-option>
-                <el-option value="no" label="否"></el-option>
               </el-select>
             </el-form-item>
+
+            <!--            自定义属性-->
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ssrq"
+                  v-model="advanceSearchMapping.SSRQ"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.xcxssrq"
+                  value-format="yyyy-MM-dd"
+                  v-model="advanceSearchMapping.XCXSSRQ"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -426,139 +459,153 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.zccssrq"
+                  v-model="advanceSearchMapping.ZCCSSRQ"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
+              <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+                           :key="opt.value" :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
-              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+              <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
+              <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
-              </el-select>
+                           :label="opt.label">{{ opt.label }}
-            </el-form-item>
+                </el-option>
-            <!--            适用车型-->
-            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用产品线（新增字段）-->
-            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
+            <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+              <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
+                         clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
+              <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
             <el-form-item label="责任部门">
-              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+              <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
-            <!--            关联模块-VPPS编码-->
-            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.svpps" clearable
-                        placeholder="根据关联模块-VPPS编码查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            代替标准号-->
-            <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
-            <!--            关联模块-中文名称-->
-            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
-                        placeholder="根据关联模块-中文名称"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
+              <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.cbcd" clearable
+              <el-input v-model="advanceSearchMapping.CBCD" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
+              <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.byybj" clearable
+              <el-input v-model="advanceSearchMapping.BYYBJ" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
-            <!--            关联模块（新增字段）-->
-            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
-                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-<!--            标记-->
-            <!--            标签-->
-            <el-form-item label="标签">
-              <el-input v-model="sarStandardsSearch.gxhbq" clearable
-                        placeholder="根据被标签查找"
-                        @keyup.enter.native="btnSearch"></el-input>
-            </el-form-item>
 
 
             <!--            体系类别-->
             <el-form-item label="体系类别">
-              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
+              <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
+                           :label="opt.label">{{ opt.label }}
+                </el-option>
               </el-select>
             </el-form-item>
+
+            <!--            关联模块--乘用车VPPS编码-->
+            <el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
+                        placeholder=" 关联模块--乘用车VPPS编码"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--           关联模块--乘用车vpps中文名称-->
+            <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
+                        placeholder="关联模块--乘用车vpps中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--关联模块--卡车VPPS编码-->
+            <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
+                        placeholder="关联模块--卡车VPPS编码"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--关联模块--卡车vpps中文名称-->
+            <el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
+              <el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
+                        placeholder="关联模块--卡车vpps中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="advanceSearchMapping.GXHBQ" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -566,11 +613,13 @@
               class="common-button-primary"
               icon="el-icon-check"
               type="primary"
-              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
+              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索
+          </el-button>
           <el-button
               class="common-button-default"
               icon="el-icon-close"
-              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+              @click="clearAllSearch('sarStandardsSearch')">取消
+          </el-button>
         </div>
       </el-drawer>
       <!-- 新增海外标准 -->
@@ -1460,38 +1509,41 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '',//标准编号
+        standNumber: '',//标准号
         standName: '',//标准名称
+        standEnName: '',//标准英文名称
+        standSort: '', // 标准类别
+        replaceStandNum: '',//代替标准号
+        replacedStandNum: '',// 被代替标准号
+        standYear: '',//标准年份
+        issueTime: '',//标准发布时间
+        applyArctic: '',//适用车型
         standState: '',
         standNature: '',//标准性质
-        issueTime: '',//标准发布时间
-        // applyArctic: '',
-        dtbjh: '',//代替标准号
-        // replaceStandNumCope: '',
-        // replaceStandNumList: [],
-        replacedStandNum: '',
         synopsis: '', // 内容摘要
-        // category: '', // 所属类别
+        textStatus:''//文本状态
-        standSort: '', // 标准类别
+      },
-        txlbOption:'', //标准体系
+      //高级搜索映射
-        gxhbq:'', //标签
+      advanceSearchMapping: {
-        wscysd:'', //我司参与深度
+        txlbOption: '', //标准体系
-        gkglbm:'', //归口管理部门
+        GXHBQ: '', //标签
-        ssrq:'',//实施日期
+        CYSD: '', //我司参与深度
-        scxssrq:''//新车型实施日期
+        GKDW: '', //归口管理部门
-        ,zccssrq:''//在产车实施日期
+        SSRQ: '',//实施日期
-        ,qcdw:''//起草单位
+        XCXSSRQ: ''//新车型实施日期
-        ,nylx:''//能源类型
+        , ZCCSSRQ: ''//在产车实施日期
-        ,cllx:''//适用车型
+        , QCDW: ''//起草单位
-        ,syrz:''//适用认证
+        , NYLX: ''//能源类型
-        ,zrgcs:''//责任工程师
+        , SYRZ: ''//适用认证
-        ,cbbh:''//采标编号
+        , ZRGCS: ''//责任工程师
-        ,cbcd:''//采标程度
+        , CBBH: ''//采标编号
-        ,yybj:''//引用标准
+        , CBCD: ''//采标程度
-        ,byybj:''//被引用标准
+        , YYBJ: ''//引用标准
-        ,txlb:''//体系类别
+        , BYYBJ: ''//被引用标准
+        , TXLB: ''//体系类别
+      },
 
-      }, // 分页查询过程中用到的对象
+      // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
       sideClose: false, // 边栏收展状态
@@ -2532,10 +2584,11 @@ export default {
       this.getDomesticStandardTable()
     },
     // 搜索
-    getDomesticStandardTableBtn (sarStandardsSearch) {
+    getDomesticStandardTableBtn (item) {
+      item.page = 1
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || ''
+      this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
-      this.getDomesticStandardTable(2)
+      this.getDomesticStandardTable(item)
     },
     // 清空搜索框
     clearAllSearch (flag) {
@@ -3167,12 +3220,22 @@ export default {
      * 1、空：普通检索  2：高级检索
      * */
     getDomesticStandardTable (item) {
-      let data = this.standCommonlySearch
+
-      if (item === 2) {
+      // if (item === 2) {
-        data.standSort = ''
+      //   data.standSort = ''
-        data.standNumber = ''
+      //   data.standNumber = ''
-      } else {
+      // } else {
-        data.sarStandardsSearch = ''
+      //   data.sarStandardsSearch = ''
+      // }
+
+      if (item !== '' && item !== null && item !== undefined) {
+        item.pageSize = this.$store.getters.userInfo.configContent
+      }
+
+      this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
+      const data = item || this.standCommonlySearch || this.advanceSearchMapping
+      if (item) {
+        this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr
       }
       const formData = {...data}
       if (!item) {
@@ -3197,6 +3260,29 @@ export default {
       }
       formData.standType = 'FOREIGN'
       formData.userId = this.$store.getters.userInfo.userId
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in this.advanceSearchMapping) {
+        const value = this.advanceSearchMapping[key];
+        if (value !== null && value !== '') {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'like',
+            value: value
+          });
+        }
+
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      console.log("======")
+      console.log(formData.advanceSearchVOStr);
+
+
+
+
       this.SarExportSearchEo = formData
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
@@ -3233,6 +3319,15 @@ export default {
         this.stahndinfoList = []
         this.total = 0
       })
+
+      //清空自定义字段
+      for (let key in this.advanceSearchMapping) {
+        this.advanceSearchMapping[key] = ''
+      }
+      //情况基本字段
+      for (let key in this.sarStandardsSearch) {
+        this.sarStandardsSearch[key] = ''
+      }
     },
     // 查询处于游离态的标准
     selectConfiguraStand () {