Merge remote-tracking branch 'origin/master'

src/views/enterprise/check/index.vue

@@ -33,9 +33,8 @@
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
-        <el-table-column label="注册地址" prop="registerAddress" :show-overflow-tooltip="true" width="180"></el-table-column>
-
-
+        <el-table-column label="注册地址" prop="registerAddress" :show-overflow-tooltip="true"
+                         width="180"></el-table-column>
         <el-table-column label="审核状态" prop="checkStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.checkStatus) | statusFilterType">
@@ -43,8 +42,6 @@
             </el-tag>
           </template>
         </el-table-column>
-
-
         <el-table-column label="资质证书" prop="certStatus" width="120">
           <template slot-scope="scope">
 
@@ -60,7 +57,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" width="120">
+        <el-table-column label="操作" width="120" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -105,10 +102,6 @@
     </el-dialog>
 
 
-    
-    
-   
-
   </div>
 </template>
 
@@ -148,7 +141,6 @@ export default {
       fromOptions: [],
 
 
-
     };
   },
   filters: {
@@ -223,7 +215,6 @@ export default {
     },
 
 
-
     registrationDialog(row) {
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
         this.formProductName = 2;
@@ -256,9 +247,7 @@ export default {
     }
 
   },
-  components: {
-    
-  }
+  components: {}
   ,
 
   created() {

src/views/userManage/customerManage.vue

@@ -359,9 +359,9 @@
 
       <div v-if="customerVisible">
         <el-dialog
-          title="系统用户"
+          title="企业用户"
           :visible.sync="customerVisible"
-          width="60%"
+          width="80%"
           append-to-body
           :modal-append-to-body="false"
           :close-on-click-modal="false"