Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/otherLawsStandDetails/index.vue

@@ -149,8 +149,8 @@
                             :key="fileIndex"
                     >
                       <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                      <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
-                      <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
+                      <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="''"/>
+                      <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="''"/>
                       <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                     </p>
                     <!--                <el-button-->

src/pages/localTool/standAutoSplit/index.vue

@@ -29,7 +29,7 @@
     <div class="content">
       <div class="action-bar">
         <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
-        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-button>
+        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'e214975dcab66d2e27bf2ed9897f521c'">删除</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">

src/pages/localTool/standardWarning.vue

@@ -43,6 +43,7 @@
                   <el-button
                     type="primary"
                     size="mini"
+                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
                     @click="searchBtnClick"
                     class="common-button-primary">
                     查询
@@ -50,6 +51,7 @@
                   <el-button
                     size="mini"
                     @click="clearBtnClick"
+                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
                     class="common-button-primary">
                     清空
                   </el-button>

src/pages/personal/pages/my-collection/components/CollectionLaws.vue

@@ -15,18 +15,17 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 :loading="searching"
-                icon="el-icon-search"
+                v-btn-permission="'1044adc0569438df582585db349f2cde'"
                 type="primary"
                 class="common-button-primary"
-                round
                 @click="selectLawsBtn">
+                查询
               </el-button>
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
-                round
-                @click="resetSelect"></el-button>
-              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>
+                v-btn-permission="'3b4223ab22aa24b8332c3d27f1e7fe32'"
+                @click="resetSelect">清空</el-button>
+<!--              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
             </el-form-item>
           </el-form>
         </div>
@@ -53,7 +52,7 @@
                 <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="''">{{$t('m.cancelCollection')}}</el-button>
+                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2"  @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button>
 <!--                <el-button size="mini"  style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
               </el-col>
             </el-row>

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -15,17 +15,18 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 :loading="searching"
-                icon="el-icon-search"
                 type="primary"
                 class="common-button-primary"
                 size="mini"
+                v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'"
                 @click="selectStandardBtn">
+                查询
               </el-button>
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
                 size="mini"
-                @click="resetSelect"></el-button>
+                v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'"
+                @click="resetSelect">清空</el-button>
 <!--              <el-button-->
 <!--                      class="common-button-default"-->
 <!--                      size="mini"-->
@@ -62,7 +63,7 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+                <el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>

src/pages/processCenter/pages/newProcess/index.vue

@@ -127,7 +127,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8" v-btn-permission="'9d3775db9a76f37402e3e49f3e55e77e'">
+        <el-col :span="size ? 6 : 8" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -88,7 +88,7 @@
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+          <el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" @click="selectMoreBtn">
             <i class="iconfont">&#xe7a5;</i>
             高级查询
           </el-button>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -113,7 +113,7 @@
                     @click="clearAllSearch('standCommonlySearch')">清空
                   </el-button>
                   <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
-                    <i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询
+                    <i class="iconfont" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'">&#xe7a5;</i>高级查询
                   </el-button>
                 </el-form-item>
               </el-form>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="wx-custom-tab">
     <el-tabs v-model="tabValue" style="height: 100%;">
-      <el-tab-pane label="项目评估结果" name="standInvolveProjectDetail">
+      <el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <stand-involve-project-detail v-if="tabValue === 'standInvolveProjectDetail'"></stand-involve-project-detail>
+          <stand-involve-project-detail ></stand-involve-project-detail>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="技术评估结果" name="technologyInvolveProject">
+      <el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <technology-involve-project v-if="tabValue === 'technologyInvolveProject'"></technology-involve-project>
+          <technology-involve-project ></technology-involve-project>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -28,11 +28,38 @@ export default {
   },
   data () {
     return {
-      tabValue: 'standInvolveProjectDetail'
+      skill: false,
+      project: false,
+      tabValue: '',
+      menuName: [ "项目评估结果", "技术评估结果"]
     }
   },
   methods: {},
   mounted () {
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["d64fe4a4d794921885a96c1daf5c3802", "e81f9857997cba2f5faa439201a13085"];
+    this.menuName.forEach(item => {
+      for (let i = 0; i < menuList.length; i++) {
+        let entity = menuList[i];
+        if (item != entity.menuName) continue;
+        if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
+          menuData.push(entity.id);
+          if (entity.id === "d64fe4a4d794921885a96c1daf5c3802") {
+            this.project = true
+          } else if (entity.id === "e81f9857997cba2f5faa439201a13085") {
+            this.skill = true
+          }
+        }
+      }
+    });
+    if(this.skill === true){
+      this.tabValue = "technologyInvolveProject"
+      return;
+    }else if(this.project === true){
+      this.tabValue = "standInvolveProjectDetail"
+      return;
+    }
   }
 }
 </script>

