From b5a03548c7cc5c97a525a46fe7349f71012f5378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 7 Jan 2022 16:10:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=97=A5=E6=9C=9F=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=20=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=A5=E6=9C=9F=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standLawsAttrManage/index.vue       |  2 +-
 .../foreignStandardsAndRegulations/index.vue  | 31 +++++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 60b75bec1..456f4dea9 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -103,7 +103,7 @@
         <!--            <div v-if="scope.row.enable === '1'">未启用</div>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="creationTime" label="创建时间" sortable>
+        <el-table-column prop="creationTime" label="创建时间" >
         </el-table-column>
         <!--        <el-table-column-->
         <!--          fixed="right"-->
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f8bb9b35a..197d52269 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -269,12 +269,12 @@
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                    scope.row.SSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                    scope.row.SSRQ
                   }}</span>
-                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
 
               </template>
             </el-table-column>
@@ -285,13 +285,13 @@
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
               </template>
             </el-table-column>
@@ -302,13 +302,13 @@
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
               </template>
             </el-table-column>
@@ -2591,7 +2591,6 @@ export default {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      console.log(checkedData)
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
@@ -2613,7 +2612,6 @@ export default {
       })
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -2621,7 +2619,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -2874,7 +2871,6 @@ export default {
         this.$nextTick(() => {
           Promise.all([this.queryDisplayLocation()]).then((values) => {
             const [displayLocation] = values
-            console.log('2717', displayLocation)
             const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
             this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
@@ -2929,7 +2925,6 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
-            console.log('2771',this.dynamicFormField)
             this.loading = false
           })
         })
@@ -3366,7 +3361,6 @@ export default {
             const formFieldList = this.formFieldList
             formFieldList.forEach((field) => {
               displayLocation.forEach((location) => {
-                console.log(location)
                 let value = dynamicFormField[field.attrField]
                 if (value && typeof value === 'number') {
                   value = this.$dateFormat(value, 'yyyy-MM-dd')
@@ -3810,11 +3804,8 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
-      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
-        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        console.log('value',value)
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
           advanceSearchVOList.push({
             connect: "and",
@@ -5103,10 +5094,10 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
+      this.setMap(res.data.WBZTCLASS)
       this.allSelectOptions = res.data || {}
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.WBZTCLASS // 文本状态
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
       this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
@@ -5127,11 +5118,11 @@ export default {
       this.nylxOptions.options = res.data.NYLXCLASS;//能源类型
       this.syrzOptions.options = res.data.SYRZCLASS;//适用认证
       this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
+      this.standStateOptions = res.data.WBZTCLASS // 文本状态
       // 模块结构单元变型号
       this.dybxhOptions.options = res.data.DYBXH
 
       this.getGzzOption()
-      this.setMap(this.standStateOptions)
     }, e => {
     })
     this.getDomesticStandardTable()

From c92f6b2590afa62104e8fa350622da5807587eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 7 Jan 2022 16:58:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?736=20=20=E6=9B=B4=E6=94=B9=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue    | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 197d52269..e98735506 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2279,20 +2279,15 @@ export default {
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],
-        standYear: [
-          {required: true, message: '标准年份不能为空', trigger: 'change'},
-          // {validator: this.verify.testNumberCode, trigger: 'change'},
-          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
+        standEnName: [
+          {required: true, message: '英文名称不能为空', trigger: 'change'},
+          // {validator: this.verify.valiateEnName, trigger: 'blur'},
+          {type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
         ],
         standName: [
           {required: false, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
-        standEnName: [
-          {required: false, message: '英文名称不能为空', trigger: 'change'},
-          {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
-          // {validator: this.verify.valiateEnName, trigger: 'blur'}
-        ],
         textStatus: [
           {required: true, message: '文本状态不能为空', trigger: 'change'}
         ],
@@ -2858,8 +2853,6 @@ export default {
     // 编辑标准属性
     selectStandardPro(row, state) {
       // this.sarStandardsInfoEO.country=JSON.parse(item.country );
-
-      // console.log(this.sarStandardsInfoEO.country);
       this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
                 _this: this
               }, res => {
@@ -4809,7 +4802,6 @@ export default {
       })
       // this.rules = rules
       this.$set(this, 'sarStandardsInfoRules', rules)
-
       setTimeout(() => {
         this.reloadAddForm = true
       }, 1000)
@@ -4893,6 +4885,7 @@ export default {
         // rules.standState = [{required: true, message: '标准状态不能为空', trigger: 'change'}]
         rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         this.$set(this, 'sarStandardsInfoRules', rules)
+
         this.$nextTick(() => {
           this.$refs.sarStandardsInfoForm.clearValidate()
         })

From cd084b1031d68946e67b4d3b9a39ab863759288e Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Fri, 7 Jan 2022 17:13:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=8F=82=E4=BC=9A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue     |    5 +-
 .../pages/creatProcess/bzhHy-ch/step1.vue     |   11 +-
 .../pages/creatProcess/bzhHy-ch/step2.vue     |    6 -
 .../pages/creatProcess/bzhHy-ch/step3.vue     |    5 -
 .../pages/creatProcess/bzhHy-ch/step4.vue     |    5 -
 .../pages/creatProcess/bzhHy-ch/step5.vue     |   10 -
 .../pages/creatProcess/bzhHy-ch/step6-1.vue   |    5 -
 .../pages/creatProcess/bzhHy-ch/step6.vue     |    5 -
 .../pages/addEdit.vue                         | 1644 ++++++++---------
 .../pages/otherAddEit.vue                     |  911 +++++----
 .../pages/projectAddEit.vue                   | 1419 +++++++-------
 11 files changed, 2168 insertions(+), 1858 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 6950b24f7..27fa808db 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -601,7 +601,10 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
+        || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
         return true
       } else {
         this.spinShow = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 34eecdb81..4d371e4af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -537,7 +537,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
+        || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
+        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
+        || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
+      ) {
         return true
       } else {
         this.spinShow = false
@@ -872,11 +876,6 @@ export default {
       text-align: right;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-table th {
       padding: 0px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index de701e95d..85e7bc4e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -480,12 +480,6 @@ export default {
       height: auto !important;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
-
     /deep/ .el-textarea__inner {
       font-family: inherit;
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 3fe8cfa32..660d45fa0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -533,11 +533,6 @@ export default {
       margin-top: 0px;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-table__body-wrapper {
       height: auto !important;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index 0b5e95d1f..f7eb8758d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -454,11 +454,6 @@ export default {
       margin-top: 0px;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-table__body-wrapper {
       height: auto !important;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index 583a25fe0..c683d401b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -631,11 +631,6 @@ export default {
       margin-top: 0px;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-table__body-wrapper {
       height: auto !important;
@@ -645,11 +640,6 @@ export default {
       font-family: inherit;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-table th {
       padding: 0px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
index 0aaf6bc93..48ab08c8b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
@@ -358,11 +358,6 @@ export default {
     /deep/.el-textarea__inner {
       font-family: inherit;
     }
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
     /deep/.el-upload {
       display: unset;
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index 0b145656b..9a355c0cb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
@@ -527,11 +527,6 @@ export default {
       font-family: inherit;
     }
 
-    .meeting_table {
-      /deep/ .el-input__inner {
-        text-align: center;
-      }
-    }
 
     /deep/ .el-upload {
       display: unset;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index af8403ca5..8e22d49a5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -13,18 +13,18 @@
             </el-form-item>
             <el-form-item label="国家/地区" prop="countryArea" class="search-item">
               <el-select
-                  v-model="sarAccessEO.countryArea"
-                  multiple
-                  placeholder="请选择"
-                  filterable
-                  :disabled="disabledFlag"
-                  class="wx-resolve"
+                v-model="sarAccessEO.countryArea"
+                multiple
+                placeholder="请选择"
+                filterable
+                :disabled="disabledFlag"
+                class="wx-resolve"
               >
                 <el-option
-                    v-for="item in drawerCountryOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
+                  v-for="item in drawerCountryOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
                 >
                 </el-option>
               </el-select>
@@ -32,28 +32,28 @@
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
-                  v-model="sarAccessEO.remark"
-                  type="textarea"
-                  :disabled="disabledFlag"
-                  clearable
-                  resize="none"
-                  :autosize="{ minRows: 4, maxRows: 8}"
-                  placeholder="请输入"
+                v-model="sarAccessEO.remark"
+                type="textarea"
+                :disabled="disabledFlag"
+                clearable
+                resize="none"
+                :autosize="{ minRows: 4, maxRows: 8}"
+                placeholder="请输入"
               ></el-input>
             </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明附件" prop="relateFile" class="search-item">
               <el-upload
-                  ref="relevantFile"
-                  :action="uploadFileListPath"
-                  show-file-list
-                  :file-list="fileInfoList"
-                  name="file"
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                  :on-remove="delFileInfo"
-                  :on-success="uploadBackSuccess"
-                  :before-upload="beforeUpload"
-                  :on-preview="handleOnPreview"
+                ref="relevantFile"
+                :action="uploadFileListPath"
+                show-file-list
+                :file-list="fileInfoList"
+                name="file"
+                accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                :on-remove="delFileInfo"
+                :on-success="uploadBackSuccess"
+                :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -69,48 +69,50 @@
       <el-divider content-position="left">数据搜索</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
             <el-form-item label="数据来源" class="search-item">
-              <el-select v-model="sarAccessInfoSearch.dataSource" filterable @change="dataSourceChange">
+              <el-select v-model="sarAccessInfo.dataSource" filterable @change="dataSourceChange">
                 <el-option
-                    v-for="item in dataSourceOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
+                  v-for="item in dataSourceOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准号" class="search-item">
+            <el-form-item :label="standLabelNum" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.standNumber"
-                  placeholder="请输入"
-                  :maxlength="100"
-              ></el-input>
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                v-model="sarAccessInfo.standNumber"
+                placeholder="请输入标准号"/>
+              <el-input
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                v-model="sarAccessInfo.lawsNumber"
+                placeholder="请输入政策编号"/>
+              <el-input
+                v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                v-model="sarAccessInfo.standCode"
+                placeholder="请输入企标编号"/>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                  type="primary"
-                  class="common-button-primary"
-                  size="small"
-                  @click="searchLawsStands">
+                type="primary"
+                class="common-button-primary"
+                size="small"
+                @click="searchLawsStands">
                 查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                  class="common-button-default"
-                  size="small"
-                  @click="clearSearchLaws">清空
+                class="common-button-default"
+                size="small"
+                @click="clearSearchLaws">清空
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini"
-                         @click="selectMoreBtn">
-                <i class="iconfont">&#xe7a5;</i>
-                高级查询
-              </el-button>
-              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini"
+              <el-button type="primary" class="common-button-primary" size="mini"
                          @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
@@ -119,117 +121,103 @@
           </el-form>
         </div>
       </div>
-      <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准号" class="labelBox">
-            <el-input
-                style="width: 165px"
-                v-model="sarAccessInfo.standNumber"
-                placeholder="请输入"
-                size="small"
-                clearable/>
-          </el-form-item>
-          <el-form-item label="标准名称" class="labelBox1">
-            <el-input
-                style="width: 165px"
-                v-model="sarAccessInfo.standName"
-                placeholder="请输入"
-                size="small"
-                clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="action-bar">
         <el-button
-            class="common-button-default"
-            size="mini" @click="addSarAccess">添加
+          class="common-button-default"
+          size="mini" @click="addSarAccess">添加
         </el-button>
         <el-button
-            class="common-button-default"
-            v-if="showTableFlag"
-            size="mini" @click="isShowTable"
+          class="common-button-default"
+          v-if="showTableFlag"
+          size="mini" @click="isShowTable"
         >{{ $t('m.showAddDataList') }}
         </el-button>
         <el-button
-            class="common-button-default"
-            v-if="!showTableFlag"
-            size="mini"
-            @click="isShowTable"
+          class="common-button-default"
+          v-if="!showTableFlag"
+          size="mini"
+          @click="isShowTable"
         >{{ $t('m.hideAddDataList') }}
         </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
-            v-show="!isListType"
-            ref="searchTable"
-            @selection-change="sarAccessInfoSearchSelect"
-            :data="sarAccessInfoSearchList"
-            style="width: 100%"
-            border
-            height="300px"
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          v-show="!isListType"
+          ref="searchTable"
+          @selection-change="sarAccessInfoSearchSelect"
+          :data="sarAccessInfoSearchList"
+          style="width: 100%"
+          border
+          height="300px"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
-              type="selection"
-              width="55"
-              align="center"
+            type="selection"
+            width="55"
+            align="center"
           >
           </el-table-column>
           <el-table-column
-              prop="code"
-              show-overflow-tooltip
-              fixed="left"
-              align="center"
-              width="150px"
-              label="标准号">
+            show-overflow-tooltip
+            fixed="left"
+            align="center"
+            width="150px"
+            :label="standLabelNum">
             <template slot-scope="scope">
-              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>            </template>
-          </el-table-column>
-          <el-table-column
-              prop="standName"
-              align="center"
-              label="标准名称"
-          >
-            <template slot-scope="scope">
-              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName|| scope.row.standEnName || scope.row.lawsName}}</span>
+              <a v-if="sarAccessInfo.dataSource === 'INLAND_STAND' || sarAccessInfo.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standNumber
+                }}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.lawsNumber
+                }}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standCode
+                }}</a>
             </template>
           </el-table-column>
           <el-table-column
-              prop="issueTime"
-              align="center"
-              width="110"
-              label="发布日期">
+            prop="standName"
+            align="center"
+            show-overflow-tooltip
+            :label="standLabelName"
+          >
+            <template slot-scope="scope">
+              <span @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standName || scope.row.standEnName || scope.row.lawsName
+                }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            width="110"
+            label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-              prop="xcxssrq"
-              align="center"
-              width="150"
-              label="新车型实施日期">
+            prop="xcxssrq"
+            align="center"
+            width="150"
+            label="新车型实施日期">
           </el-table-column>
           <el-table-column
-              show-overflow-tooltip
-              prop="zccssrq"
-              align="center"
-              width="150"
-              label="在产车实施日期">
+            show-overflow-tooltip
+            prop="zccssrq"
+            align="center"
+            width="150"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
-              show-overflow-tooltip
-              prop="textStatus"
-              width="100px"
-              align="center"
-              label="文本状态">
+            show-overflow-tooltip
+            prop="textStatus"
+            width="100px"
+            align="center"
+            label="文本状态">
             <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
+              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -243,139 +231,138 @@
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
         <el-button
-            class="common-button-default export-button"
-            size="mini" @click="exportAccessInfo('apart')"
-            v-btn-permission="''"
+          class="common-button-default export-button"
+          size="mini" @click="exportAccessInfo('apart')"
+          v-btn-permission="''"
         ><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
         <el-button
-            class="common-button-default delete-button"
-            size="mini" @click="deleteSelectSarAccessInfo"
-            v-if="!disabledFlag"
-            v-btn-permission="''"
+          class="common-button-default delete-button"
+          size="mini" @click="deleteSelectSarAccessInfo"
+          v-if="!disabledFlag"
+          v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除
         </el-button>
       </div>
       <!--   清单条目的列表页   -->
       <el-table
-          ref="entryTable"
-          :data="sarAccessInfoList"
-          class="un-select"
-          style="width: 100%"
-          border
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+        ref="entryTable"
+        :data="sarAccessInfoList"
+        class="un-select"
+        style="width: 100%"
+        border
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}"
-          @selection-change="sarAccessInfoSelect"
+        @selection-change="sarAccessInfoSelect"
       >
         <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+          type="selection"
+          width="55"
+          align="center">
         </el-table-column>
         <el-table-column
-            label="序号"
-            align="center"
-            width="55"
-            fixed="left"
-            type="index"
+          label="序号"
+          align="center"
+          width="55"
+          fixed="left"
+          type="index"
         >
         </el-table-column>
         <el-table-column
-            prop="code"
-            show-overflow-tooltip
-            width="180px"
-            fixed="left"
-            align="center"
-            label="标准号">
+          show-overflow-tooltip
+          width="180px"
+          fixed="left"
+          align="center"
+          :label="standLabelNum">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="standName"
-            label="标准名称"
-            align="center"
-            width="260px"
+          prop="standName"
+          :label="standLabelName"
+          align="center"
+          width="260px"
         >
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="standEnName"
-            align="center"
-            width="180px"
-            label="英文名称">
+          prop="standEnName"
+          align="center"
+          width="180px"
+          label="英文名称">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="typeApplicable"
-            align="center"
-            width="180px"
-            label="适用车型">
+          prop="typeApplicable"
+          align="center"
+          width="180px"
+          label="适用车型">
         </el-table-column>
         <el-table-column
-            prop="nylx"
-            align="center"
-            width="180px"
-            label="能源类型">
+          prop="nylx"
+          align="center"
+          width="180px"
+          label="能源类型">
         </el-table-column>
         <el-table-column
-            prop="ssrq"
-            align="center"
-            width="210px"
-            label="标准实施日期">
+          prop="ssrq"
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="zccssrqgj"
-            width="210px"
-            align="center"
-            label="在产车实施日期">
+          show-overflow-tooltip
+          prop="zccssrqgj"
+          width="210px"
+          align="center"
+          label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrqgj"
-            align="center"
-            width="210px"
-            label="新车型实施日期">
+          prop="xcxssrqgj"
+          align="center"
+          width="210px"
+          label="新车型实施日期">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="zrbm"
-            width="210px"
-            align="center"
-            label="责任部门">
+          show-overflow-tooltip
+          prop="zrbm"
+          width="210px"
+          align="center"
+          label="责任部门">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="sycpx"
-            width="180px"
-            align="center"
-            label="适用产品线">
+          show-overflow-tooltip
+          prop="sycpx"
+          width="180px"
+          align="center"
+          label="适用产品线">
         </el-table-column>
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
-                class="common-button-default"
-                type="primary"
-                size="small" @click="moveUp(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
             >上移
             </el-button>
             <el-button
-                class="common-button-default"
-                type="danger"
-                size="small" @click="moveDown(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
             >下移
             </el-button>
             <el-button
-                size="small"
-                @click="editTghisRow(scope.row)"
-                class="common-button-default"
-                type="warning"
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
             >编辑
             </el-button>
           </template>
@@ -405,13 +392,13 @@
     <!--导入模态框-->
     <el-dialog title="导入信息" :visible.sync="importmodalFlag" width="400px">
       <el-upload
-          drag
-          :action="importExcelUrl"
-          ref="importfile"
-          name="file"
-          accept=".xlsx"
-          :before-upload="handleFormatbeforeUpload"
-          :on-success="importFileSuccess"
+        drag
+        :action="importExcelUrl"
+        ref="importfile"
+        name="file"
+        accept=".xlsx"
+        :before-upload="handleFormatbeforeUpload"
+        :on-success="importFileSuccess"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -421,11 +408,11 @@
     </el-dialog>
 
     <el-drawer
-        title="编辑清单条目"
-        :before-close='cancelInfo'
-        :visible.sync="drawerEdit"
-        :wrapperClosable="false"
-        size="800px"
+      title="编辑清单条目"
+      :before-close='cancelInfo'
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
         <el-form-item label="标准号">
@@ -445,11 +432,11 @@
         </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
-              clearable
-              v-model.trim="editRowData.ssrq"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            clearable
+            v-model.trim="editRowData.ssrq"
+            type="dates"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
@@ -479,24 +466,237 @@
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
-            type="primary"
-            class="common-button-primary"
-            size="mini"
-            icon="el-icon-check"
-            @click="saveInfo"
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
         >提交
         </el-button
         >
         <el-button
-            size="mini"
-            icon="el-icon-close"
-            class="common-button-default"
-            @click="cancelInfo"
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
         >取消
         </el-button
         >
       </div>
     </el-drawer>
+
+    <!--高级查询抽屉-->
+    <el-drawer
+      title="高级查询"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form :modal="sarAccessInfo" class="label-input-form" label-width="150px" style="margin: 20px">
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="standLabelNum" class="add-form-item">
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                  v-model="sarAccessInfo.standNumber"
+                  placeholder="请输入标准号"/>
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                  v-model="sarAccessInfo.lawsNumber"
+                  placeholder="请输入政策编号"/>
+                <el-input
+                  v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                  v-model="sarAccessInfo.standCode"
+                  placeholder="请输入标准号"/>
+              </el-form-item>
+
+              <el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
+                <el-select v-model="sarAccessInfo.textStatusBuss"
+                           placeholder="请选择文本状态"
+                           clearable>
+                  <el-option
+                    v-for="(opt,index) in textStatusBussOptions"
+                    :key="index"
+                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                  >
+                    {{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="文本状态" class="add-form-item">
+                <el-select
+                  v-model="sarAccessInfo.textStatus"
+                  placeholder="请选择文本状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="opt in textStatusOptions"
+                    :value="opt.value === undefined ? '' :opt.value"
+                    :key="opt.value" :label="opt.label">{{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用车型 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['CLLX']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用车型" class="add-form-item">
+                <el-select v-model="sarAccessInfo.lawsSycx" filterable clearable>
+                  <el-option
+                    v-for="item in lawsSycxOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <template v-if="sarAccessInfo.dataSource === 'BUSINESS'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['SYCXCLASS']"
+                ></custom-select-array>
+              </template>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="standLabelName" class="add-form-item">
+                <el-input v-model="sarAccessInfo.standName" placeholder="请输入标准名称"></el-input>
+              </el-form-item>
+              <el-form-item label="是否纳入认证清单" class="add-form-item">
+                <el-select v-model="sarAccessInfo.isRelateAccess" clearable placeholder="根据是否纳入标准清单查找">
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用认证 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYRZ"
+                  v-model="sarAccessInfo['SYRZ']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用认证" class="add-form-item">
+                <el-select v-model="sarAccessInfo.YYRZLAWS" clearable>
+                  <el-option
+                    v-for="item in YYRZLAWSOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <ProcessTitle>
+            <template slot="title">日期选择</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <!-- 发布日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource !== 'FOREIGN_LAWS'" label="发布日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.issueTime"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据标准发布日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else label="发布日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.issueTime"
+                  :editable="false"
+                  placeholder="请选择发布日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 新车型实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="新车型实施日期" class="add-form-item">
+                <el-date-picker
+                  value-format="yyyy-MM-dd"
+                  v-model="sarAccessInfo.XCXSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  placeholder="根据新车型实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="新车型实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.XCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <!-- 实施日期  -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.SSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.SSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 在产车实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="在产车实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.ZCCSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据在产车实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="在产车实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.ZCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -514,13 +714,14 @@ import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
 import TreePopover from "@/components/CustomFormComponents/TreePopover";
 import CustomOrg from "@/components/CustomFormComponents/OrgTree";
 import CustomEopDatePick from "@/components/CustomFormComponents/DatePickerWithText";
-import CustomDatePickWithText, { formatText } from "@/components/CustomFormComponents/DatePickerGroupWithText";
+import CustomDatePickWithText, {formatText} from "@/components/CustomFormComponents/DatePickerGroupWithText";
 import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
 import CustomInputForPolicy from "@/components/CustomFormComponents/InputForPolicy";
 import CustomRoleTree from "@/components/CustomFormComponents/roleTree";
-import { mapGetters } from "vuex";
-import { dicTypeData, StandardsInfoPage } from "@/api/unqualProcess";
-import { interfaceUrl } from "@/sysConfig";
+import {mapGetters} from "vuex";
+import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
+import {interfaceUrl} from "@/sysConfig";
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 export default {
   name: "ListOfStandardsAndRegulationsDetails",
@@ -542,17 +743,13 @@ export default {
     CustomDatePickWithText,
     CustomSVPPS,
     CustomInputForPolicy,
-    CustomRoleTree
+    CustomRoleTree,
+    ProcessTitle
   },
   data() {
     return {
-      // isAdvancedSearch: false,
       textStatusMap: {},
       countryAreaMap: {},
-      typeApplicableMap: {},
-      nylxMap: {},
-      zrbmMap: {},
-      sycpxMap: {},
       // 编辑抽屉状态
       drawerEdit: false,
       // 编辑框数据
@@ -603,17 +800,31 @@ export default {
         ]
       },
       disabledFlag: false,
-      regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
       textStatusOptions: [], // 文本状态
       applyOptions: [], //基础信息适用领域list
+
+      lawsSycxOptions: [], // 国内外政策适用车型
+      YYRZLAWSOptions: [], // 国内外政策适用认证
+
+      textStatusBussOptions: [],
       /** ****************************/
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
       CycxOptions: [],
       sycpxOptions: [], // 适用产品线
-      applyArcticOptions: [], // 基础车型 适用车型list
+
+      applyArcticOptions: [],
+
+      applySYCX: {
+        attrName: '适用车型',
+        options: []
+      },
+      applySYRZ: {
+        attrName: '适用认证',
+        options: []
+      },
       /** ******************************/
       accessSarTypeOptions: [], // 要求类型list
       standSortOptions: [], // 标准类别
@@ -630,84 +841,55 @@ export default {
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
-      sarAccessInfoSearch: {
-        id: '',
-        standType: 'INLAND',
-        standNumber: '',
-        askType: '', // 监管类型
-        dataSource: 'INLAND_STAND', // 数据来源
-        pageNo: 1,
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-        validFlag: 0,
-        advanceSearchVOStr: ''
-      },
       sarAccessInfo: {
         id: '',
-        standNumber: '',
         standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
         standType: 'INLAND',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
-        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
-        advanceSearchVOStr: ''
+        advanceSearchVOStr: []
       },
-      moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
-      showSelectBox: true, // 显示高级查询 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
       importmodalFlag: false, // 导入model 状态
       searching: false,
       sarAccessInfoList: [], // 清单条目 技术要求table 数据
+      sarAccessInfoLists: [],
       sarAccessInfoListArry: [], // 清单条目 table选中数据
       moreSearchShow: false, // 多属性搜索 状态
       loadData: false, // 提交按钮loading效果
       drawerPage: 1, // 数据搜索table页码
       drawerTotal: 0, // 数据搜索table总条数
       dataLoading: false, // 数据搜索 table 查询loading
-      activeName: 'SKILL', // 清单要求 tab名称value  技术要求
       exportTestItemNameFlag: false, // 导出模态框
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
-      defaultAddEntryForm: {
-        sarType: '', // 标准分类
-        code: '', // 标准编号
-        name: '', // 中文名称
-        enName: '', // 英文名称
-        authDelive: '', // 认证交付物
-        authObj: '', // 认证对象
-        authObjId: '', // 认证对象ID
-        authDepart: '', // 认证责任部门
-        authDepartId: '', // 认证责任部门Id
-        energyKind: '', // 能源类型
-        newPutTime: 'N/A', // 新车型实施日期
-        prodPutTime: 'N/A', // 在产车实施日期
-        eopPutTime: 'N/A', // eop实施日期
-        newPutTextTime: '', // 新车型实施日期（项目）
-        prodPutTextTime: '', // 在产车实施日期（项目）
-        eopPutTextTime: '', // eop实施日期（项目）
-        // putTime: '', // 标准实施日期
-        synopsis: '', // 清单说明
-        performInfo: '', // 实施说明
-        ZRBM: '', // 责任部门ID
-        ZRBMName: '', // 责任部门name
-        FOName: '', // FO Name
-        FO: '', // FO id
-        proEssessUser: '', // 项目评估角色name
-        proEssessUserId: '', // 项目评估角色ID
-        nature: '', // 标准性质
-        natureId: '', // 标准性质ID
-        askNature: '', // 监管类型
-        applyArctic: [], // 适用车辆类型
-        XGBMName: '',
-        XGBM: '',
-        askType: '',
-        GXHBQ: [], // 标签
-        accessType: '' // 入库模块
-      },
       // 新增标准法规 验证
       addEntryFormRules: {
         code: [
@@ -726,25 +908,6 @@ export default {
           {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
         ],
       },
-      // 认证对象下拉数据
-      authObjOptions: [
-        {
-          label: '整车',
-          value: '整车'
-        },
-        {
-          label: '零部件',
-          value: '零部件'
-        },
-        {
-          label: '整车+零部件',
-          value: '整车+零部件'
-        },
-        {
-          label: 'TBD',
-          value: 'TBD'
-        }
-      ],
       depNode: [], // 部门树
       isNext: false,
       depFONode: [],
@@ -759,31 +922,7 @@ export default {
       addEditTitle: '新增',
       isDisabled: false,
       isListType: false, // 清单类型
-      reloadAddForm: false,
       formFieldList: [],
-      orgData: [],
-      orgData2: [],
-      sarStandardsInfoEODefault: {
-        accessType: '',
-        id: '',
-        standType: 'INLAND', // 标准分类
-        // country: 'CN', // 适用区域
-        standSort: '', // 标准类别
-        standNumber: '', // 标准编号
-        standSortShow: '',
-        standYear: '', // 标准年份
-        standName: '', // 中文名称
-        standEnName: '', // 英文名称
-        standState: '', // 标准状态
-        standNature: '', // 标准性质
-        issueTime: '', // 发布日期
-        synopsis: '', // 清单说明
-        lawsNumber: '', // 政策编号
-        lawsName: '', // 中文名称
-        lawsEnName: '', // 英文名称
-        lawsState: '', // 文本状态
-        replaceLawsNum: '' // 代替政策编号
-      },
       sarStandardsInfoEO: {
         accessType: '',
         id: '',
@@ -804,132 +943,98 @@ export default {
         lawsEnName: '', // 英文名称
         lawsState: '', // 文本状态
         replaceLawsNum: '' // 代替政策编号
-      }, // 入库标准过程中用到的对象
-      defaultAddFormFieldRules: {
-        standSort: [
-          {required: true, message: '标准类别不能为空', trigger: 'change'}
-        ],
-        standNumber: [
-          {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
-          {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
-        ],
-        standYear: [
-          {required: true, message: '标准年份不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
-        ],
-        standName: [
-          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'blur'}
-        ],
-        standEnName: [
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'blur'}
-        ],
-        standState: [
-          {required: true, message: '标准状态不能为空', trigger: 'change'}
-        ],
-        standNature: [
-          {required: true, message: '标准性质不能为空', trigger: 'change'}
-        ],
-        synopsis: [
-          {type: 'string', max: 500, message: '清单说明不能超过500个字符', trigger: 'blur'}
-          // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'} gaoyan 2018-11-07 客户提到特殊符号校验问题
-        ],
-        lawsNumber: [
-          {required: true, message: '政策编号不能为空', trigger: 'change'},
-          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
-        ],
-        lawsName: [
-          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
-        ],
-        lawsEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
-          // { validator: this.verify.valiateEnName, trigger: 'blur' }
-        ],
-        lawsState: [
-          {required: true, message: '文本状态不能为空', trigger: 'change'}
-        ],
-        countryArea: [
-          {required: true, message: '适用区域不能为空', trigger: 'change'}
-        ],
-        replaceLawsNum: [
-          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}
-        ],
-        issueTime: [
-          {required: true, message: '发布日期不能为空', trigger: 'change'}
-        ]
       },
       formFieldListData: [], // 存储从接口取过来的原始数据
       allSelectOptions: {},
-      dynamicFormField: [], // 动态数据
       uuid: '',
-      rowList: {}
+      rowList: {},
+
+      // 高级查询抽屉
+      showQueryMore: false,
+
+      standLabelNum: '标准号',
+      standLabelName: '标准名称'
     }
   },
-  created() {
-    dicTypeData().then(res => {
-      // 责任部门数据字典
-      this.zrbmOptions = res.data.ZRBMCLASS
-      // 能源类型数据字典
-      this.CycxOptions = res.data.CLLX
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      // 适用车型数据字典
-      this.applyArcticOptions = res.data.PRODUCTTYPE
-      // 适用产品线数据字典
-      this.sycpxOptions = res.data.SYCPXCLASS
-    })
-  },
   methods: {
     // 高级检索
     selectMoreBtn() {
-      this.selectLawsStands()
-      this.showSelectBox = !this.showSelectBox
-      this.showTableFlag = false
-      if (!this.showSelectBox) {
-        this.sarAccessInfoSearch.standName = ''
-        this.sarAccessInfoSearch.issueTime = ''
-        this.sarAccessInfoSearch.textStatus = ''
-        this.sarAccessInfoSearch.modifyTime = ''
+      this.sarAccessInfo.standNumber = ''
+      this.showQueryMore = true
+    },
+    //高级查询的 X
+    cancelQueryInfo() {
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        textStatus: '',
+        CLLX: '',
+        SYRZ: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: this.sarAccessInfo.standType,
+        askType: '', // 监管类型
+        dataSource: this.sarAccessInfo.dataSource, // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
       }
+      this.showQueryMore = false
+    },
+    // 高级查询确认按钮
+    okQueryInfo() {
+      let item = this.sarAccessInfo
+      item.pageSize = this.$store.getters.userInfo.configContent
+      const data = item
+      // this.sarStandardsSearch.menuId = this.selectSarMenu.id
+      const formData = {...data}
+      formData.standType = this.sarAccessInfo.standType
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in formData) {
+        const value = formData[key];
+        if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
+        formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
+        formData.issueTime = null
+      } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
+        // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
+        // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
+      }*/
+      this.sarAccessInfo = formData
+      this.showQueryMore = false
       this.selectLawsStands()
     },
 
-
-    // 法规维护人树
-    getDept() {
-      return new Promise((resolve, reject) => {
-        let url = 'sys/org/getTree'
-        this.$http.get(url, {}, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            let zNodesDept = []
-            res.data.map((item, i) => {
-              let zObj = {}
-              // 该节点为机构
-              zObj.name = item.orgName
-              zObj.icon = 'static/images/dept.png'
-              // zObj.isParent = true
-              zObj.shotName = item.shotName
-              zObj.remarks = item.remarks
-              zObj.id = item.id
-              zObj.pId = item.pId
-              zNodesDept[i] = zObj
-            })
-            this.orgData = zNodesDept
-            this.orgData2 = zNodesDept
-            resolve(res.data)
-          }
-        }, e => {
-          reject(e)
-        })
-      })
-    },
     // 删除上传的文件
     delFileInfo(file, fileList) {
       this.fileInfoList = fileList
@@ -966,8 +1071,8 @@ export default {
       }
       // 判断上传文件格式
       if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
-          || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
+        || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
+        || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
@@ -980,10 +1085,8 @@ export default {
       }
       return true
     },
-    moreSearch() {
-      this.moreSearchShow = !this.moreSearchShow
-      this.moreSearchBtn = !this.moreSearchBtn
-    },
+
+
     // 点击显示隐藏数据列表 按钮事件
     isShowTable() {
       this.selectLawsStands()
@@ -997,174 +1100,92 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws() {
-      this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
-      this.sarAccessInfoSearch.standNumber = ''
-      this.sarAccessInfo.standName = ''
-      this.sarAccessInfo.standNumber = ''
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        textStatus: '',
+        CLLX: '',
+        SYRZ: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: this.sarAccessInfo.standType,
+        askType: '', // 监管类型
+        dataSource: this.sarAccessInfo.dataSource, // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       this.isListType = false
       this.selectLawsStands()
     },
     // 数据来源change事件
     dataSourceChange(val) {
       this.isListType = val === 'TEMP'
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
+      this.sarAccessInfo.advanceSearchVOStr = ''
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfo.dataSource = 'INLAND_STAND'
         this.selectLawsStands()
-        this.twoOptions = [
-          {
-            label: '适用车辆类型',
-            value: 'CLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '标准编号',
-            value: 'STAND_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'STAND_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '法规维护人',
-            value: 'FGWHR',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'FOREIGN_STAND'
+        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
         this.selectLawsStands()
-        this.twoOptions = [
-          {
-            label: '适用车辆类型',
-            value: 'CLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '标准编号',
-            value: 'STAND_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'STAND_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'STAND_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '法规维护人',
-            value: 'FGWHR',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.sarAccessInfoSearch.dataSource = 'FOREIGN_LAWS'
+      } else if (val === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.dataSource = 'FOREIGN_LAWS'
+        this.standLabelNum = '政策编号'
+        this.standLabelName = '中文名称'
         this.selectLawsStands()
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
         // 标准法规清单可查字段
-      }else {
-        this.sarAccessInfoSearch.dataSource = 'BUSINESS'
+      } else {
+        this.sarAccessInfo.dataSource = 'BUSINESS'
+        this.standLabelNum = '企标编号'
+        this.standLabelName = '中文名称'
         this.selectLawsStands()
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1175,7 +1196,6 @@ export default {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
-        console.log('1168',this.selectedAccInfoSearchList)
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
@@ -1187,8 +1207,14 @@ export default {
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
           } else {
-            this.sarAccessInfoList.push(item)
-            this.sarAccessInfoList.forEach(item => {
+            this.sarAccessInfoLists.push(item)
+            this.sarAccessInfoLists.forEach(item => {
+              if (item.lawsNumber) {
+                item.standNumber = item.lawsNumber
+              }
+              if (item.standCode) {
+                item.standNumber = item.standCode
+              }
               this.$set(item, "xcxssrqgj", item.xcxssrq);
               this.$set(item, "zccssrqgj", item.zccssrq);
               if (item.attrInfoCaseMap !== undefined) {
@@ -1198,10 +1224,10 @@ export default {
               // 能源类型转换
               if (item.nylx !== null) {
                 let k = (item.nylx || "").split(",");
-                for (let i in this.applyArcticOptions) {
+                for (let i in this.categoryOptions) {
                   for (let m = 0; m < k.length; m++) {
-                    if (this.applyArcticOptions[i].value === k[m]) {
-                      k[m] = this.applyArcticOptions[i].label;
+                    if (this.categoryOptions[i].value === k[m]) {
+                      k[m] = this.categoryOptions[i].label;
                     }
                     item.nylx = k.join(",");
                   }
@@ -1223,20 +1249,21 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
-            this.sarAccessInfoList.forEach(item => {
-              if(item.nylx === '[]'){
+            this.sarAccessInfoLists.forEach(item => {
+              if (item.nylx === '[]') {
                 item.nylx = ''
               }
-              if(item.typeApplicable === '[]'){
+              if (item.typeApplicable === '[]') {
                 item.typeApplicable = ''
               }
-              if(item.zrbm === '[]'){
+              if (item.zrbm === '[]') {
                 item.zrbm = ''
               }
-              if(item.sycpx === '[]'){
+              if (item.sycpx === '[]') {
                 item.sycpx = ''
               }
             })
+            this.sarAccessInfoList = this.sarAccessInfoLists
           }
         })
       } else {
@@ -1305,10 +1332,10 @@ export default {
       if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null){
+      if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null) {
         this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
       }
-      if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null){
+      if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null) {
         this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
       }
       this.drawerEdit = false
@@ -1341,7 +1368,7 @@ export default {
           this.sarAccessInfoListArry.map(item => {
             let index
             index = this.sarAccessInfoList.findIndex(items => {
-              return items.id === item
+              return items.id === item.id
             })
             if (index > -1) {
               this.sarAccessInfoList.splice(index, 1)
@@ -1395,10 +1422,8 @@ export default {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
-          console.log(rowlist1)
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(';')
-          console.log(rowlist1)
           rowlist2 = rowlist2.join(';')
           rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
@@ -1479,10 +1504,8 @@ export default {
       })
     },
     pageInfo() {
-      this.sarAccessInfoSearch.pageNo = 1
-      this.sarAccessInfoSearch.page = 1
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
-        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage((this.sarAccessInfo)).then(res => {
           this.sarAccessInfoSearchList = res.data.list
           this.sarAccessInfoSearchList.forEach(item => {
             if (item.standYear === null) {
@@ -1498,16 +1521,16 @@ export default {
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
-        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfo, {
           _this: this,
         }, res => {
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
-        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfo, {
           _this: this,
         }, res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1518,57 +1541,21 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfo.standType = 'INLAND'
         this.pageInfo()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
         this.pageInfo()
       }
 
     },
-    selectPage() {
-      this.sarAccessInfo.pageNo = 1
-      this.sarAccessInfo.page = 1
-      StandardsInfoPage(this.sarAccessInfo).then(res => {
-        this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
-          if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          }
-        })
-        this.drawerTotal = res.data.list.length
-      }, e => {
-      })
-    },
-    selectBtn() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfo.standType = 'INLAND'
-        this.selectPage()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfo.standType = 'FOREIGN'
-        this.selectPage()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfo.standType = 'LAWS'
-        this.selectPage()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfo.standType = 'BUSINESS'
-        this.selectPage()
-      }
-    },
-    // 数据搜索table判断checked状态
-    // selectable(row) {
-    //   console.log('1723',row)
-    //   return row.isRelateAccess === '1' || row.isRelateAccess === undefined
-    // },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {
       this.selectedAccInfoSearchList = val
@@ -1630,12 +1617,12 @@ export default {
     // 数据搜索table分页页码改变回调
     drawerPageChange(page) {
       this.drawerPage = page
-      this.sarAccessInfoSearch.page = this.drawerPage
+      this.sarAccessInfo.page = this.drawerPage
       this.selectLawsStands()
     },
     // 数据搜索table分页条数改变回调
     drawerPageSizeChange() {
-      this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.sarAccessInfo.pageSize = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
@@ -1737,48 +1724,48 @@ export default {
         })
       }
     },
-    // 点击清单条目 新增按钮 事件
-    addEntry() {
-      this.editAddType = 1
-      this.addEditTitle = '新增'
-      this.isDisabled = false
-      this.addEntryForm = {...this.defaultAddEntryForm}
-      this.addEntryForm.ZRBM = ''
-      this.addEntryForm.ZRBMName = ''
-      this.addEntryForm.FO = ''
-      this.addEntryForm.FOName = ''
-      this.addEntryForm.authObj = ''
-      this.addEntryForm.authObjId = ''
-      this.addEntryForm.proEssessUserId = ''
-      this.addEntryForm.sarType = 'TEMP'
-      this.addEntryForm.attrField = ''
-      this.$nextTick(() => {
-        this.$refs['addEntryForm'].resetFields()
-      })
-    },
-    // 请求部门结构树
-    getOrgTreeSource() {
-      this.$http.get('sys/org/getTree', {}, {_this: this},
-          res => {
-            if (res.ok) {
-              let treeNode = []
-              res.data.map((item, index) => {
-                let treeItem = {}
-                for (let key in item) {
-                  if (key === 'orgName') {
-                    treeItem.name = item[key]
-                  } else {
-                    treeItem[key] = item[key]
-                  }
-                }
-                treeNode[index] = treeItem
-              })
-              this.depNode = treeNode
-              this.depFONode = treeNode
-              this.depRoleNode = treeNode
-            }
-          })
-    },
+    /*   // 点击清单条目 新增按钮 事件
+       addEntry() {
+         this.editAddType = 1
+         this.addEditTitle = '新增'
+         this.isDisabled = false
+         this.addEntryForm = {...this.defaultAddEntryForm}
+         this.addEntryForm.ZRBM = ''
+         this.addEntryForm.ZRBMName = ''
+         this.addEntryForm.FO = ''
+         this.addEntryForm.FOName = ''
+         this.addEntryForm.authObj = ''
+         this.addEntryForm.authObjId = ''
+         this.addEntryForm.proEssessUserId = ''
+         this.addEntryForm.sarType = 'TEMP'
+         this.addEntryForm.attrField = ''
+         this.$nextTick(() => {
+           this.$refs['addEntryForm'].resetFields()
+         })
+       },*/
+    /* // 请求部门结构树
+     getOrgTreeSource() {
+       this.$http.get('sys/org/getTree', {}, {_this: this},
+           res => {
+             if (res.ok) {
+               let treeNode = []
+               res.data.map((item, index) => {
+                 let treeItem = {}
+                 for (let key in item) {
+                   if (key === 'orgName') {
+                     treeItem.name = item[key]
+                   } else {
+                     treeItem[key] = item[key]
+                   }
+                 }
+                 treeNode[index] = treeItem
+               })
+               this.depNode = treeNode
+               this.depFONode = treeNode
+               this.depRoleNode = treeNode
+             }
+           })
+     },*/
     // 新增提交事件
     saveOrUpdateStands() {
       this.isSubmit = true
@@ -1797,19 +1784,6 @@ export default {
               if (nowstandinfo.eopPutTextTime != null && nowstandinfo.eopPutTextTime !== '') {
                 nowstandinfo.eopPutTextTime = this.$dateFormat(this.addEntryForm.eopPutTextTime, 'yyyy-MM-dd')
               }
-              // 匹配标准性质
-              // this.standNatureOptions.map(item => {
-              //   if (item.value === nowstandinfo.natureId) {
-              //     nowstandinfo.nature = item.label
-              //   }
-              // })
-              // 判断三个实施日期不能全部未N/A和TBD
-              // if ((nowstandinfo.prodPutTime === 'N/A' || nowstandinfo.prodPutTime === 'TBD') &&
-              //     (nowstandinfo.newPutTime === 'N/A' || nowstandinfo.newPutTime === 'TBD') &&
-              //     (nowstandinfo.eopPutTime === 'N/A' || nowstandinfo.eopPutTime === 'TBD')) {
-              //   this.isSubmit = false
-              //   return this.$message.warning('实施日期必须有一项为日期格式')
-              // }
               nowstandinfo.applyArctic = nowstandinfo.applyArctic.join(',')
               nowstandinfo.GXHBQ = nowstandinfo.GXHBQ.join(',')
               nowstandinfo.askNature = nowstandinfo.askNature.join(',')
@@ -1871,59 +1845,59 @@ export default {
      * 赋值内容到入库标准抽屉内
      * item  清单行数据
      */
-    copyStandDrawer(item) {
-      this.sarStandardsInfoEO.accessType = item.accessType
-      this.sarStandardsInfoEO.standNumber = item.code // 标准编号
-      this.sarStandardsInfoEO.standName = item.name // 中文名称
-      this.sarStandardsInfoEO.standEnName = item.enName // 英文名称
-      this.sarStandardsInfoEO.lawsNumber = item.code // 标准编号
-      this.sarStandardsInfoEO.lawsName = item.name // 中文名称
-      this.sarStandardsInfoEO.lawsEnName = item.enName // 英文名称
-      this.sarStandardsInfoEO.synopsis = item.synopsis
-      this.sarStandardsInfoEO.XCXSSRQ = item.newPutTime // 新车型实施日期（文本）
-      this.sarStandardsInfoEO.XCXSSRQXM = item.newPutTextTime // 新车型实施日期（项目）
-      this.sarStandardsInfoEO.ZCCSSRQ = item.prodPutTime // 在产车实施日期（文本）
-      this.sarStandardsInfoEO.ZCCSSRQXM = item.prodPutTextTime // 在产车实施日期（项目）
-      this.sarStandardsInfoEO.EOPSSRQ = item.eopPutTime // EOP实施日期（文本）
-      this.sarStandardsInfoEO.EOPSSRQXM = item.eopPutTextTime // EOP实施日期（项目）
-      this.sarStandardsInfoEO.ZRBMName = item.ZRBMName || item.zrbmname // 责任部门
-      this.sarStandardsInfoEO.ZRBM = item.ZRBM || item.zrbm // 责任部门
-      this.sarStandardsInfoEO.XGBMName = item.XGBMName || item.xgbmname // 相关部门
-      this.sarStandardsInfoEO.XGBM = item.XGBM || item.xgbm // 相关部门
-      this.sarStandardsInfoEO.FOName = item.FOName || item.foname // FO
-      this.sarStandardsInfoEO.FO = item.FO || item.fo // FO
-      this.sarStandardsInfoEO.XMPGJS = item.proEssessUserId // 项目评估人员
-      this.sarStandardsInfoEO.XMPGJSName = item.proEssessUser // 项目评估人员
-      this.sarStandardsInfoEO.standNature = item.natureId // 标准性质
-      this.sarStandardsInfoEO.NRDBZFGQD = this.sarAccessEO.countryArea // 国家地区
-      this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : []
-      this.sarStandardsInfoEO.YQLX = item.askType
-      this.sarStandardsInfoEO.GXHBQ = item.GXHBQ ? item.GXHBQ.split(',') : []
-      this.sarStandardsInfoEO.ZRLX = item.askNature ? item.askNature.split(',') : []
-      if (this.sarStandardsInfoEO.accessType === 'INLAND_STAND') {
-        this.sarStandardsInfoEO.countryArea = 'CN'
-      } else {
-        this.sarStandardsInfoEO.countryArea = ''
-      }
-      this.uuid = item.uuid
-    },
+    /* copyStandDrawer(item) {
+       this.sarStandardsInfoEO.accessType = item.accessType
+       this.sarStandardsInfoEO.standNumber = item.code // 标准编号
+       this.sarStandardsInfoEO.standName = item.name // 中文名称
+       this.sarStandardsInfoEO.standEnName = item.enName // 英文名称
+       this.sarStandardsInfoEO.lawsNumber = item.code // 标准编号
+       this.sarStandardsInfoEO.lawsName = item.name // 中文名称
+       this.sarStandardsInfoEO.lawsEnName = item.enName // 英文名称
+       this.sarStandardsInfoEO.synopsis = item.synopsis
+       this.sarStandardsInfoEO.XCXSSRQ = item.newPutTime // 新车型实施日期（文本）
+       this.sarStandardsInfoEO.XCXSSRQXM = item.newPutTextTime // 新车型实施日期（项目）
+       this.sarStandardsInfoEO.ZCCSSRQ = item.prodPutTime // 在产车实施日期（文本）
+       this.sarStandardsInfoEO.ZCCSSRQXM = item.prodPutTextTime // 在产车实施日期（项目）
+       this.sarStandardsInfoEO.EOPSSRQ = item.eopPutTime // EOP实施日期（文本）
+       this.sarStandardsInfoEO.EOPSSRQXM = item.eopPutTextTime // EOP实施日期（项目）
+       this.sarStandardsInfoEO.ZRBMName = item.ZRBMName || item.zrbmname // 责任部门
+       this.sarStandardsInfoEO.ZRBM = item.ZRBM || item.zrbm // 责任部门
+       this.sarStandardsInfoEO.XGBMName = item.XGBMName || item.xgbmname // 相关部门
+       this.sarStandardsInfoEO.XGBM = item.XGBM || item.xgbm // 相关部门
+       this.sarStandardsInfoEO.FOName = item.FOName || item.foname // FO
+       this.sarStandardsInfoEO.FO = item.FO || item.fo // FO
+       this.sarStandardsInfoEO.XMPGJS = item.proEssessUserId // 项目评估人员
+       this.sarStandardsInfoEO.XMPGJSName = item.proEssessUser // 项目评估人员
+       this.sarStandardsInfoEO.standNature = item.natureId // 标准性质
+       this.sarStandardsInfoEO.NRDBZFGQD = this.sarAccessEO.countryArea // 国家地区
+       this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : []
+       this.sarStandardsInfoEO.YQLX = item.askType
+       this.sarStandardsInfoEO.GXHBQ = item.GXHBQ ? item.GXHBQ.split(',') : []
+       this.sarStandardsInfoEO.ZRLX = item.askNature ? item.askNature.split(',') : []
+       if (this.sarStandardsInfoEO.accessType === 'INLAND_STAND') {
+         this.sarStandardsInfoEO.countryArea = 'CN'
+       } else {
+         this.sarStandardsInfoEO.countryArea = ''
+       }
+       this.uuid = item.uuid
+     },*/
     /**
      * 获取新增弹框的表单
      */
     getAddFormFieldList(ruKu) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
-            res => {
-              if (res.ok) {
-                // const { data: { STAND: data } } = res
-                const {data = {}} = res
-                this.formFieldListData = data[ruKu] || []
-                // this.resolveFormFieldList()
-                resolve()
-              }
-            }, e => {
-              reject(e)
-            })
+          res => {
+            if (res.ok) {
+              // const { data: { STAND: data } } = res
+              const {data = {}} = res
+              this.formFieldListData = data[ruKu] || []
+              // this.resolveFormFieldList()
+              resolve()
+            }
+          }, e => {
+            reject(e)
+          })
       })
     },
     resolveFormFieldList(isEdit) {
@@ -1975,7 +1949,7 @@ export default {
         name: routerName,
         params: {
           id: data.id,
-          pageType: this.sarAccessInfoSearch.dataSource
+          pageType: this.sarAccessInfo.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -2106,10 +2080,6 @@ export default {
       data.forEach(item => {
         this.$set(this.countryAreaMap, item.value, item.label)
         this.$set(this.textStatusMap, item.value, item.label)
-        this.$set(this.typeApplicableMap, item.value, item.label)
-        this.$set(this.nylxMap, item.value, item.label)
-        this.$set(this.zrbmMap, item.value, item.label)
-        this.$set(this.sycpxMap, item.value, item.label)
       })
     }
   },
@@ -2117,7 +2087,7 @@ export default {
     // 监听 清单类型
     isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
-      this.sarAccessInfoSearch.page = 1
+      this.sarAccessInfo.page = 1
       this.selectedAccInfoSearchList = []
       this.accessSarTypeList = []
     }
@@ -2125,40 +2095,62 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
-  mounted() {
+  created() {
     this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     // this.getData()
-    this.getDept()
+    // this.getDept()
     // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.allSelectOptions = res.data || {}
-      this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.NYLXCLASS // 能源类型
-      this.energyKindOptions = res.data.ENERGYTYPES // 适用车型
-      this.CycxOptions = res.data.CLLX
-      this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
-      this.applyOptions = res.data.COUNTRY  //适用区域list
-      this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
-      this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standStateOptions = res.data.STANDSTATE // 标准状态
-      this.ROLELIST = res.data.ROLELIST
-      this.GXHBQOptions = res.data.GXHBQXX
-      this.askNatureOptions = res.data.ACCESSTYPE
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.setMap(this.textStatusOptions)
-      this.setMap(this.drawerCountryOptions)
-      this.getGzzOption()
-    }, e => {
+    dicTypeData().then(res => {
+      if (res.ok) {
+        this.allSelectOptions = res.data || {}
+        // this.regionOptions = res.data.REGION // 基础信息 区域list
+        this.applyArcticOptions = res.data.NYLXCLASS // 能源类型
+        this.energyKindOptions = res.data.ENERGYTYPES // 适用车型
+        // this.CycxOptions = res.data.CLLX
+        this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+        this.applyOptions = res.data.COUNTRY  //适用区域list
+        this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
+        this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standStateOptions = res.data.STANDSTATE // 标准状态
+        this.ROLELIST = res.data.ROLELIST
+        this.GXHBQOptions = res.data.GXHBQXX
+        this.askNatureOptions = res.data.ACCESSTYPE
+        // this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.textStatusOptions = res.data.WBZTCLASS
+        // this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+
+        this.lawsSycxOptions = res.data.lawsSycx // 国内外政策适用车型
+        this.YYRZLAWSOptions = res.data.YYRZLAWS // 国内外政策适用认证
+
+
+        // 责任部门数据字典
+        this.zrbmOptions = res.data.ZRBMCLASS
+        // 能源类型数据字典
+        this.CycxOptions = res.data.CLLX
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        // 适用车型数据字典
+        this.applyArcticOptions = res.data.PRODUCTTYPE
+        // 适用产品线数据字典
+        this.sycpxOptions = res.data.SYCPXCLASS
+        // 适用认证
+        this.applySYRZ.options = res.data.SYRZCLASS
+        // 适用车型
+        this.applySYCX.options = res.data.ENERGYTYPES
+
+        // 企标文本状态
+        this.textStatusBussOptions = res.data.BUSSSTATE
+
+        this.setMap(this.textStatusOptions)
+        this.setMap(this.drawerCountryOptions)
+        this.setMap(this.categoryOptions)
+        this.getGzzOption()
+      }
     })
-    this.getOrgTreeSource()
+    /*this.getOrgTreeSource()*/
     // 判断是否是编辑
     if (this.$route.query.id) {
       const accessRow = this.getAccessStandardRegRow
@@ -2170,7 +2162,7 @@ export default {
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
-        this.sarAccessInfoSearch.validFlag = 0
+        this.sarAccessInfo.validFlag = 0
         this.getData()
         this.getFileInfo()
         this.selectLawsStands()
@@ -2217,9 +2209,6 @@ export default {
     }
   }
 
-  .showSelectBox {
-    padding: 10px;
-  }
 
   .data-search {
     .standards-drawer-table-one {
@@ -2245,7 +2234,8 @@ export default {
     background: #ffffff;
     text-align: right;
   }
-  /deep/.el-date-editor.el-input {
+
+  /deep/ .el-date-editor.el-input {
     width: 100%;
   }
 }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 1f6edd81c..a5d72f782 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -53,9 +53,9 @@
       <el-divider content-position="left">数据搜索</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
             <el-form-item label="数据来源" class="search-item">
-              <el-select v-model="sarAccessInfoSearch.dataSource" filterable @change="dataSourceChange">
+              <el-select v-model="sarAccessInfo.dataSource" filterable @change="dataSourceChange">
                 <el-option
                   v-for="item in dataSourceOptions"
                   :key="item.value"
@@ -65,12 +65,19 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称"  class="search-item">
+            <el-form-item :label="standLabelNum"  class="search-item">
               <el-input
-                v-model="sarAccessInfoSearch.standName"
-                placeholder="请输入"
-                :maxlength="100"
-              ></el-input>
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                v-model="sarAccessInfo.standNumber"
+                placeholder="请输入标准号"/>
+              <el-input
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                v-model="sarAccessInfo.lawsNumber"
+                placeholder="请输入政策编号"/>
+              <el-input
+                v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                v-model="sarAccessInfo.standCode"
+                placeholder="请输入企标编号"/>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
@@ -88,11 +95,8 @@
                 @click="clearSearchLaws">清空</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
-                <i class="iconfont">&#xe7a5;</i>
-                高级查询
-              </el-button>
-              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -100,29 +104,6 @@
           </el-form>
         </div>
       </div>
-      <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准号" class="labelBox">
-            <el-input
-              style="width: 165px"
-              v-model="sarAccessInfo.standNumber"
-              placeholder="请输入"
-              size="small"
-              clearable/>
-          </el-form-item>
-          <el-form-item label="标准名称" class="labelBox1">
-            <el-input
-              style="width: 165px"
-              v-model="sarAccessInfo.standName"
-              placeholder="请输入"
-              size="small"
-              clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="action-bar">
         <el-button
           class="common-button-default"
@@ -163,11 +144,11 @@
             fixed="left"
             width="180px"
             align="center"
-            label="标准号">
+            :label="standLabelNum">
             <template slot-scope="scope">
-              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
+              <a v-if="sarAccessInfo.dataSource === 'INLAND_STAND' || sarAccessInfo.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -256,15 +237,15 @@
           width="180px"
           align="center"
           fixed="left"
-          label="标准号">
+          :label="standLabelNum">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
           prop="standName"
           align="center"
-          label="标准名称"
+          :label="standLabelName"
           width="260px"
         >
           <template slot-scope="scope">
@@ -375,6 +356,219 @@
         </div>
       </el-upload>
     </el-dialog>
+
+    <!--高级查询抽屉-->
+    <el-drawer
+      title="高级查询"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form :modal="sarAccessInfo" class="label-input-form" label-width="150px" style="margin: 20px">
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="standLabelNum" class="add-form-item">
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                  v-model="sarAccessInfo.standNumber"
+                  placeholder="请输入标准号"/>
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                  v-model="sarAccessInfo.lawsNumber"
+                  placeholder="请输入政策编号"/>
+                <el-input
+                  v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                  v-model="sarAccessInfo.standCode"
+                  placeholder="请输入企标编号"/>
+              </el-form-item>
+
+              <el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
+                <el-select v-model="sarAccessInfo.textStatusBuss"
+                           placeholder="请选择文本状态"
+                           clearable>
+                  <el-option
+                    v-for="(opt,index) in textStatusBussOptions"
+                    :key="index"
+                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                  >
+                    {{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="文本状态" class="add-form-item">
+                <el-select
+                  v-model="sarAccessInfo.textStatus"
+                  placeholder="请选择文本状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="opt in textStatusOptions"
+                    :value="opt.value === undefined ? '' :opt.value"
+                    :key="opt.value" :label="opt.label">{{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用车型 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['CLLX']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用车型" class="add-form-item">
+                <el-select v-model="sarAccessInfo.lawsSycx" filterable clearable>
+                  <el-option
+                    v-for="item in lawsSycxOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <template v-if="sarAccessInfo.dataSource === 'BUSINESS'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['SYCXCLASS']"
+                ></custom-select-array>
+              </template>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="standLabelName" class="add-form-item">
+                <el-input v-model="sarAccessInfo.standName" placeholder="请输入标准名称"></el-input>
+              </el-form-item>
+              <el-form-item label="是否纳入认证清单" class="add-form-item">
+                <el-select v-model="sarAccessInfo.isRelateAccess" clearable placeholder="根据是否纳入标准清单查找">
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用认证 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYRZ"
+                  v-model="sarAccessInfo['SYRZ']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用认证" class="add-form-item">
+                <el-select v-model="sarAccessInfo.YYRZLAWS" clearable>
+                  <el-option
+                    v-for="item in YYRZLAWSOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <ProcessTitle>
+            <template slot="title">日期选择</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <!-- 发布日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource !== 'FOREIGN_LAWS'" label="发布日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.issueTime"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据标准发布日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else label="发布日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.issueTime"
+                  :editable="false"
+                  placeholder="请选择发布日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 新车型实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="新车型实施日期" class="add-form-item">
+                <el-date-picker
+                  value-format="yyyy-MM-dd"
+                  v-model="sarAccessInfo.XCXSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  placeholder="根据新车型实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="新车型实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.XCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <!-- 实施日期  -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.SSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.SSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 在产车实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="在产车实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.ZCCSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据在产车实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="在产车实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.ZCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -400,6 +594,7 @@ import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 export default {
   name: 'OtherAddEit',
   components: {
@@ -420,15 +615,13 @@ export default {
     CustomDatePickWithText,
     CustomSVPPS,
     CustomInputForPolicy,
-    CustomRoleTree
+    CustomRoleTree,
+    ProcessTitle
   },
   data () {
     return {
       textStatusMap: {},
       typeApplicableMap: {},
-      nylxMap: {},
-      zrbmMap: {},
-      sycpxMap: {},
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -467,7 +660,60 @@ export default {
       CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
+
+
+      lawsSycxOptions: [], // 国内外政策适用车型
+      YYRZLAWSOptions: [], // 国内外政策适用认证
+
+      textStatusBussOptions: [],
+
+      applySYCX: {
+        attrName: '适用车型',
+        options: []
+      },
+      applySYRZ: {
+        attrName: '适用认证',
+        options: []
+      },
       /** ******************************/
+      // 新增、编辑 数据搜索字段
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      },
+
+      sarAccessInfoLists: [],
+
       textStatusOptions: [], // 文本状态
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
@@ -486,30 +732,7 @@ export default {
         {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
-      // 新增、编辑 数据搜索字段
-      sarAccessInfoSearch: {
-        id: '',
-        standName: '',
-        askType: '', // 监管类型
-        dataSource: 'INLAND_STAND', // 数据来源
-        page: 1,
-        pageNo: 1,
-        Size: this.$store.getters.userInfo.configContent,
-        validFlag: 0,
-        advanceSearchVOStr: ''
-      },
-      sarAccessInfo: {
-        id: '',
-        standName: '',
-        standNumber: '',
-        askType: '', // 监管类型
-        dataSource: 'INLAND_STAND', // 数据来源
-        page: 1,
-        pageNo: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-        validFlag: 0,
-        advanceSearchVOStr: ''
-      },
+
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
@@ -526,42 +749,6 @@ export default {
       exportTestItemNameFlag: false, // 导出模态框
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
-      defaultAddEntryForm: {
-        sarType: '', // 标准分类
-        code: '', // 标准编号
-        name: '', // 中文名称
-        enName: '', // 英文名称
-        authDelive: '', // 认证交付物
-        authObj: '', // 认证对象
-        authObjId: '', // 认证对象ID
-        authDepart: '', // 认证责任部门
-        authDepartId: '', // 认证责任部门Id
-        energyKind: '', // 能源类型
-        newPutTime: 'N/A', // 新车型实施日期
-        prodPutTime: 'N/A', // 在产车实施日期
-        eopPutTime: 'N/A', // eop实施日期
-        newPutTextTime: '', // 新车型实施日期（项目）
-        prodPutTextTime: '', // 在产车实施日期（项目）
-        eopPutTextTime: '', // eop实施日期（项目）
-        // putTime: '', // 标准实施日期
-        synopsis: '', // 清单说明
-        performInfo: '', // 实施说明
-        ZRBM: '', // 责任部门ID
-        ZRBMName: '', // 责任部门name
-        FOName: '', // FO Name
-        FO: '', // FO id
-        proEssessUser: '', // 项目评估角色name
-        proEssessUserId: '', // 项目评估角色ID
-        nature: '', // 标准性质
-        natureId: '', // 标准性质ID
-        askNature: '', // 监管类型
-        applyArctic: [], // 适用车辆类型
-        XGBMName: '',
-        XGBM: '',
-        askType: '',
-        GXHBQ: [], // 标签
-        accessType: '' // 入库模块
-      },
       // 新增标准法规 验证
       addEntryFormRules: {
         code: [
@@ -720,28 +907,102 @@ export default {
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+
+      // 高级查询抽屉
+      showQueryMore: false,
+
+      standLabelNum: '标准号',
+      standLabelName: '标准名称'
     }
   },
-  created() {
-    dicTypeData().then(res => {
-      // 责任部门数据字典
-      this.zrbmOptions = res.data.ZRBMCLASS
-      // 能源类型数据字典
-      this.CycxOptions = res.data.CLLX
-      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      // 适用车型数据字典
-      this.applyArcticOptions = res.data.PRODUCTTYPE
-      // 适用产品线数据字典
-      this.sycpxOptions = res.data.SYCPXCLASS
-    })
-  },
   methods: {
     // 高级检索
     selectMoreBtn () {
-      this.showSelectBox = !this.showSelectBox
-      this.showTableFlag = false
+      this.sarAccessInfo.standNumber = ''
+      this.showQueryMore = true
+    },
+    //高级查询的 X
+    cancelQueryInfo() {
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
+      this.showQueryMore = false
+    },
+    // 高级查询确认按钮
+    okQueryInfo() {
+      let item = this.sarAccessInfo
+      item.pageSize = this.$store.getters.userInfo.configContent
+      const data = item
+      // this.sarStandardsSearch.menuId = this.selectSarMenu.id
+      const formData = {...data}
+      formData.standType = this.sarAccessInfo.standType
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in formData) {
+        const value = formData[key];
+        if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
+        formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
+        formData.issueTime = null
+      } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
+        // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
+        // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
+      }*/
+      this.sarAccessInfo = formData
+      this.showQueryMore = false
       this.selectLawsStands()
     },
+
     // 法规维护人树
     getDept () {
       return new Promise((resolve, reject) => {
@@ -828,173 +1089,106 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands () {
       this.showTableFlag = false
-      this.sarAccessInfoSearch.pageNo = 1
-      this.sarAccessInfoSearch.page = 1
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
-    clearSearchLaws () {
-      this.sarAccessInfoSearch.standName = ''
-      this.sarAccessInfo.standName = ''
-      this.sarAccessInfo.standNumber = ''
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
+    clearSearchLaws() {
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       this.isListType = false
       this.selectLawsStands()
     },
     // 数据来源change事件
-    dataSourceChange (val) {
+    dataSourceChange(val) {
       this.isListType = val === 'TEMP'
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
+      this.sarAccessInfo.advanceSearchVOStr = ''
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       // 国内标准法规可查字段
-      if (val === 'INLAND_STAND'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'CLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '标准编号',
-            value: 'STAND_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'STAND_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '法规维护人',
-            value: 'FGWHR',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
+      if (val === 'INLAND_STAND') {
+        this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.selectLawsStands()
         // 海外标准法规可查字段
-      }else if (val === 'FOREIGN_STAND'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'CLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '标准编号',
-            value: 'STAND_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'STAND_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'STAND_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '法规维护人',
-            value: 'FGWHR',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
+      } else if (val === 'FOREIGN_STAND') {
+        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.selectLawsStands()
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
+      } else if (val === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.dataSource = 'FOREIGN_LAWS'
+        this.standLabelNum = '政策编号'
+        this.standLabelName = '中文名称'
+        this.selectLawsStands()
         // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
+      } else {
+        this.sarAccessInfo.dataSource = 'BUSINESS'
+        this.standLabelNum = '企标编号'
+        this.standLabelName = '中文名称'
+        this.selectLawsStands()
       }
     },
     /**
@@ -1040,6 +1234,12 @@ export default {
           } else{
             this.sarAccessInfoList.push(item)
             this.sarAccessInfoList.forEach(item => {
+              if (item.lawsNumber) {
+                item.standNumber = item.lawsNumber
+              }
+              if (item.standCode) {
+                item.standNumber = item.standCode
+              }
               // 能源类型转换
               if (item.nylx !== null) {
                 let k = (item.nylx || "").split(",");
@@ -1130,7 +1330,7 @@ export default {
           this.sarAccessInfoListArry.map(item => {
             let index
             index = this.sarAccessInfoList.findIndex(items => {
-              return items.id === item
+              return items.id === item.id
             })
             if (index > -1) {
               this.sarAccessInfoList.splice(index, 1)
@@ -1321,12 +1521,9 @@ export default {
       })
     },
     pageInfo() {
-      this.sarAccessInfoSearch.pageNo = 1
-      this.sarAccessInfoSearch.page = 1
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage(this.sarAccessInfo).then(res => {
           this.sarAccessInfoSearchList = res.data.list
-          console.log('1476',res.data.list)
           this.sarAccessInfoSearchList.forEach(item => {
             if (item.standYear === null) {
               item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1354,17 +1551,16 @@ export default {
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
-        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+      }else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS'){
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfo, {
           _this: this,
         }, res => {
-          console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
-        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+      }else if (this.sarAccessInfo.dataSource === 'BUSINESS'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfo, {
           _this: this,
         }, res => {
           console.log('1648',res)
@@ -1376,57 +1572,20 @@ export default {
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfo.standType = 'INLAND'
         this.pageInfo()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
         this.pageInfo()
       }
     },
-    selectPage() {
-      this.sarAccessInfo.page = 1
-      this.sarAccessInfo.pageNo = 1
-      StandardsInfoPage(this.sarAccessInfo).then(res =>{
-        this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
-          if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          }
-        })
-        this.drawerTotal = res.data.list.length
-      }, e => {
-      })
-    },
-    // 高级检索查询按钮
-    selectBtn() {
-      this.sarAccessInfo.pageNo = 1
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
-        this.selectPage()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-        this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
-        this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
-        this.pageInfo()
-      }
-    },
-    // // 数据搜索table判断checked状态
-    // selectable (row) {
-    //   return row.isRelateAccess === '1' || row.isRelateAccess === undefined
-    // },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
@@ -1490,13 +1649,13 @@ export default {
     // 数据搜索table分页页码改变回调
     drawerPageChange (page) {
       this.drawerPage = page
-      this.sarAccessInfoSearch.page = this.drawerPage
+      this.sarAccessInfo.page = this.drawerPage
       this.selectLawsStands()
     },
 
     // 数据搜索table分页条数改变回调
     drawerPageSizeChange () {
-      this.sarAccessInfoSearch.Size = this.$store.getters.userInfo.configContent
+      this.sarAccessInfo.Size = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
@@ -1835,7 +1994,7 @@ export default {
         name: routerName,
         params: {
           id: data.id,
-          pageType: this.sarAccessInfoSearch.dataSource
+          pageType: this.sarAccessInfo.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1954,9 +2113,6 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
         this.$set(this.typeApplicableMap, item.value, item.label)
-        this.$set(this.nylxMap, item.value, item.label)
-        this.$set(this.zrbmMap, item.value, item.label)
-        this.$set(this.sycpxMap, item.value, item.label)
       })
     },
     // 点击上传的文件进行下载
@@ -1971,7 +2127,7 @@ export default {
     // 监听 清单类型
     isListType (newVal, oldVal) {
       this.sarAccessInfoSearchList = []
-      this.sarAccessInfoSearch.page = 1
+      this.sarAccessInfo.page = 1
       this.drawerTotal = 0
       this.selectedAccInfoSearchList = []
       this.accessSarTypeList = []
@@ -1985,34 +2141,57 @@ export default {
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     // this.getData()
-    this.getDept()
+    // this.getDept()
     // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.allSelectOptions = res.data || {}
-      this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
-      this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
-      this.CycxOptions = res.data.CLLX // 能源种类list
-      this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
-      this.applyOptions = res.data.COUNTRY  //适用区域list
-      this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
-      this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standStateOptions = res.data.STANDSTATE // 标准状态
-      this.ROLELIST = res.data.ROLELIST
-      this.GXHBQOptions = res.data.GXHBQXX
-      this.askNatureOptions = res.data.ACCESSTYPE
-      this.zrbmOptions = res.data.ZRBMCLASS || [] // 责任部门
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.setMap(this.textStatusOptions)
-      this.getGzzOption()
-    }, e => {
+    dicTypeData().then(res => {
+      if (res.ok) {
+        this.allSelectOptions = res.data || {}
+        // this.regionOptions = res.data.REGION // 基础信息 区域list
+        this.applyArcticOptions = res.data.NYLXCLASS // 能源类型
+        this.energyKindOptions = res.data.ENERGYTYPES // 适用车型
+        // this.CycxOptions = res.data.CLLX
+        this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+        this.applyOptions = res.data.COUNTRY  //适用区域list
+        this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
+        this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standStateOptions = res.data.STANDSTATE // 标准状态
+        this.ROLELIST = res.data.ROLELIST
+        this.GXHBQOptions = res.data.GXHBQXX
+        this.askNatureOptions = res.data.ACCESSTYPE
+        // this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.textStatusOptions = res.data.WBZTCLASS
+        // this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+
+        this.lawsSycxOptions = res.data.lawsSycx // 国内外政策适用车型
+        this.YYRZLAWSOptions = res.data.YYRZLAWS // 国内外政策适用认证
+
+
+        // 责任部门数据字典
+        this.zrbmOptions = res.data.ZRBMCLASS
+        // 能源类型数据字典
+        this.CycxOptions = res.data.CLLX
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        // 适用车型数据字典
+        this.applyArcticOptions = res.data.PRODUCTTYPE
+        // 适用产品线数据字典
+        this.sycpxOptions = res.data.SYCPXCLASS
+        // 适用认证
+        this.applySYRZ.options = res.data.SYRZCLASS
+        // 适用车型
+        this.applySYCX.options = res.data.ENERGYTYPES
+
+        // 企标文本状态
+        this.textStatusBussOptions = res.data.BUSSSTATE
+
+        this.setMap(this.textStatusOptions)
+        this.setMap(this.drawerCountryOptions)
+        this.setMap(this.categoryOptions)
+        this.getGzzOption()
+      }
     })
-    this.getOrgTreeSource()
+    // this.getOrgTreeSource()
     // 判断是否是编辑
     if (this.$route.query.id) {
       const accessRow = this.getAccessStandardRegRow
@@ -2025,7 +2204,7 @@ export default {
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
-        this.sarAccessInfoSearch.validFlag = 0
+        this.sarAccessInfo.validFlag = 0
         this.getFileInfo()
         this.getData()
         this.selectLawsStands()
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3bfe96ead..58dff1bd3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -13,44 +13,44 @@
             </el-form-item>
             <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
               <el-select
-                  v-model="sarAccessEO.carType"
-                  placeholder="请选择"
-                  filterable
-                  size="small"
+                v-model="sarAccessEO.carType"
+                placeholder="请选择"
+                filterable
+                size="small"
               >
                 <el-option
-                    v-for="item in CycxOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
+                  v-for="item in CycxOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
                 />
               </el-select>
             </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
-                  v-model="sarAccessEO.remark"
-                  type="textarea"
-                  :disabled="disabledFlag"
-                  clearable
-                  resize="none"
-                  :autosize="{ minRows: 4, maxRows: 8}"
-                  placeholder="请输入"
+                v-model="sarAccessEO.remark"
+                type="textarea"
+                :disabled="disabledFlag"
+                clearable
+                resize="none"
+                :autosize="{ minRows: 4, maxRows: 8}"
+                placeholder="请输入"
               ></el-input>
             </el-form-item>
             <br/><br/>
             <el-form-item label="清单说明附件" prop="relateFile" class="search-item">
               <el-upload
-                  ref="relevantFile"
-                  :action="uploadFileListPath"
-                  show-file-list
-                  :file-list="fileInfoList"
-                  name="file"
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                  :on-remove="delFileInfo"
-                  :on-success="uploadBackSuccess"
-                  :before-upload="beforeUpload"
-                  :on-preview="handleOnPreview"
+                ref="relevantFile"
+                :action="uploadFileListPath"
+                show-file-list
+                :file-list="fileInfoList"
+                name="file"
+                accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                :on-remove="delFileInfo"
+                :on-success="uploadBackSuccess"
+                :before-upload="beforeUpload"
+                :on-preview="handleOnPreview"
               >
                 <el-button class="common-button-default" size="mini">
                   点击上传
@@ -66,43 +66,51 @@
       <el-divider content-position="left">数据搜索</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
             <el-form-item label="数据来源" class="search-item">
-              <el-select v-model="sarAccessInfoSearch.dataSource" filterable @change="dataSourceChange">
+              <el-select v-model="sarAccessInfo.dataSource" filterable @change="dataSourceChange">
                 <el-option
-                    v-for="item in dataSourceOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
+                  v-for="item in dataSourceOptions"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" class="search-item">
+            <el-form-item :label="standLabelNum" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.standName"
-                  placeholder="请输入"
-                  :maxlength="100"
-              ></el-input>
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                v-model="sarAccessInfo.standNumber"
+                placeholder="请输入标准号"/>
+              <el-input
+                v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                v-model="sarAccessInfo.lawsNumber"
+                placeholder="请输入政策编号"/>
+              <el-input
+                v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                v-model="sarAccessInfo.standCode"
+                placeholder="请输入企标编号"/>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                  type="primary"
-                  class="common-button-primary"
-                  size="small"
-                  @click="searchLawsStands">
+                type="primary"
+                class="common-button-primary"
+                size="small"
+                @click="searchLawsStands">
                 查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                  class="common-button-default"
-                  size="small"
-                  @click="clearSearchLaws">清空
+                class="common-button-default"
+                size="small"
+                @click="clearSearchLaws">清空
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" class="common-button-primary" size="mini"
+                         @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -110,156 +118,110 @@
           </el-form>
         </div>
       </div>
-      <div class="showSelectBox" v-if="!showSelectBox">
-        <el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准号" class="labelBox">
-            <el-input
-                style="width: 165px;"
-                v-model="sarAccessInfo.standNumber"
-                placeholder="请输入"
-                size="small"
-                clearable/>
-          </el-form-item>
-          <el-form-item label="标准名称" class="labelBox1">
-            <el-input
-                style="width: 165px"
-                v-model="sarAccessInfo.standName"
-                placeholder="请输入"
-                size="small"
-                clearable/>
-          </el-form-item>
-          <el-form-item label="适用车型" class="labelBox1">
-            <el-select
-                v-model="sarAccessInfo.typeApplicable"
-                placeholder="请选择"
-                clearable
-                filterable
-                size="small"
-            >
-              <el-option
-                  v-for="item in CycxOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="适用认证" class="labelBox1">
-            <el-select
-                v-model="sarAccessInfo.syrz"
-                placeholder="请选择"
-                clearable
-                filterable
-                size="small"
-            >
-              <el-option
-                  v-for="item in syrzOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="action-bar">
         <el-button
-            class="common-button-default"
-            size="mini" @click="addSarAccess">添加
+          class="common-button-default"
+          size="mini" @click="addSarAccess">添加
         </el-button>
         <el-button
-            class="common-button-default"
-            v-if="showTableFlag"
-            size="mini" @click="isShowTable"
+          class="common-button-default"
+          v-if="showTableFlag"
+          size="mini" @click="isShowTable"
         >{{ $t('m.showAddDataList') }}
         </el-button>
         <el-button
-            class="common-button-default"
-            v-if="!showTableFlag"
-            size="mini"
-            @click="isShowTable"
+          class="common-button-default"
+          v-if="!showTableFlag"
+          size="mini"
+          @click="isShowTable"
         >{{ $t('m.hideAddDataList') }}
         </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
-            v-show="!isListType"
-            :data="sarAccessInfoSearchList"
-            style="width: 100%"
-            border
-            height="300px"
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          v-show="!isListType"
+          :data="sarAccessInfoSearchList"
+          style="width: 100%"
+          border
+          height="300px"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-            @selection-change="sarAccessInfoSearchSelect"
-            ref="searchTable"
+          @selection-change="sarAccessInfoSearchSelect"
+          ref="searchTable"
         >
           <el-table-column
-              type="selection"
-              width="55"
-              align="center"
+            type="selection"
+            width="55"
+            align="center"
           >
           </el-table-column>
           <el-table-column
-              prop="standNumber"
-              show-overflow-tooltip
-              fixed="left"
-              align="center"
-              width="180px"
-              label="标准号">
+            prop="standNumber"
+            show-overflow-tooltip
+            fixed="left"
+            align="center"
+            width="180px"
+            :label="standLabelNum">
             <template slot-scope="scope">
-              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
-              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
+              <a v-if="sarAccessInfo.dataSource === 'INLAND_STAND' || sarAccessInfo.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standNumber
+                }}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.lawsNumber
+                }}</a>
+              <a v-else-if="sarAccessInfo.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{
+                  scope.row.standCode
+                }}</a>
             </template>
           </el-table-column>
           <el-table-column
-              prop="standName"
-              align="center"
-              label="标准名称"
+            prop="standName"
+            align="center"
+            :label="standLabelName"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName }}</a>
+            </template>
+          </el-table-column>
+         <!-- <el-table-column
+            prop="typeApplicable"
+            align="center"
+            label="适用车型"
+          >
+          </el-table-column>-->
+          <!--<el-table-column
+            prop="syrz"
+            align="center"
+            label="适用认证"
+          >
+          </el-table-column>-->
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
-              prop="typeApplicable"
-              align="center"
-              label="适用车型"
-          >
+            prop="xcxssrq"
+            align="center"
+            label="新车型实施日期">
           </el-table-column>
           <el-table-column
-              prop="syrz"
-              align="center"
-              label="适用认证"
-          >
+            show-overflow-tooltip
+            prop="zccssrq"
+            align="center"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
-              prop="issueTime"
-              align="center"
-              label="发布日期">
-          </el-table-column>
-          <el-table-column
-              prop="xcxssrq"
-              align="center"
-              label="新车型实施日期">
-          </el-table-column>
-          <el-table-column
-              show-overflow-tooltip
-              prop="zccssrq"
-              align="center"
-              label="在产车实施日期">
-          </el-table-column>
-          <el-table-column
-              show-overflow-tooltip
-              prop="textStatus"
-              width="120px"
-              align="center"
-              label="文本状态">
+            show-overflow-tooltip
+            prop="textStatus"
+            width="120px"
+            align="center"
+            label="文本状态">
             <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
+              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -273,130 +235,130 @@
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
         <el-button
-            class="common-button-default export-button"
-            size="mini" @click="exportAccessInfo('apart')"
-            v-btn-permission="''"
+          class="common-button-default export-button"
+          size="mini" @click="exportAccessInfo('apart')"
+          v-btn-permission="''"
         ><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
         <el-button
-            class="common-button-default delete-button"
-            size="mini" @click="deleteSelectSarAccessInfo"
-            v-btn-permission="''"
+          class="common-button-default delete-button"
+          size="mini" @click="deleteSelectSarAccessInfo"
+          v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除
         </el-button>
       </div>
       <el-table
-          :data="sarAccessInfoList"
-          class="un-select"
-          style="width: 100%"
-          border
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+        :data="sarAccessInfoList"
+        class="un-select"
+        style="width: 100%"
+        border
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}"
-          @selection-change="sarAccessInfoSelect"
-          ref="entryTable"
+        @selection-change="sarAccessInfoSelect"
+        ref="entryTable"
       >
         <el-table-column
-            type="selection"
-            width="55"
-            align="center">
+          type="selection"
+          width="55"
+          align="center">
         </el-table-column>
         <el-table-column
-            label="序号"
-            align="center"
-            width="55"
-            fixed="left"
-            type="index"
+          label="序号"
+          align="center"
+          width="55"
+          fixed="left"
+          type="index"
         >
         </el-table-column>
         <el-table-column
-            prop="standNumber"
-            show-overflow-tooltip
-            width="180px"
-            fixed="left"
-            align="center"
-            label="标准号">
+          prop="standNumber"
+          show-overflow-tooltip
+          width="180px"
+          fixed="left"
+          align="center"
+          :label="standLabelNum">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="standName"
-            label="标准名称"
-            align="center"
-            width="260px"
+          prop="standName"
+          :label="standLabelName"
+          align="center"
+          width="260px"
         >
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="standEnName"
-            align="center"
-            width="180px"
-            label="英文名称">
+          prop="standEnName"
+          align="center"
+          width="180px"
+          label="英文名称">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
         <el-table-column
-            prop="typeApplicable"
-            align="center"
-            width="180px"
-            label="适用车型">
+          prop="typeApplicable"
+          align="center"
+          width="180px"
+          label="适用车型">
         </el-table-column>
         <el-table-column
-            prop="nylx"
-            align="center"
-            width="180px"
-            label="能源类型">
+          prop="nylx"
+          align="center"
+          width="180px"
+          label="能源类型">
         </el-table-column>
         <el-table-column
-            prop="ssrq"
-            align="center"
-            width="210px"
-            label="标准实施日期">
+          prop="ssrq"
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="zccssrq"
-            width="210px"
-            align="center"
-            label="在产车实施日期">
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrq"
-            align="center"
-            width="210px"
-            label="新车型实施日期">
+          prop="xcxssrq"
+          align="center"
+          width="210px"
+          label="新车型实施日期">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="zrbm"
-            width="210px"
-            align="center"
-            label="责任部门">
+          show-overflow-tooltip
+          prop="zrbm"
+          width="210px"
+          align="center"
+          label="责任部门">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
-            prop="sycpx"
-            width="180px"
-            align="center"
-            label="适用产品线">
+          show-overflow-tooltip
+          prop="sycpx"
+          width="180px"
+          align="center"
+          label="适用产品线">
         </el-table-column>
         <el-table-column width="160" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
-                class="common-button-default"
-                type="primary"
-                size="small" @click="moveUp(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              class="common-button-default"
+              type="primary"
+              size="small" @click="moveUp(scope.$index, scope.row)"
+              v-if="!disabledFlag"
             >上移
             </el-button>
             <el-button
-                class="common-button-default"
-                type="danger"
-                size="small" @click="moveDown(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              class="common-button-default"
+              type="danger"
+              size="small" @click="moveDown(scope.$index, scope.row)"
+              v-if="!disabledFlag"
             >下移
             </el-button>
           </template>
@@ -426,13 +388,13 @@
     <!--导入模态框-->
     <el-dialog title="导入信息" :visible.sync="importmodalFlag" width="400px">
       <el-upload
-          drag
-          :action="importExcelUrl"
-          ref="importfile"
-          name="file"
-          accept=".xlsx"
-          :before-upload="handleFormatbeforeUpload"
-          :on-success="importFileSuccess"
+        drag
+        :action="importExcelUrl"
+        ref="importfile"
+        name="file"
+        accept=".xlsx"
+        :before-upload="handleFormatbeforeUpload"
+        :on-success="importFileSuccess"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -440,6 +402,219 @@
         </div>
       </el-upload>
     </el-dialog>
+
+    <!--高级查询抽屉-->
+    <el-drawer
+      title="高级查询"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <div class="content_form" style="height: 100%">
+        <el-form :modal="sarAccessInfo" class="label-input-form" label-width="150px" style="margin: 20px">
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="standLabelNum" class="add-form-item">
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+                  v-model="sarAccessInfo.standNumber"
+                  placeholder="请输入标准号"/>
+                <el-input
+                  v-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                  v-model="sarAccessInfo.lawsNumber"
+                  placeholder="请输入政策编号"/>
+                <el-input
+                  v-else-if="sarAccessInfo.dataSource === 'BUSINESS'"
+                  v-model="sarAccessInfo.standCode"
+                  placeholder="请输入标准号"/>
+              </el-form-item>
+
+              <el-form-item v-if="sarAccessInfo.dataSource === 'BUSINESS'" label="文本状态" class="add-form-item">
+                <el-select v-model="sarAccessInfo.textStatusBuss"
+                           placeholder="请选择文本状态"
+                           clearable>
+                  <el-option
+                    v-for="(opt,index) in textStatusBussOptions"
+                    :key="index"
+                    :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
+                  >
+                    {{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-else label="文本状态" class="add-form-item">
+                <el-select
+                  v-model="sarAccessInfo.textStatus"
+                  placeholder="请选择文本状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="opt in textStatusOptions"
+                    :value="opt.value === undefined ? '' :opt.value"
+                    :key="opt.value" :label="opt.label">{{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用车型 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['CLLX']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用车型" class="add-form-item">
+                <el-select v-model="sarAccessInfo.lawsSycx" filterable clearable>
+                  <el-option
+                    v-for="item in lawsSycxOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <template v-if="sarAccessInfo.dataSource === 'BUSINESS'">
+                <custom-select-array
+                  :config="applySYCX"
+                  v-model="sarAccessInfo['SYCXCLASS']"
+                ></custom-select-array>
+              </template>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="standLabelName" class="add-form-item">
+                <el-input v-model="sarAccessInfo.standName" placeholder="请输入标准名称"></el-input>
+              </el-form-item>
+              <el-form-item label="是否纳入认证清单" class="add-form-item">
+                <el-select v-model="sarAccessInfo.isRelateAccess" clearable placeholder="根据是否纳入标准清单查找">
+                  <el-option value="1" label="是"></el-option>
+                  <el-option value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- 适用认证 -->
+              <template v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'">
+                <custom-select-array
+                  :config="applySYRZ"
+                  v-model="sarAccessInfo['SYRZ']"
+                ></custom-select-array>
+              </template>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'"
+                            label="适用认证" class="add-form-item">
+                <el-select v-model="sarAccessInfo.YYRZLAWS" clearable>
+                  <el-option
+                    v-for="item in YYRZLAWSOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <ProcessTitle>
+            <template slot="title">日期选择</template>
+          </ProcessTitle>
+          <el-row>
+            <el-col :span="12">
+              <!-- 发布日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource !== 'FOREIGN_LAWS'" label="发布日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.issueTime"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据标准发布日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else label="发布日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.issueTime"
+                  :editable="false"
+                  placeholder="请选择发布日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 新车型实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="新车型实施日期" class="add-form-item">
+                <el-date-picker
+                  value-format="yyyy-MM-dd"
+                  v-model="sarAccessInfo.XCXSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  placeholder="根据新车型实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="新车型实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.XCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <!-- 实施日期  -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.SSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.SSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable>
+                </el-datePicker>
+              </el-form-item>
+              <!-- 在产车实施日期 -->
+              <el-form-item v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'" label="在产车实施日期" class="add-form-item">
+                <el-date-picker
+                  v-model="sarAccessInfo.ZCCSSRQ"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  placeholder="根据在产车实施日期查找">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" label="在产车实施日期" class="add-form-item">
+                <el-datePicker
+                  v-model="sarAccessInfo.ZCXSSRQLAWS"
+                  :editable="false"
+                  placeholder="请选择实施日期"
+                  value-format="yyyy-MM-dd"
+                  clearable></el-datePicker>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -461,7 +636,7 @@ import CustomDatePickWithText, {formatText} from '@/components/CustomFormCompone
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
-import stand from "../../../config/pages/attributeCustom/components/stand";
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 import {mapGetters} from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
@@ -486,7 +661,8 @@ export default {
     CustomDatePickWithText,
     CustomSVPPS,
     CustomInputForPolicy,
-    CustomRoleTree
+    CustomRoleTree,
+    ProcessTitle
   },
   data() {
     return {
@@ -524,7 +700,7 @@ export default {
           {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ],
         carType: [
-          {required: true,message: '车型类别不能为空', trigger: 'blur'}
+          {required: true, message: '车型类别不能为空', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -536,6 +712,21 @@ export default {
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       syrzOptions: [],
+
+      lawsSycxOptions: [], // 国内外政策适用车型
+      YYRZLAWSOptions: [], // 国内外政策适用认证
+
+      textStatusBussOptions: [],
+
+
+      applySYCX: {
+        attrName: '适用车型',
+        options: []
+      },
+      applySYRZ: {
+        attrName: '适用认证',
+        options: []
+      },
       /** ******************************/
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
@@ -555,34 +746,6 @@ export default {
         {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
-      // 新增、编辑 数据搜索字段
-      sarAccessInfoSearch: {
-        id: '',
-        standName: '',
-        askType: '', // 监管类型
-        syrz: '',
-        typeApplicable: '',
-        dataSource: 'INLAND_STAND', // 数据来源
-        pageNo: 1,
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-        validFlag: 0,
-        advanceSearchVOStr: ''
-      },
-      sarAccessInfo: {
-        id: '',
-        standName: '',
-        standNumber: '',
-        syrz: '',
-        typeApplicable: '',
-        askType: '', // 监管类型
-        dataSource: 'INLAND_STAND', // 数据来源
-        pageNo: 1,
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
-        validFlag: 0,
-        advanceSearchVOStr: ''
-      },
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
       showSelectBox: true, // 显示高级查询 状态
@@ -600,42 +763,6 @@ export default {
       exportTestItemNameFlag: false, // 导出模态框
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
-      defaultAddEntryForm: {
-        sarType: '', // 标准分类
-        code: '', // 标准编号
-        name: '', // 中文名称
-        enName: '', // 英文名称
-        authDelive: '', // 认证交付物
-        authObj: '', // 认证对象
-        authObjId: '', // 认证对象ID
-        authDepart: '', // 认证责任部门
-        authDepartId: '', // 认证责任部门Id
-        energyKind: '', // 能源类型
-        newPutTime: 'N/A', // 新车型实施日期
-        prodPutTime: 'N/A', // 在产车实施日期
-        eopPutTime: 'N/A', // eop实施日期
-        newPutTextTime: '', // 新车型实施日期（项目）
-        prodPutTextTime: '', // 在产车实施日期（项目）
-        eopPutTextTime: '', // eop实施日期（项目）
-        // putTime: '', // 标准实施日期
-        synopsis: '', // 清单说明
-        performInfo: '', // 实施说明
-        ZRBM: '', // 责任部门ID
-        ZRBMName: '', // 责任部门name
-        FOName: '', // FO Name
-        FO: '', // FO id
-        proEssessUser: '', // 项目评估角色name
-        proEssessUserId: '', // 项目评估角色ID
-        nature: '', // 标准性质
-        natureId: '', // 标准性质ID
-        askNature: '', // 监管类型
-        applyArctic: [], // 适用车辆类型
-        XGBMName: '',
-        XGBM: '',
-        askType: '',
-        GXHBQ: [], // 标签
-        accessType: '' // 入库模块
-      },
       // 新增标准法规 验证
       addEntryFormRules: {
         code: [
@@ -691,131 +818,129 @@ export default {
       formFieldList: [],
       orgData: [],
       orgData2: [],
-      sarStandardsInfoEODefault: {
-        accessType: '',
-        id: '',
-        standType: 'INLAND', // 标准分类
-        // country: 'CN', // 适用区域
-        standSort: '', // 标准类别
-        standNumber: '', // 标准编号
-        standYear: '', // 标准年份
-        standName: '', // 中文名称
-        standEnName: '', // 英文名称
-        standState: '', // 标准状态
-        standNature: '', // 标准性质
-        issueTime: '', // 发布日期
-        synopsis: '', // 清单说明
-        lawsNumber: '', // 政策编号
-        lawsName: '', // 中文名称
-        lawsEnName: '', // 英文名称
-        lawsState: '', // 文本状态
-        replaceLawsNum: '' // 代替政策编号
-      },
-      sarStandardsInfoEO: {
-        accessType: '',
-        id: '',
-        standType: 'INLAND', // 标准分类
-        // country: 'CN', // 适用区域
-        standSort: '', // 标准类别
-        standNumber: '', // 标准编号
-        standYear: '', // 标准年份
-        standName: '', // 中文名称
-        standEnName: '', // 英文名称
-        standState: '', // 标准状态
-        standNature: '', // 标准性质
-        issueTime: '', // 发布日期
-        synopsis: '', // 清单说明
-        lawsNumber: '', // 政策编号
-        lawsName: '', // 中文名称
-        lawsEnName: '', // 英文名称
-        lawsState: '', // 文本状态
-        replaceLawsNum: '' // 代替政策编号
-      }, // 入库标准过程中用到的对象
-      defaultAddFormFieldRules: {
-        standSort: [
-          {required: true, message: '标准类别不能为空', trigger: 'change'}
-        ],
-        standNumber: [
-          {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
-          {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
-        ],
-        standYear: [
-          {required: true, message: '标准年份不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
-        ],
-        standName: [
-          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'blur'}
-        ],
-        standEnName: [
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'blur'}
-        ],
-        standState: [
-          {required: true, message: '标准状态不能为空', trigger: 'change'}
-        ],
-        standNature: [
-          {required: true, message: '标准性质不能为空', trigger: 'change'}
-        ],
-        synopsis: [
-          {type: 'string', max: 500, message: '清单说明不能超过500个字符', trigger: 'blur'}
-          // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'} gaoyan 2018-11-07 客户提到特殊符号校验问题
-        ],
-        lawsNumber: [
-          {required: true, message: '政策编号不能为空', trigger: 'change'},
-          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
-        ],
-        lawsName: [
-          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
-        ],
-        lawsEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
-          // { validator: this.verify.valiateEnName, trigger: 'blur' }
-        ],
-        lawsState: [
-          {required: true, message: '文本状态不能为空', trigger: 'change'}
-        ],
-        countryArea: [
-          {required: true, message: '适用区域不能为空', trigger: 'change'}
-        ],
-        replaceLawsNum: [
-          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}
-        ],
-        issueTime: [
-          {required: true, message: '发布日期不能为空', trigger: 'change'}
-        ]
-      },
       formFieldListData: [], // 存储从接口取过来的原始数据
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+
+      // 新增、编辑 数据搜索字段
+      sarAccessInfo: {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      },
+      // 高级查询抽屉
+      showQueryMore: false,
+
+      standLabelNum: '标准号',
+      standLabelName: '标准名称'
     }
   },
-  created() {
-    dicTypeData().then(res => {
-      // 责任部门数据字典
-      this.zrbmOptions = res.data.ZRBMCLASS
-      // 能源类型数据字典
-      this.CycxOptions = res.data.ENERGYTYPES
-      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      // 适用车型数据字典
-      this.applyArcticOptions = res.data.PRODUCTTYPE
-      // 适用产品线数据字典
-      this.sycpxOptions = res.data.SYCPXCLASS
-      //适用认证数据字典
-      this.syrzOptions = res.data.SYRZCLASS
-    })
-  },
   methods: {
     // 高级检索
     selectMoreBtn() {
-      this.showSelectBox = !this.showSelectBox
-      this.showTableFlag = false
+      this.sarAccessInfo.standNumber = ''
+      this.showQueryMore = true
+    },
+    //高级查询的 X
+    cancelQueryInfo() {
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        textStatus: '',
+        CLLX: '',
+        SYRZ: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: this.sarAccessInfo.standType,
+        askType: '', // 监管类型
+        dataSource: this.sarAccessInfo.dataSource, // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
+      this.showQueryMore = false
+    },
+    // 高级查询确认按钮
+    okQueryInfo() {
+      let item = this.sarAccessInfo
+      item.pageSize = this.$store.getters.userInfo.configContent
+      const data = item
+      // this.sarStandardsSearch.menuId = this.selectSarMenu.id
+      const formData = {...data}
+      formData.standType = this.sarAccessInfo.standType
+
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in formData) {
+        const value = formData[key];
+        if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
+        formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
+        formData.issueTime = null
+      } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
+        // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
+        // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
+      }*/
+      this.sarAccessInfo = formData
+      this.showQueryMore = false
       this.selectLawsStands()
     },
     // 法规维护人树
@@ -876,8 +1001,8 @@ export default {
       }
       // 判断上传文件格式
       if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
-          || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
+        || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
+        || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
@@ -908,88 +1033,92 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws() {
-      this.sarAccessInfoSearch.standName = ''
-      this.sarAccessInfo.standName = ''
-      this.sarAccessInfo.standNumber = ''
-      this.sarAccessInfo.typeApplicable = ''
-      this.sarAccessInfo.syrz = ''
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        textStatus: '',
+        CLLX: '',
+        SYRZ: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: this.sarAccessInfo.standType,
+        askType: '', // 监管类型
+        dataSource: this.sarAccessInfo.dataSource, // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       this.isListType = false
       this.selectLawsStands()
     },
     // 数据来源change事件
     dataSourceChange(val) {
       this.isListType = val === 'TEMP'
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
+      this.sarAccessInfo.advanceSearchVOStr = ''
+      this.sarAccessInfo = {
+        id: '',
+        standName: '',
+        standNumber: '',
+        standCode: '', // 政策编号
+        textStatus: '',
+
+        textStatusBuss: '',
+        CLLX: '',
+        SYRZ: '',
+
+        lawsSycx: '',
+        YYRZLAWS: '',
+        // 发布日期
+        issueTime: '',
+        // 实施日期
+        SSRQ: '',
+        SSRQLAWS: '',
+        // 在产车实施日期
+        ZCCSSRQ: '',
+        ZCXSSRQLAWS: '',
+        // 新车型实施日期
+        XCXSSRQ: '',
+        XCXSSRQLAWS: '',
+        //是否纳入认证清单
+        isRelateAccess: '',
+        standType: 'INLAND',
+        askType: '', // 监管类型
+        dataSource: 'INLAND_STAND', // 数据来源
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
+      }
       // 国内标准法规可查字段
       if (val === 'INLAND_STAND') {
+        this.sarAccessInfo.dataSource = 'INLAND_STAND'
         this.selectLawsStands()
         // 海外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
+        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
         this.selectLawsStands()
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
+      } else if (val === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.dataSource = 'FOREIGN_LAWS'
+        this.standLabelNum = '政策编号'
+        this.standLabelName = '中文名称'
+        this.selectLawsStands()
         // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
+      } else {
+        this.sarAccessInfo.dataSource = 'BUSINESS'
+        this.standLabelNum = '企标编号'
+        this.standLabelName = '中文名称'
+        this.selectLawsStands()
       }
     },
     /**
@@ -1003,19 +1132,19 @@ export default {
         //为空转换
         for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
           //适用车型为空
-          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){
+          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]') {
             this.selectedAccInfoSearchList[i].typeApplicable = null
           }
           //能源类型为空
-          if (this.selectedAccInfoSearchList[i].nylx === '[]'){
+          if (this.selectedAccInfoSearchList[i].nylx === '[]') {
             this.selectedAccInfoSearchList[i].nylx = null
           }
           //责任部门为空
-          if (this.selectedAccInfoSearchList[i].zrbm === '[]'){
+          if (this.selectedAccInfoSearchList[i].zrbm === '[]') {
             this.selectedAccInfoSearchList[i].zrbm = null
           }
           //试用产品线为空
-          if (this.selectedAccInfoSearchList[i].sycpx === '[]'){
+          if (this.selectedAccInfoSearchList[i].sycpx === '[]') {
             this.selectedAccInfoSearchList[i].sycpx = null
           }
         }
@@ -1033,43 +1162,67 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
+            this.sarAccessInfoList.forEach(item => {
+              if (item.lawsNumber) {
+                item.standNumber = item.lawsNumber
+              }
+              if (item.standCode) {
+                item.standNumber = item.standCode
+              }
+              this.$set(item, "xcxssrqgj", item.xcxssrq);
+              this.$set(item, "zccssrqgj", item.zccssrq);
+              if (item.attrInfoCaseMap !== undefined) {
+                this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
+                this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
+              }
+              // 能源类型转换
+              if (item.nylx !== null) {
+                let k = (item.nylx || "").split(",");
+                for (let i in this.categoryOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.categoryOptions[i].value === k[m]) {
+                      k[m] = this.categoryOptions[i].label;
+                    }
+                    item.nylx = k.join(",");
+                  }
+                }
+              }
+              // 适用车型转换
+              if (item.typeApplicable !== null) {
+                let k = (item.typeApplicable || "").split(",");
+                for (let i in this.energyKindOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.energyKindOptions[i].value === k[m]) {
+                      k[m] = this.energyKindOptions[i].label;
+                    }
+                    item.typeApplicable = k.join(",");
+                  }
+                }
+              }
+            })
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.sarAccessInfoList.forEach(item => {
+              if (item.nylx === '[]') {
+                item.nylx = ''
+              }
+              if (item.typeApplicable === '[]') {
+                item.typeApplicable = ''
+              }
+              if (item.zrbm === '[]') {
+                item.zrbm = ''
+              }
+              if (item.sycpx === '[]') {
+                item.sycpx = ''
+              }
+            })
           }
         })
-        this.selectedAccInfoSearchList = []
-        this.$refs.entryTable.clearSelection()
-        this.$refs.searchTable.clearSelection()
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }
     },
-    // 上移 事件
-    moveUp(index, row) {
-      if (index === 0) {
-        this.$message({
-          message: '已经是列表中第一个素材！',
-          type: 'warning'
-        })
-      } else {
-        let temp = this.sarAccessInfoList[index - 1]
-        this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
-        this.$set(this.sarAccessInfoList, index, temp)
-      }
-    },
-    moveDown(index) {
-      if (index === (this.sarAccessInfoList.length - 1)) {
-        this.$message({
-          message: '已经是列表中最后一个素材！',
-          type: 'warning'
-        })
-      } else {
-        let i = this.sarAccessInfoList[index + 1]
-        this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
-        this.$set(this.sarAccessInfoList, index, i)
-      }
-    },
     // 点击清单条目导入按钮事件
     importmodalFlags() {
       this.importmodalFlag = true
@@ -1098,7 +1251,7 @@ export default {
           this.sarAccessInfoListArry.map(item => {
             let index
             index = this.sarAccessInfoList.findIndex(items => {
-              return items.id === item
+              return items.id === item.id
             })
             if (index > -1) {
               this.sarAccessInfoList.splice(index, 1)
@@ -1303,17 +1456,17 @@ export default {
 
     // 查询数据搜索 table 数据
     pageInfo() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
-        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage(this.sarAccessInfo).then(res => {
           this.sarAccessInfoSearchList = res.data.list
           //为空转换
           for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
             //适用车型为空
-            if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]') {
               this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
             }
             //适用认证为空
-            if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]') {
               this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
             }
           }
@@ -1332,20 +1485,20 @@ export default {
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
-        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfo, {
           _this: this,
         }, res => {
-          console.log('1640',res)
+          console.log('1640', res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
         })
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
-        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfo, {
           _this: this,
         }, res => {
-          console.log('1648',res)
+          console.log('1648', res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -1354,19 +1507,17 @@ export default {
     },
     //  查询按钮
     selectLawsStands() {
-      this.sarAccessInfoSearch.pageNo = 1
-      this.sarAccessInfoSearch.page = 1
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.standType = 'INLAND'
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfo.standType = 'INLAND'
         this.pageInfo()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
         this.pageInfo()
       }
     },
@@ -1390,17 +1541,17 @@ export default {
     },
     // 高级查询-查询按钮
     selectBtn() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
         this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
-      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
-        this.sarAccessInfoSearch.standType = 'LAWS'
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
         this.pageInfo()
-      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
-        this.sarAccessInfoSearch.standType = 'BUSINESS'
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
         this.pageInfo()
       }
     },
@@ -1420,13 +1571,13 @@ export default {
     // 数据搜索table分页页码改变回调
     drawerPageChange(page) {
       this.drawerPage = page
-      this.sarAccessInfoSearch.page = this.drawerPage
+      this.sarAccessInfo.page = this.drawerPage
       this.selectLawsStands()
     },
 
     // 数据搜索table分页条数改变回调
     drawerPageSizeChange() {
-      this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.sarAccessInfo.pageSize = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
@@ -1551,25 +1702,25 @@ export default {
     // 请求部门结构树
     getOrgTreeSource() {
       this.$http.get('sys/org/getTree', {}, {_this: this},
-          res => {
-            if (res.ok) {
-              let treeNode = []
-              res.data.map((item, index) => {
-                let treeItem = {}
-                for (let key in item) {
-                  if (key === 'orgName') {
-                    treeItem.name = item[key]
-                  } else {
-                    treeItem[key] = item[key]
-                  }
+        res => {
+          if (res.ok) {
+            let treeNode = []
+            res.data.map((item, index) => {
+              let treeItem = {}
+              for (let key in item) {
+                if (key === 'orgName') {
+                  treeItem.name = item[key]
+                } else {
+                  treeItem[key] = item[key]
                 }
-                treeNode[index] = treeItem
-              })
-              this.depNode = treeNode
-              this.depFONode = treeNode
-              this.depRoleNode = treeNode
-            }
-          })
+              }
+              treeNode[index] = treeItem
+            })
+            this.depNode = treeNode
+            this.depFONode = treeNode
+            this.depRoleNode = treeNode
+          }
+        })
     },
     // 新增提交事件
     saveOrUpdateStands() {
@@ -1665,17 +1816,17 @@ export default {
     getAddFormFieldList(ruKu) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
-            res => {
-              if (res.ok) {
-                // const { data: { STAND: data } } = res
-                const {data = {}} = res
-                this.formFieldListData = data[ruKu] || []
-                // this.resolveFormFieldList()
-                resolve()
-              }
-            }, e => {
-              reject(e)
-            })
+          res => {
+            if (res.ok) {
+              // const { data: { STAND: data } } = res
+              const {data = {}} = res
+              this.formFieldListData = data[ruKu] || []
+              // this.resolveFormFieldList()
+              resolve()
+            }
+          }, e => {
+            reject(e)
+          })
       })
     },
     resolveFormFieldList(isEdit) {
@@ -1727,7 +1878,7 @@ export default {
         name: routerName,
         params: {
           id: data.id,
-          pageType: this.sarAccessInfoSearch.dataSource
+          pageType: this.sarAccessInfo.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1834,19 +1985,19 @@ export default {
         //为空转换
         for (let i = 0; i < this.sarAccessInfoList.length; i++) {
           //适用车型为空
-          if (this.sarAccessInfoList[i].typeApplicable === '[]'){
+          if (this.sarAccessInfoList[i].typeApplicable === '[]') {
             this.sarAccessInfoList[i].typeApplicable = null
           }
           //能源类型为空
-          if (this.sarAccessInfoList[i].nylx === '[]'){
+          if (this.sarAccessInfoList[i].nylx === '[]') {
             this.sarAccessInfoList[i].nylx = null
           }
           //责任部门为空
-          if (this.sarAccessInfoList[i].zrbm === '[]'){
+          if (this.sarAccessInfoList[i].zrbm === '[]') {
             this.sarAccessInfoList[i].zrbm = null
           }
           //试用产品线为空
-          if (this.sarAccessInfoList[i].sycpx === '[]'){
+          if (this.sarAccessInfoList[i].sycpx === '[]') {
             this.sarAccessInfoList[i].sycpx = null
           }
         }
@@ -1854,7 +2005,7 @@ export default {
         this.sarAccessInfoList.forEach(item => {
           if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else if (item.standYear !== null && item.standType !== null){
+          } else if (item.standYear !== null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
@@ -1880,7 +2031,7 @@ export default {
     // 监听 清单类型
     isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
-      this.sarAccessInfoSearch.page = 1
+      this.sarAccessInfo.page = 1
       this.drawerTotal = 0
       this.selectedAccInfoSearchList = []
       this.accessSarTypeList = []
@@ -1894,32 +2045,55 @@ export default {
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     //this.getData()
-    this.getDept()
+    // this.getDept()
     // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.allSelectOptions = res.data || {}
-      this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
-      this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
-      this.CycxOptions = res.data.ENERGYTYPES // 能源种类list
-      this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
-      this.applyOptions = res.data.COUNTRY  //适用区域list
-      this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
-      this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standStateOptions = res.data.STANDSTATE // 标准状态
-      this.ROLELIST = res.data.ROLELIST
-      this.GXHBQOptions = res.data.GXHBQXX
-      this.askNatureOptions = res.data.ACCESSTYPE
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.setMap(this.textStatusOptions)
-      this.getGzzOption()
-    }, e => {
+    dicTypeData().then(res => {
+      if (res.ok) {
+        this.allSelectOptions = res.data || {}
+        // this.regionOptions = res.data.REGION // 基础信息 区域list
+        this.applyArcticOptions = res.data.NYLXCLASS // 能源类型
+        this.energyKindOptions = res.data.ENERGYTYPES // 适用车型
+        // this.CycxOptions = res.data.CLLX
+        this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
+        this.applyOptions = res.data.COUNTRY  //适用区域list
+        this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
+        this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standStateOptions = res.data.STANDSTATE // 标准状态
+        this.ROLELIST = res.data.ROLELIST
+        this.GXHBQOptions = res.data.GXHBQXX
+        this.askNatureOptions = res.data.ACCESSTYPE
+        // this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.textStatusOptions = res.data.WBZTCLASS
+        // this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+
+        this.lawsSycxOptions = res.data.lawsSycx // 国内外政策适用车型
+        this.YYRZLAWSOptions = res.data.YYRZLAWS // 国内外政策适用认证
+
+
+        // 责任部门数据字典
+        this.zrbmOptions = res.data.ZRBMCLASS
+        // 能源类型数据字典
+        this.CycxOptions = res.data.CLLX
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        // 适用车型数据字典
+        this.applyArcticOptions = res.data.PRODUCTTYPE
+        // 适用产品线数据字典
+        this.sycpxOptions = res.data.SYCPXCLASS
+        // 适用认证
+        this.applySYRZ.options = res.data.SYRZCLASS
+        // 适用车型
+        this.applySYCX.options = res.data.ENERGYTYPES
+
+        // 企标文本状态
+        this.textStatusBussOptions = res.data.BUSSSTATE
+
+        this.setMap(this.textStatusOptions)
+        this.setMap(this.drawerCountryOptions)
+        this.setMap(this.categoryOptions)
+        this.getGzzOption()
+      }
     })
     this.getOrgTreeSource()
     // 判断是否是编辑
@@ -1934,7 +2108,7 @@ export default {
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
-        this.sarAccessInfoSearch.validFlag = 0
+        this.sarAccessInfo.validFlag = 0
         this.getFileInfo()
         this.getData()
         this.selectLawsStands()
@@ -2005,7 +2179,8 @@ export default {
     background: #ffffff;
     text-align: right;
   }
-  /deep/.el-date-editor.el-input {
+
+  /deep/ .el-date-editor.el-input {
     width: 100%;
   }
 }