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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -734,7 +734,7 @@
         :before-upload="beforeUpload"
         :action="importExcelUrls"
         :file-list="defaultFileList"
-        accept=".xls"
+        accept=".xlsx"
         name="file"
         ref="importFileAboutStand">
         <div style="padding: 20px 0">
@@ -1024,14 +1024,14 @@ export default {
           //IE浏览器、微软浏览器
           /* 经过测试，微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开，
             IE可不重命名，以防万一，所以都写上比较好 */
-          window.navigator.msSaveBlob(blob, '清单下载模板.xls');
+          window.navigator.msSaveBlob(blob, '清单下载模板.xlsx');
         } else {
           //其他浏览器
           let link = document.createElement('a'); // 创建a标签
           link.style.display = 'none';
           let objectUrl = URL.createObjectURL(blob);
           link.href = objectUrl;
-          link.download = '清单下载模板.xls';
+          link.download = '清单下载模板.xlsx';
           link.click();
           URL.revokeObjectURL(objectUrl);
         }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1711,7 +1711,7 @@
                   <el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
                       <el-option value="1" label="是"></el-option>
-                      <el-option value="0" label="否"></el-option>
+                      <el-option value="2" label="否"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -546,7 +546,7 @@
                   <el-form-item label="是否纳入标准清单" title="是否纳入标准清单" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
                       <el-option value="1" label="是"></el-option>
-                      <el-option value="0" label="否"></el-option>
+                      <el-option value="2" label="否"></el-option>
                     </el-select>
                   </el-form-item>
                   <!--            标记-->