diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index dd39e4bc6..e8aee574a 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -264,6 +264,11 @@ export default {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
+        res.data.list.map(item => {
+          if (!item.issueTime) {
+            item.issueTime = ''
+          }
+        })
         this.replaceLawsNumRow = res.data.list
         this.replaceTotal = res.data.count
         if (this.selectedListRep.length !== 0) {
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 64278485c..9cbdc4d10 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -25,7 +25,7 @@
         style="position:absolute;top: 10px;right: 0;"
         @click="selectLaws"
         v-if="(processModel && !disabled) || !processModel"
-      >手动查找</el-button>
+      >手动查找123</el-button>
     </el-form-item>
     <el-dialog
       :title="config.attrName"
@@ -258,6 +258,11 @@ export default {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
+        res.data.list.map(item => {
+          if (!item.issueTime) {
+            item.issueTime = ''
+          }
+        })
         this.replaceLawsNumRow = res.data.list
         this.replaceTotal = res.data.count
         if (this.selectedListRep.length !== 0) {
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 04d43a5e0..87d126f6c 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -619,7 +619,10 @@ export default {
     },
     getTree3(res,json) {
       return new Promise((resolve, reject) => {
-        this.$http.get('sarResource/ts-resource/getListStand', {}, {
+        this.$http.get('sarResource/ts-resource/getListStand', {
+          sorDivide: 'BUSINESS_STAND',
+          userId: this.$store.getters.userInfo.userId
+        }, {
           _this: this
         }, res => {
           const history = res;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8e22d49a5..c2410f783 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1096,6 +1096,7 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
       this.showTableFlag = false
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index af8bb3d17..d5a8ab8c0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -195,7 +195,7 @@
             label="适用产品线">
           </el-table-column>
         </el-table>
-        <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
+        <pagination :page="page" :total="total" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
@@ -235,91 +235,216 @@
       </div>
     </el-dialog>
 
+    <!--高级查询抽屉-->
     <el-drawer
-      title="高级搜索"
-      size="700px"
+      title="高级查询"
+      :before-close='cancelQueryInfo'
+      :visible.sync="showQueryMore"
       :wrapperClosable="false"
-      :visible.sync="isAdvancedSearch">
-      <div class="demo-drawer-content">
-        <el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
-          <el-form-item label="中文名称">
-            <el-input
-              class="showBox"
-              v-model="standardFormList.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item label="适用车型">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.typeApplicable"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in applyArcticOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="能源类型">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.nylx"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in categoryOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="责任部门">
-            <el-input
-              v-model="standardForm.zrbm"
-              placeholder="请输入责任部门"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="适用产品线">
-            <el-select
-              class="showBox"
-              v-model="standardFormList.sycpx"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in sycpxOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
+      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="small"
-          icon="el-icon-check"
-          type="primary"
-          @click="queryInfo">搜索
-        </el-button>
-        <el-button
-          size="small"
-          icon="el-icon-close"
-          @click="backInfo">取消
-        </el-button>
+        <el-button size="mini" @click="cancelQueryInfo">取消</el-button>
+        <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
       </div>
     </el-drawer>
 
@@ -329,12 +454,33 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
+import { StandardsInfoPage } from "api/unqualProcess";
 
 export default {
   name: "AccessStandardDetails",
+  components:{
+    ProcessTitle,
+    CustomSelectArray
+  },
   data() {
     return {
-      isAdvancedSearch: false,
+      showQueryMore: false,
+      textStatusBussOptions: [],
+      textStatusOptions: [],
+      lawsSycxOptions: [], // 国内外政策适用车型
+      YYRZLAWSOptions: [], // 国内外政策适用认证
+      applySYCX: {
+        attrName: '适用车型',
+        options: []
+      },
+      applySYRZ: {
+        attrName: '适用认证',
+        options: []
+      },
+      standLabelNum: '标准号',
+      standLabelName: '标准名称',
       // 高级检索状态
       showSelectBox: true,
       textStatusMap: {},
@@ -367,19 +513,43 @@ export default {
         page: 1,
         Size: this.$store.getters.userInfo.configContent
       },
-      standardFormList: {
-        zrbm: "",
-        typeApplicable: "",
-        nylx: "",
-        sycpx: "",
-        standNumber: "",
-        standName: "",
-        responseUnit: "",
+      // 新增、编辑 数据搜索字段
+      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,
-        Size: this.$store.getters.userInfo.configContent
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0,
+        advanceSearchVOStr: []
       },
       page: 1,
-      // pageSize: this.$store.getters.userInfo.configContent,
+      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       stateList: [], // 标准状态列表
       activeName: "SKILL", // 当前激活
@@ -407,6 +577,130 @@ export default {
     };
   },
   methods: {
+//高级查询的 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()
+    },
+    // 查询数据搜索 table 数据
+    selectLawsStands() {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfo.standType = 'INLAND'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfo.standType = 'FOREIGN'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfo.standType = 'LAWS'
+        this.pageInfo()
+      } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.sarAccessInfo.standType = 'BUSINESS'
+        this.pageInfo()
+      }
+    },
+    pageInfo() {
+      if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage((this.sarAccessInfo)).then(res => {
+          this.standinfoList = res.data.list
+          this.standinfoList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
+            } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            }
+            item.zrbm = item.attrInfoCaseMap.zrbm
+            item.sycpx = item.attrInfoCaseMap.sycpx
+            item.typeApplicable = item.attrInfoMap.CLLX
+            item.nylx = item.attrInfoMap.NYLX
+          })
+          this.total = res.data.count
+        }, e => {
+        })
+      } 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.sarAccessInfo.dataSource === 'BUSINESS') {
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfo, {
+          _this: this,
+        }, res => {
+          this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
+        }, e => {
+        })
+      }
+    },
     // 更新LOG关闭
     relateDialogClose() {
       this.relateDialog = false;
@@ -489,6 +783,7 @@ export default {
             this.standInfoTableLoading = false
           } else {
             this.standinfoList = []
+            this.standInfoTableLoading = false
           }
 
         }, e => {
@@ -778,13 +1073,8 @@ export default {
       this.standardForm.responseUnit = ''
       this.standardForm.standName = ''
       this.standardForm.standNumber = ''
-      this.standardFormList.standName = "";
-      this.standardFormList.typeApplicable = "";
-      this.standardFormList.nylx = "";
-      this.standardFormList.zrbm = "";
-      this.standardFormList.sycpx = "";
       this.showTableFlag = false;
-      this.isAdvancedSearch = true;
+      this.showQueryMore = true;
       this.page = 1;
       this.standardForm.page = 1;
       this.selectInfoMore();
@@ -862,7 +1152,6 @@ export default {
     }, res => {
       this.allSelectOptions = res.data || {};
       this.regionOptions = res.data.REGION; // 基础信息 区域list
-      this.applyArcticOptions = res.data.ENERGYTYPES || []; // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || []; // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY; // 国家、地区list
       this.standNatureOptions = res.data.SARPROPERTY; // 新增 标准性质
@@ -874,8 +1163,16 @@ export default {
       this.askNatureOptions = res.data.ACCESSTYPE;
       this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
       this.categoryOptions = res.data.NYLXCLASS; // 能源类型
-      this.textStatusOptions = res.data.WBZTCLASS;
+      this.textStatusOptions = res.data.WBZTCLASS;  // 文本状态
       this.sycpxOptions = res.data.SYCPXCLASS; // 适用产品线
+      this.lawsSycxOptions = res.data.lawsSycx // 国内外政策适用车型
+      this.YYRZLAWSOptions = res.data.YYRZLAWS // 国内外政策适用认证
+      // 企标文本状态
+      this.textStatusBussOptions = res.data.BUSSSTATE
+      // 适用车型
+      this.applySYCX.options = res.data.ENERGYTYPES
+      // 适用认证
+      this.applySYRZ.options = res.data.SYRZCLASS
       this.setMap(this.textStatusOptions);
       this.getGzzOption();
     }, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 685f9298c..4a5c39932 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1029,6 +1029,7 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands() {
       this.showTableFlag = false
+      this.sarAccessInfo.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3b6853fbf..73276c2ff 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -472,8 +472,7 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                              prop="textStatus" label-width="150px" class="add-form-item">
+                <el-form-item prop="textStatus" label-width="150px" class="add-form-item">
                   <template slot="label">文本状态</template>
                   <el-select v-model="sarStandardsInfoEO.textStatus"
                              placeholder="请选择文本状态"
@@ -698,7 +697,7 @@
                       :config="field"
                       v-if="field.attrField !== 'BDTBZBH'"
                       v-model="sarStandardsInfoEO[field.attrField]"
-                      :disabled="formdisableflag"
+                      :disabled="true"
                     ></custom-input>
                   </template>
                 </template>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 0e75f5284..fe54a058c 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2380,6 +2380,36 @@ export default {
     }
   },
   methods: {
+    async getTreeAsync(){
+
+      let tsResource = await this.selectMenuList()
+      let sarMenuStandard = await this.selectMenu2()
+
+      let list1 = []
+      let list2 = []
+      if(tsResource && tsResource.ok && tsResource.data){
+        list1 = tsResource.data
+      }
+
+      if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
+        list2 = sarMenuStandard.data
+      }
+
+      if(list2.length > 0){
+        list1 = list1.concat(list2)
+      }
+
+      if(list1.length > 0){
+        this.treeList = this.sortByKey(list1,"displaySeq")
+      }
+    },
+    sortByKey(ary, key) {
+      return ary.sort(function (a, b) {
+        let x = a[key]
+        let y = b[key]
+        return ((x < y) ? -1 : (x > y) ? 1 : 0)
+      })
+    },
     formatIssueDate(str) {
         if(str && str.length > 10){
           str = str.substring(0,10)
@@ -2729,13 +2759,26 @@ export default {
     },
     // 查询二级菜单
     selectMenuList() {
-      this.$http.get('sarResource/ts-resource/getList', {
-        sorDivide: 'BUSINESS_STAND',
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.ok) {
-          this.treeList = res.data
-        }
+      return new Promise((resolve, reject) => {
+        this.$http.get('sarResource/ts-resource/getListStand',  {
+          sorDivide: 'BUSINESS_STAND',
+          userId: this.$store.getters.userInfo.userId
+        }, {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
+    selectMenu2(res,json) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
       })
     },
     // 查询二级菜单
@@ -3132,6 +3175,7 @@ export default {
     saveConfigStand() {
       let search = {}
       search.menuId = this.selectSarMenu.id
+      search.treeType = this.selectSarMenu.treeType
       if (this.selectConfigStand.length === 0) {
         this.$message({
           showClose: true,
@@ -3840,7 +3884,21 @@ export default {
               this.$message.error('请选择二级及以下目录')
             } else {
               this.configStandFlag = true
-              this.sarConfigStandSearch.menuId = 'nomenu'
+              if(this.selectSarMenu.treeType === 'sarMs'){
+                this.sarConfigStandSearch.menuId = 'nomenu'
+                this.sarConfigStandSearch.sarMsMenuId = menuId
+                this.sarConfigStandSearch.sarMsType = 'filterSarMsMenu'
+                let sarMenu = this.selectSarMenu.parentIds.split(",");
+                this.sarConfigStandSearch.menuTopId = sarMenu[0]
+                // if(this.selectSarMenu.parentId === sarMenu[0]){
+                //   this.sarConfigStandSearch.menuTopId = this.selectSarMenu.id
+                // }else {
+                //   this.sarConfigStandSearch.menuTopId = sarMenu[1]
+                // }
+              }else {
+                this.sarConfigStandSearch.menuId = 'nomenu'
+                this.sarConfigStandSearch.sarMsType = ''
+              }
               this.sarConfigStandSearch.page = 1
               this.selectConfiguraStand()
             }
@@ -3873,6 +3931,7 @@ export default {
             let search = {}
             // 取最外层目录id
             search.menuId = this.selectSarMenu.id
+            search.treeType = this.selectSarMenu.treeType
             // search.menuId = this.removeOneId
             search.idlist = []
             // search.menuId = this.removeOneId
@@ -4028,9 +4087,12 @@ export default {
       return data.menuName.indexOf(value) !== -1;
     },
     treeClick(treeNode) {
+      console.log(treeNode)
       this.selectSarMenu = treeNode // 记录当前选中的二级菜单
       this.sarBussionessSearch.menuId = treeNode.id
       this.sarBussionessSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
+      this.standCommonlySearch.treeType = treeNode.treeType
+      this.sarBussionessSearch.treeType = treeNode.treeType
       this.sarBussionessSearch.page = 1
       this.sarBussionessSearch.page = 1
       this.getBussionStandTable(this.tableFlag) // 根据选中的二级菜单查询对应的标准列表
@@ -4191,12 +4253,16 @@ export default {
       this.sarBussionessSearch.pageSize = this.$store.getters.userInfo.configContent
       const data = item || this.sarBussionessSearch
       const formData = {...data}
+      console.log(item)
+      debugger
       if (!item) {
         formData.menuId = this.sarBussionessSearch.menuId
+        formData.treeType = this.sarBussionessSearch.treeType
       } else {
         formData.menuId = this.selectSarMenu.id
+        formData.treeType = this.selectSarMenu.treeType
       }
-      if (nodeId !== undefined) {
+      if (nodeId !== undefined && nodeId !== '') {
         formData.menuId = nodeId
       }
       if (this.sarBussionessSearch.menuId == null || this.sarBussionessSearch.menuId === '') {
@@ -4897,7 +4963,7 @@ export default {
   mounted() {
     this.treeReload = true
     // 进入页面后查询树形结构目录
-    this.selectMenuList()
+    this.getTreeAsync()
     this.dragControllerLR()
     // 查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index b6cc16f7f..4f1fec128 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1145,6 +1145,7 @@
             },
             addDrawerClose () {
                 this.addDrawer = false
+                this.LXDList = []
             },
             addData () {
                 this.addDrawerTitle = '新增'
@@ -1285,7 +1286,6 @@
                         }
                         this.addForm.LXDName = fileName1
                         this.LXDList=this.assemble(command[0].lxd,fileName1)
-                        console.log(this.LXDList)
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }
@@ -1327,7 +1327,6 @@
                         }
                         this.addForm.LXDName = fileName
                         this.LXDList=this.assemble(command[0].lxd,fileName);
-                        console.log(this.LXDList)
                         if (typeof (this.addForm.area) === 'string') {
                             this.addForm.area = command[0].area.split(',')
                         }
@@ -1336,12 +1335,13 @@
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
                 let nameArray=names.split(',');
-                for(let i=0; i<idArray.length; i++){
-                    list.push({id:idArray[i],name:nameArray[i]});
+                if (ids) {
+                    let idArray=ids.split(',');
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getData () {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c655a3f20..b113497db 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -971,8 +971,7 @@
                                     </el-option>
                                   </el-select>
                                 </el-form-item>-->
-                <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                              prop="standState" label-width="150px" class="add-form-item">
+                <el-form-item prop="standState" label-width="150px" class="add-form-item">
                   <template slot="label">文本状态</template>
                   <el-select v-model="sarStandardsInfoEO.textStatus"
                              placeholder="请选择文本状态"
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 0e0a09b4f..b84c9949b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -3,11 +3,11 @@
   <div id="listOfCountries" class="local-products-or-project-library v-class">
     <div class="search-area">
       <div class="left">
-        <el-form inline :model="localProTableSearch" class="label-input-form"
+        <el-form inline :model="projectLibrarySearch" class="label-input-form"
                  @keyup.enter.native="getLocalProductTableBtns">
           <el-form-item label="项目编号" class="search-item">
             <el-input
-              v-model="localProTableSearch.projectNumber"
+              v-model="projectLibrarySearch.projectNumber"
               placeholder="根据项目编号查找"
               :maxlength="100"
               clearable
@@ -473,6 +473,8 @@ export default {
        },*/
       //查询3类
       projectLibrarySearch: {
+        //项目编号
+        projectNumber: "",
         // 项目名称
         projectName: "",
         // 项目分类
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 7f0b3b962..c7809efbe 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -144,6 +144,7 @@
               <div class="table-jump" @click="changeState(scope.row)">
                 <div v-if="scope.row.unCount === 0">符合</div>
                 <div v-if="scope.row.unCount === 1">不符合</div>
+                <div v-if="scope.row.unCount === '-1'">不涉及</div>
                 <div v-else ></div>
               </div>
             </template>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 4e6e3b464..68cc08b59 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -191,6 +191,7 @@
 <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
                 <div class="table-jump" @click="changeState(scope.row)">
                   <div v-if="scope.row.unCount === '0'">符合</div>
+                  <div v-if="scope.row.unCount === '-1'">不涉及</div>
                   <div v-else >不符合</div>
                 </div>
               </template>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index f36e327c4..c9933b533 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -1266,7 +1266,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
+          id: item.standId,
           pageType: "INLAND_STAND"
         }
       });