src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue

@@ -3,189 +3,221 @@
   <div id="business-division">
     <div class="search-area">
       <div class="content-top">
-        <el-form :modal="nonConformitySearch" inline class="label-input-form">
+        <el-form :modal="sarSarAccessEOSearch" inline class="label-input-form">
           <el-form-item label="编号/名称" class="search-item">
-            <el-input v-model="nonConformitySearch.standNumOrName"
+            <el-input v-model="sarSarAccessEOSearch.lawNumOrName"
+                      placeholder="请输入"
+                      clearable
+                      @change="lawNumOrNameKeyup"
+                      @keyup.enter.native="searchSarAccessBtn"
+                      :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="产品类型" class="search-item">
+            <el-input v-model="sarSarAccessEOSearch.productType"
+                      @keyup.enter.native="searchSarAccessBtn"
                       placeholder="请输入"
                       clearable
                       :maxlength="100"></el-input>
           </el-form-item>
-          <el-form-item label="产品类型" class="search-item">
-            <el-select filterable clearable v-model="nonConformitySearch.productName">
-              <el-option v-for="item1 in productNameList"
-                         :key="item1.value"
-                         :label="item1.label"
-                         :value="item1.value"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="nonConformitySearch.responseUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-input v-model="sarSarAccessEOSearch.responseDept"
+                      @keyup.enter.native="searchSarAccessBtn"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
           </el-form-item>
+          <!--          <el-form-item label="产品类型" class="search-item">-->
+          <!--            <el-select filterable clearable v-model="sarSarAccessEOSearch.productType">-->
+          <!--              <el-option v-for="item1 in productNameList"-->
+          <!--                         :key="item1.value"-->
+          <!--                         :label="item1.label"-->
+          <!--                         :value="item1.value"></el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="责任部门" class="search-item">-->
+          <!--            <el-input v-model="sarSarAccessEOSearch.responseDept" v-show="false" />-->
+          <!--            <el-popover-->
+          <!--              placement="bottom"-->
+          <!--              popper-class="user-dept-popper"-->
+          <!--              trigger="click"-->
+          <!--              :value="false"-->
+          <!--            >-->
+          <!--              <el-input-->
+          <!--                slot="reference"-->
+          <!--                v-model="sarSarAccessEOSearch.responseDeptShow"-->
+          <!--                placeholder="根据责任部门查找"-->
+          <!--                readonly-->
+          <!--                clearable-->
+          <!--                id="searchResp"-->
+          <!--              />-->
+          <!--              <div class="api">-->
+          <!--                <laws-tree-->
+          <!--                  :zNodes="zNodesSItem"-->
+          <!--                  treeDivId="zNodesSItemSearch"-->
+          <!--                  deptSelect-->
+          <!--                  showRMenu-->
+          <!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+          <!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+          <!--                </laws-tree>-->
+          <!--              </div>-->
+          <!--            </el-popover>-->
+          <!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
-              type="primary"
-              class="common-button-primary"
-              size="mini"
-              v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
-              @click="getTableByPage('')">
+                type="primary"
+                class="common-button-primary"
+                size="mini"
+                v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
+                @click="searchSarAccessBtn('')">
               查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              class="common-button-default"
-              size="mini"
-              v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
-              @click="clearAllSearch">清空</el-button>
+                class="common-button-default"
+                size="mini"
+                v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
+                @click="clearAllSearch">清空
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
     </div>
     <div class="content-center">
       <el-button
-        class="common-button-primary"
-        type="primary"
-        size="mini"
-        v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
-        title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-      ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+          class="common-button-primary"
+          type="primary"
+          size="mini"
+          v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
+          title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+      ><i class="iconfont">&#xe6e9;</i>导出
+      </el-button>
       <el-button
-        @click="userCloAll"
-        class="common-button-primary"
-        type="primary"
-        size="mini"
-        v-btn-permission="'fde586188a364382cf67a0efa62a586c'"
-      ><i class="iconfont">&#xe61b;</i>批量关闭</el-button>
+          @click="userCloAll"
+          class="common-button-primary"
+          type="primary"
+          size="mini"
+          v-btn-permission="'fde586188a364382cf67a0efa62a586c'"
+      ><i class="iconfont">&#xe61b;</i>批量关闭
+      </el-button>
       <el-button
