From dce82be25e79815c012646f61a3a16530da17b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 26 May 2021 14:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 48 ++++++++-----------
 src/pages/skillReq/SkillReqSee/searchForm.vue |  1 -
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7703cd0be..fee3d0d68 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -65,15 +65,13 @@
                     icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
-                    round
                     @click="searchBtnClick(standCommonlySearch)">
                   </el-button>
                   <el-button
                     class="common-button-default"
                     icon="el-icon-refresh-left"
-                    round
                     @click="clearAllSearch('standCommonlySearch')"></el-button>
-                  <el-button type="primary" class="common-button-primary" round @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
+                  <el-button type="primary" class="common-button-primary"  @click="selectMoreBtn"><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -85,17 +83,14 @@
       <div class="action-bar">
         <el-button type="primary"
                    class="common-button-primary add-button"
-                   round
                    @click="addModal"
                    v-btn-permission="'B6KGCGZWKM'"
                    :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
         <el-button class="common-button-default in-button"
-                   round
                    :loading="searching"
                    @click="addImportModal(1)"
                    v-btn-permission="'7Y7XX6PXNM'"><i class="iconfont">&#xe6de;</i>导入</el-button>
         <el-button class="common-button-default export-button"
-                   round
                    @click="exportStandard()"
                    v-btn-permission="'MP3Y2BAK5V'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button>
@@ -105,19 +100,17 @@
 <!--                   v-btn-permission="'MKVDFIF89FN'"><i class="iconfont">&#xe6e9;</i>全部导出</el-button>-->
         <el-button class="common-button-default delete-button"
                    :loading="delLoading"
-                   round
                    @click="deleteStand(2)"
                    v-btn-permission="'UH6NV867E7'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         <el-button class="common-button-default"
-                   round
                    @click="deleteStandFromKind(2)"
                    v-btn-permission="'DQSXS89BRN'"><i class="iconfont">&#xe611;</i>移除标准</el-button>
         <el-button class="common-button-default"
-                   round :loading="searching"
+                   :loading="searching"
                    @click="uploadImportModal(1)"
                    v-btn-permission="'nDZVPHAg4Y'"><i class="iconfont">&#xe825;</i>模板下载</el-button>
         <el-button class="common-button-default"
-                   round @click="configurationStandard"
+                   @click="configurationStandard"
                    v-btn-permission="'4EN5WW694V'"><i class="iconfont">&#xe669;</i>配置标准</el-button>
       </div>
       <div class="content">
@@ -247,7 +240,7 @@
         </el-form>
         <span slot="footer" class="demo-drawer-footer">
           <el-button class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+          <el-button type="primary"  class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
       <!-- 新增国内标准 -->
@@ -513,7 +506,7 @@
           </el-form>
         </div>
         <div class="demo-drawer-footer">
-          <el-button v-show="modalshowtitle === '新增国内标准'" type="primary" round class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
+          <el-button v-show="modalshowtitle === '新增国内标准'" type="primary"  class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
           <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
         </div>
@@ -600,8 +593,8 @@
             <el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable
                       @keyup.enter.native="selectTestItemClassBtn"/>
           </el-formItem>
-          <el-button class="common-button-primary" type="primary" icon="el-icon-search" round @click="getTestItemRow(1)"></el-button>
-          <el-button class="common-button-default" icon="el-icon-refresh-left" @click="getTestItemRow('')" round></el-button>
+          <el-button class="common-button-primary" type="primary" icon="el-icon-search"  @click="getTestItemRow(1)"></el-button>
+          <el-button class="common-button-default" icon="el-icon-refresh-left" @click="getTestItemRow('')" ></el-button>
         </el-form>
         <el-table
           ref="selections"
@@ -675,7 +668,7 @@
           @pageSizeChange="pageSizeChangeItems"></pagination>
         <div slot="footer" class="demo-drawer-footer">
           <el-button class="common-button-primary" icon="el-icon-check" @click="testItemsModel=false">取消</el-button>
-          <el-button type="primary" round class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">提交</el-button>
+          <el-button type="primary"  class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">提交</el-button>
         </div>
       </el-dialog>
       <!--                  导入模态窗----失败有弹框                       -->
