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"
@@ -101,13 +98,9 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
-    
-    </el-dialog>
 
+    </el-dialog>
 
-    
-    
-   
 
   </div>
 </template>
@@ -146,7 +139,6 @@ export default {
       editType: 0,            //0:新增，1：编辑
 
       fromOptions: [],
- 
 
 
     };
@@ -164,7 +156,7 @@ export default {
       };
       return statusMap[status];
     },
-   
+
 
     statusFilterName(status) {
       const statusMap = {
@@ -196,7 +188,7 @@ export default {
     },
     getList() {
       //this.loading = true;
-      
+
     },
     onSubmit() {
       this.getList();
@@ -217,12 +209,11 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
-    
+
     closeDialog() {
       this.supCompanyVisible = false;
     },
 
-  
 
     registrationDialog(row) {
       if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
@@ -236,7 +227,7 @@ export default {
       this.inputProudtQuery = row;
       this.registrationVisible = true;
     },
-   
+
     getRegistrationList() {
       this.registrationLoading = true;
       getRegistrationList(this.registrationQuery)
@@ -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"