-        class="common-button-primary"
-        size="mini"
-        type="primary"
-        v-btn-permission="'9b68b46455c5af042d430e05e6579b27'"
-        @click="historyClick"
-        style="float: right; margin-right: 10px"
-      >历史数据</el-button>
+          class="common-button-primary"
+          size="mini"
+          type="primary"
+          v-btn-permission="'9b68b46455c5af042d430e05e6579b27'"
+          @click="historyClick"
+          style="float: right; margin-right: 10px"
+      >历史数据
+      </el-button>
     </div>
     <div class="container">
       <loading :loading="loading">数据获取中....</loading>
       <div class="table-wrap">
         <div class="inner-wrap">
           <el-table
-            :data="causeList"
-            tooltip-effect="dark"
-            style="width: 100%;"
-            height="100%"
-            border
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%;"
+              height="100%"
+              border
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           >
             <el-table-column
-              type="selection"
-              width="55"
-              fixed="left"
-              align="center">
+                type="selection"
+                width="55"
+                fixed="left"
+                align="center">
             </el-table-column>
             <el-table-column
-              prop="standNum"
-              fixed="left"
-              width="180"
-              label="标准编号">
+                prop="lawNumber"
+                fixed="left"
+                width="180"
+                label="标准编号/政策编号">
               <template slot-scope="scope">
-                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
+                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.lawNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column
-              prop="standName"
-              fixed="left"
-              width="180"
-              label="标准名称">
+                prop="lawName"
+                fixed="left"
+                width="180"
+                label="标准名称/政策名称">
               <template slot-scope="scope">
-                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.lawName }}</a>
               </template>
             </el-table-column>
             <el-table-column
-              prop="productNameShow"
-              width="180"
-              label="产品线">
+                prop="productType"
+                width="180"
+                label="产品类型">
             </el-table-column>
             <el-table-column
-              prop="productNameShow"
-              width="180"
-              label="项目名称">
+                prop="implTime"
+                width="180"
+                sortable="custom"
+                label="实施时间">
             </el-table-column>
             <el-table-column
-              prop="productNameShow"
-              width="180"
-              label="当前节点">
+                prop="implRequire"
+                width="180"
+                label="实施要求">
             </el-table-column>
             <el-table-column
-              prop="responseUnitShow"
-              width="180"
-              label="责任部门">
+                prop="conformSituation"
+                width="180"
+                label="资源符合情况">
             </el-table-column>
             <el-table-column
-              prop="responseEnginShow"
-              width="150"
-              label="责任工程师">
+                prop="devScheme"
+                width="150"
+                label="开发计划">
             </el-table-column>
             <el-table-column
-              prop="responseEnginShow"
-              width="150"
-              label="认证工程师">
+                prop="responseDept"
+                width="150"
+                label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="responseEnginShow"
-              width="150"
-              label="质量工程师">
+                prop="responsePeople"
+                width="150"
+                label="责任人">
             </el-table-column>
             <el-table-column
-              prop="planCloseTime"
-              width="150"
-              sortable="custom"
-              label="要求关闭时间">
-              <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>
+                prop="sopTime"
+                width="150"
+                sortable="custom"
+                label="SOP时间">
+              <!--              <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>-->
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
-              <template slot-scope="scope">
-                <div @click.stop style="display: inline-block">
-                  <el-dropdown trigger="click" @command="handleCommand">
-                    <i class="iconfont">&#xe61e;</i>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'887ec926ad9a2b85395159db38885d96'">查看</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </div>
-              </template>
+            <el-table-column
+                prop="completeSituation"
+                width="150"
+                label="完成情况">
             </el-table-column>
+            <el-table-column
+                prop="timeoutSituation"
+                width="150"
+                label="SOP时间超过法规时限的空档期的业务应对方案">
+            </el-table-column>
+            <!--            <el-table-column label="操作" align="center" width="50" fixed="right">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <div @click.stop style="display: inline-block">-->
+            <!--                  <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                    <i class="iconfont">&#xe61e;</i>-->
+            <!--                    <el-dropdown-menu slot="dropdown">-->
+            <!--                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'887ec926ad9a2b85395159db38885d96'">查看</el-dropdown-item>-->
+            <!--                    </el-dropdown-menu>-->
+            <!--                  </el-dropdown>-->
+            <!--                </div>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
           </el-table>
         </div>
       </div>
       <div class="footer">