@@ -718,10 +711,10 @@
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button class="common-button-primary" type="primary" icon="el-icon-search" round @click="selectConfiguraStand(true)"></el-button>
+                  <el-button class="common-button-primary" type="primary" icon="el-icon-search"  @click="selectConfiguraStand(true)"></el-button>
                 </el-form-item>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button class="common-button-default" icon="el-icon-refresh-left" @click="clearAllSearch(3)" round></el-button>
+                  <el-button class="common-button-default" icon="el-icon-refresh-left" @click="clearAllSearch(3)" ></el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -793,7 +786,6 @@
         <div class="demo-drawer-footer">
           <el-button
               type="primary"
-              round
               class="common-button-primary"
               icon="el-icon-check"
               @click="saveConfigStand"
@@ -823,7 +815,7 @@
           </el-formItem>
         </el-form>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="newMenu">提交</el-button>
+          <el-button type="primary"  class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="newMenu">提交</el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="resetTreeDialog">取消</el-button>
         </div>
       </el-dialog>
@@ -841,7 +833,7 @@
           </dept-tree>
         </div>
         <div class="demo-drawer-footer">
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">提交</el-button>
+          <el-button type="primary"  class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">提交</el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="treeCancel">取消</el-button>
         </div>
       </el-drawer>
@@ -854,7 +846,7 @@
           <p v-html="importForm.content"></p>
         </div>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" round class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
+          <el-button type="primary"  class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
         </div>
       </el-dialog>
       <AdvancedQuery
@@ -1704,7 +1696,7 @@ export default {
                   confirmButtonClass: 'common-button-primary',
                   cancelButtonText: '取消',
                   type: 'warning',
-                  roundButton: true
+                  roundButton: false
                 }).then(() => {
                   this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
                     _this: this, loading: 'loading'
@@ -1907,7 +1899,7 @@ export default {
         confirmButtonText: '确定',
         confirmButtonClass: 'common-button-primary',
         cancelButtonText: '取消',
-        roundButton: true,
+        roundButton: false,
         type: 'warning'
       }).then(() => {
         this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
@@ -2184,7 +2176,7 @@ export default {
             confirmButtonClass: 'common-button-primary',
             cancelButtonText: '取消',
             type: 'warning',
-            roundButton: true
+            roundButton: false
           }).then(() => {
             this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: itemid}, {
               _this: this,
@@ -2208,7 +2200,7 @@ export default {
             confirmButtonText: '确定',
             confirmButtonClass: 'common-button-primary',
             cancelButtonText: '取消',
-            roundButton: true,
+            roundButton: false,
             type: 'warning'
           })
         } else {
@@ -2217,7 +2209,7 @@ export default {
               confirmButtonText: '确定',
               confirmButtonClass: 'common-button-primary',
               cancelButtonText: '取消',
-              roundButton: true,
+              roundButton: false,
               type: 'warning'
             }).then(() => {
               this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: this.selectedList.join(',')}, {
@@ -3043,7 +3035,7 @@ export default {
                 confirmButtonClass: 'common-button-primary',
                 cancelButtonText: '取消',
                 type: 'warning',
-                roundButton: true
+                roundButton: false
               }).then(() => {
                 search.idlist.push(item)
                 this.$http.putData('lawss/sarStandMenu/removeStandInfo', search, {
@@ -3064,7 +3056,7 @@ export default {
                   confirmButtonText: '确定',
                   confirmButtonClass: 'common-button-primary',
                   cancelButtonText: '取消',
-                  roundButton: true,
+                  roundButton: false,
                   type: 'warning'
                 }).then(() => {
                   for (let i = 0; i < this.selectedList.length; i++) {
diff --git a/src/pages/skillReq/SkillReqSee/searchForm.vue b/src/pages/skillReq/SkillReqSee/searchForm.vue
index b600b14ce..3f204fb32 100644
--- a/src/pages/skillReq/SkillReqSee/searchForm.vue
+++ b/src/pages/skillReq/SkillReqSee/searchForm.vue
@@ -404,7 +404,6 @@ export default {
     span {
       margin-right: 15px;
       padding: 0px 7px;
-      2px;
       transition: all 0.3s ease;
       user-select: none;
       margin-bottom: 5px;