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

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -28,7 +28,7 @@
         <el-dialog
                 :title="config.attrName"
                 :visible.sync="replaceLawsNumModel"
-                width="875px"
+                width="1000px"
                 :close-on-click-modal="false"
                 @close="replaceLawsNumModelCancel"
                 :append-to-body="true"
@@ -54,20 +54,21 @@
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
-                                    icon="el-icon-search"
                                     type="primary"
                                     class="common-button-primary"
-                                    round
+                                    size="mini"
                                     @click="getReplaceLawsNumRowInfo">
+                                查询
                             </el-button>
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     class="common-button-default"
-                                    icon="el-icon-refresh-left"
-                                    round
+                                    size="mini"
                                     type="default"
-                                    @click="getResetLawsNumRow"></el-button>
+                                    @click="getResetLawsNumRow">
+                                清空
+                            </el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -138,8 +139,8 @@
                     @pageChange="pageChangeReplace"
                     @pageSizeChange="pageSizeChangeReplace"></pagination>
             <div slot="footer" class="demo-drawer-footer">
-                <el-button class="common-button-default" round size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
-                <el-button type="primary" round size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+                <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
             </div>
         </el-dialog>
 

src/pages/localTool/standardRecognition/index.vue

@@ -23,7 +23,6 @@
           style="width: 100%"
           height="100%"
           @selection-change="standSelectChange"
-          @sort-change="sortChange"
           :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
         >
           <el-table-column type="selection" align="center" width="50">
@@ -100,7 +99,6 @@
             prop="spendTime"
             label="消耗时间(秒)"
             align="center"
-            sortable="custom"
             width="140"
           >
           </el-table-column>

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -589,7 +589,6 @@
     export default {
         name: "enterpriseStandardPlan",
         components: {
-            CustomInputForAllStandards,
             CustomInputForAllStandards2
         },
         data() {