-        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
+                    @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
   </div>
@@ -196,16 +228,29 @@ export default {
   name: "businessDivision",
   data() {
     return {
+      sarAccessListTotal: 0,
+      sarAccessListDatas: [],
+      // 查询相关参数
+      sarSarAccessEOSearch: {
+        lawNumOrName: '', // 编号/名称
+        productType: '', // 产品类型
+        responseDept: '', // 责任部门
+        lawNumber: '',
+        lawName: '',
+        accessContent: '',
+        energyKind: '',
+        applyArctic: '',
+        region: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0
+      },
       loading: false,
-      // 总数
-      total: 0,
-      // 当前页数
-      pageNo: 1,
       causeList: [], //事业部数据
       nonConformitySearch: {
         standNumOrName: '', // 编号/名称
         productName: '', // 产品类型
-        responseUnit: '' // 责任部门
+        responseDept: '' // 责任部门
       },
       // 产品类型下拉列表数据
       productNameList: [],
@@ -213,26 +258,41 @@ export default {
     }
   },
   methods: {
+    lawNumOrNameKeyup() {
+      this.sarSarAccessEOSearch.lawName = this.sarSarAccessEOSearch.lawNumOrName
+      this.sarSarAccessEOSearch.lawNumber = this.sarSarAccessEOSearch.lawNumOrName
+    },
     //点击批量关闭按钮事件
     userCloAll() {
       console.log('至少选择一条数据');
     },
     //点击历史数据按钮事件
-    historyClick (){
-       this.$router.push({
-         name:'BusinessDetails'
-       })
+    historyClick() {
+      this.$router.push({
+        name: 'BusinessDetails'
+      })
     },
     // 清空 查询条件
-    clearAllSearch (search = true) {
-      this.nonConformitySearch = {
-        standNumOrName: '',
-        productName: '',
-        responseUnit: ''
+    clearAllSearch(search = true) {
+      this.sarSarAccessEOSearch = {
+        lawNumOrName: '', // 编号/名称
+        productType: '', // 产品类型
+        responseDept: '', // 责任部门
+        lawNumber: '',
+        lawName: '',
+        accessContent: '',
+        energyKind: '',
+        applyArctic: '',
+        region: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        validFlag: 0
       }
+      this.searchSarAccessBtn()
+      console.log(this.sarSarAccessEOSearch)
     },
     // 更多
-    handleCommand (command) {
+    handleCommand(command) {
       switch (command[1]) {
         case '查看':
           this.showUser(command[0])
@@ -257,15 +317,40 @@ export default {
     userClo(row) {
       console.log(row)
     },
-    // 分页事件
-    pageChange (page) {
-      this.pageNo = page
-      this.getTableByPage()
+    pageChange(page) {
+      this.sarSarAccessEOSearch.page = page
+      this.searchSarAccess()
     },
-    pageSizeChange (pageSize) {
-      this.pageSize = this.$store.getters.userInfo.configContent
-      this.getTableByPage()
+    pageSizeChange(pageSize) {
+      this.sarSarAccessEOSearch.page = 1
+      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.searchSarAccess()
     },
+    // 搜索
+    searchSarAccessBtn() {
+      this.sarSarAccessEOSearch.page = 1
+      this.searchSarAccess()
+    },
+    //未整改项抽屉中的查询按钮
+    searchSarAccess() {//多条件和模糊查询
+      this.$http.get("sarStandUnqualified/businessDeptIssue", {
+        current: this.sarSarAccessEOSearch.page,
+        pageSize: this.$store.getters.userInfo.configContent,
+        ...this.sarSarAccessEOSearch,
+      }, {
+        _this: this
+      }, res => {
+        let arr = res.data.records;
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
+        this.sarAccessListTotal = res.data.total
+      }, e => {
+      });
+    },
+  },
+  mounted() {
+    // 分页查询数据
+    this.searchSarAccess()
   },
 };
 </script>
@@ -275,10 +360,12 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
- .content-center {
-   margin-left: 10px;
-   margin-bottom: 10px;
- }
+
+  .content-center {
+    margin-left: 10px;
+    margin-bottom: 10px;
+  }
+
   .container {
     flex: 1;
     overflow: hidden;

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -79,7 +79,7 @@
         size="mini"
         @click="exportStandard()"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-        v-btn-permission="'c3c8c107fb4ca1ab089d5b4b73cfcee1'"
+        v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button
         class="common-button-primary"