From 194996da8dbc90ceb263b06c3b4ae8e9b475a20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 31 May 2021 10:02:36 +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

---
 .../createProcess/components/qbkw/step1.vue   |  1 -
 .../createProcess/components/qbkw/step2.vue   |  2 --
 .../createProcess/components/qbkw/step3.vue   |  2 --
 .../createProcess/components/zg/step8.vue     |  1 -
 .../processDetail/pages/dealWith/handle1.vue  |  2 --
 .../processDetail/pages/dealWith/handle2.vue  |  6 ++--
 .../domesticStandardsAndRegulations/index.vue | 33 ++++++++++---------
 .../components/ProcessSearchStand.vue         |  6 ++--
 8 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
index f3457d03c..0df254d67 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
@@ -332,7 +332,6 @@
         v-if="EditPermission !== '1'"
         type="warning"
         icon="el-icon-edit-outline"
-        round
         @click="onlineEditing"
         class="common-button-warning"
       >在线编辑</el-button>
diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
index b49efae40..7f9000f13 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
@@ -276,12 +276,10 @@
                 <el-button
                   type="primary"
                   class="common-button-primary add-button"
-                  round
                   @click="addModal"
                 ><i class="iconfont">&#xe84e;</i>新增</el-button>
                 <el-button
                   class="common-button-default delete-button"
-                  round
                   @click="deleteStand"
                 ><i class="iconfont">&#xe61b;</i>删除</el-button>
               </div>
diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
index 7acee19bd..e2a540959 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
@@ -276,12 +276,10 @@
                   <el-button
                     type="primary"
                     class="common-button-primary add-button"
-                    round
                     @click="addModal"
                   ><i class="iconfont">&#xe84e;</i>新增</el-button>
                   <el-button
                     class="common-button-default delete-button"
-                    round
                     @click="deleteStand"
                   ><i class="iconfont">&#xe61b;</i>删除</el-button>
                 </div>
diff --git a/src/pages/processCenter/pages/createProcess/components/zg/step8.vue b/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
index ff5104c1b..c0944590e 100644
--- a/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
@@ -136,7 +136,6 @@
                 <el-button
                   type="primary"
                   class="common-button-primary"
-                  round
                   icon="el-icon-edit"
                   @click="toogleExpand(scope.row, scope.$index)"
                 ></el-button>
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
index c69319b4d..2e4870a80 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
@@ -34,12 +34,10 @@
             <div class="addbutton">
                 <el-button class="common-button-primary add-button"
                            type="primary"
-                           round
                            :disabled="tableData.length === 0"
                            @click="EditAll">批量编辑</el-button>
                 <el-button class="common-button-primary add-button"
                            type="primary"
-                           round
                            @click="AddModal"><i class="iconfont">&#xe84e;</i>新增</el-button>
             </div>
             <el-divider content-position="left">技术评估</el-divider>
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
index dc850eeba..681a7568a 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
@@ -42,7 +42,7 @@
             <el-button class="common-button-primary add-button"
                        type="primary"
                        @click="submitAll"
-                       round>批量同意</el-button>
+                       >批量同意</el-button>
 <!--            <el-button class="common-button-primary add-button"-->
 <!--                       type="primary"-->
 <!--                       @click="handleEntrust"-->
@@ -583,7 +583,7 @@
             cancelButtonText: '取消',
             type: 'warning',
             confirmButtonClass: 'common-button-primary',
-            roundButton: true
+            roundButton: false
           }).then(() => {
             next()
           })
@@ -639,7 +639,7 @@
             cancelButtonText: '取消',
             type: 'warning',
             confirmButtonClass: 'common-button-primary',
-            roundButton: true
+            roundButton: false
           }).then(() => {
             next()
           })
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index f85083d7b..fa920e19b 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -867,7 +867,7 @@
 <!--      ></AdvancedQuery>-->
       <table-tools-bar v-model="isAdvancedSearch">
         <div slot="content">
-          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form" style="display: flex;flex-wrap: wrap">
+          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
 <!--            标准号-->
             <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
               <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
@@ -3767,21 +3767,24 @@ export default {
   outline: none!important;
 }
 .label-input-form {
-  /deep/.el-form-item__label {
-    width:100px;
-    height:30px;
-    border: 1px solid #DCDFE6;
-    border-right: none;
-    line-height:30px;
-    text-align: center;
-    margin-top: 6px;
-    background: #F9F9F9;
-  }
-  /deep/.el-input__inner {
-    height: 30px;
-    line-height: 30px;
-    border-radius: 0 !important;
+  &.table-lattice{
+    /deep/.el-form-item__label {
+      width:100px;
+      height:30px;
+      border: 1px solid #DCDFE6;
+      border-right: none;
+      line-height:30px;
+      text-align: center;
+      margin-top: 6px;
+      background: #F9F9F9;
+    }
+    /deep/.el-input__inner {
+      height: 30px;
+      line-height: 30px;
+      border-radius: 0 !important;
+    }
   }
+
 }
 
 </style>
diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
index b05dc1e07..ccc47594e 100644
--- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
+++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
@@ -50,7 +50,6 @@
                   icon="el-icon-search"
                   type="primary"
                   class="common-button-primary"
-                  round
                   @click="getReplaceLawsNumRow">
                 </el-button>
               </el-form-item>
@@ -58,7 +57,6 @@
                 <el-button
                   class="common-button-default"
                   icon="el-icon-refresh-left"
-                  round
                   type="default"
                   @click="getResetLawsNumRow"></el-button>
               </el-form-item>
@@ -129,8 +127,8 @@
           @pageChange="pageChangeReplace"
           @pageSizeChange="pageSizeChangeReplace"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button size="small" round class="common-button-primary" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-          <el-button size="small" type="primary" round class="common-button-default" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+          <el-button size="small"  class="common-button-primary" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+          <el-button size="small" type="primary"  class="common-button-default" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
         </div>
       </el-dialog>
     </div>