更新

src/layout/companyidentify/newsInfo.vue

@@ -6,14 +6,18 @@
           <el-tabs v-model="activeName" @tab-click="handleClicks">
             <el-tab-pane label="认证中" name="first">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
+              <el-table
+                ref="debtTable"
+                :data="debtTable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
+
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -25,9 +29,10 @@
                 <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
                 <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
                 <el-table-column property="type" label="企业类型" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -45,14 +50,18 @@
             </el-tab-pane>
             <el-tab-pane label="认证成功" name="second">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="shenheTable" :data="shenheTable" style="width: 100%" border>
+              <el-table
+                ref="shenheTable"
+                :data="shenheTable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
+
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -64,9 +73,10 @@
                 <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
                 <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
                 <el-table-column property="type" label="企业类型" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -83,14 +93,18 @@
             </el-tab-pane>
             <el-tab-pane label="认证失败" name="third">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="noshenhetable" :data="noshenhetable" style="width: 100%" border>
+              <el-table
+                ref="noshenhetable"
+                :data="noshenhetable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
+
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -102,9 +116,10 @@
                 <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
                 <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
                 <el-table-column property="type" label="企业类型" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -128,6 +143,7 @@
 </template>
 
 <script>
+import searchInfo from '@/layout/common/searchInfo.vue';
 export default {
   name: 'newsInfo',
   props: {
@@ -136,7 +152,9 @@ export default {
     noshenhetable: null,
     total: null,
   },
-  components: {},
+  components: {
+    searchInfo,
+  },
   data: () => ({
     activeName: 'first',
     input: '',
@@ -149,6 +167,9 @@ export default {
     },
   },
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
@@ -169,17 +190,37 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.info {
-  padding: 15px 0;
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
 }
-.info .input {
-  padding: 6px 0;
+.delete {
+  color: #e9021d;
 }
-.info .btn {
-  text-align: center;
+/deep/.el-pagination {
+  padding: 26px 20px;
 }
-/deep/.el-input__inner {
-  height: 30px;
-  line-height: 30px;
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
 }
 </style>

src/layout/companyup/newsInfo.vue

@@ -6,14 +6,17 @@
           <el-tabs v-model="activeName" @tab-click="handleClicks">
             <el-tab-pane label="审核中" name="first">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
+              <el-table
+                ref="debtTable"
+                :data="debtTable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -25,18 +28,28 @@
                 <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
                 <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
                 <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
+                <!-- 
+                <el-table-column label="操作" align="center" width="300px">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" class="view" icon="el-icon-view"></el-button>
+                  </template>
+                </el-table-column> -->
               </el-table>
               <el-col class="page" :span="24">
                 <el-pagination
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage"
-                  layout="total,  prev, pager, next, jumper"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="10"
+                  background
+                  layout="total, sizes, prev, pager, next, jumper"
                   :total="total"
                 >
                 </el-pagination>
@@ -44,14 +57,18 @@
             </el-tab-pane>
             <el-tab-pane label="审核通过" name="second">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="shenheTable" :data="shenheTable" style="width: 100%" border>
+              <el-table
+                ref="shenheTable"
+                :data="shenheTable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
+
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -63,9 +80,10 @@
                 <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
                 <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
                 <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -74,7 +92,10 @@
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage"
-                  layout="total,  prev, pager, next, jumper"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="10"
+                  background
+                  layout="total, sizes, prev, pager, next, jumper"
                   :total="total"
                 >
                 </el-pagination>
@@ -82,14 +103,18 @@
             </el-tab-pane>
             <el-tab-pane label="审核拒绝" name="third">
               <el-col :span="24" class="info">
-                <el-col :span="10" class="input">
-                  <el-input placeholder="请输入企业名称" v-model="input"> </el-input>
-                </el-col>
-                <el-col :span="2" class="btn">
-                  <el-button type="primary" icon="el-icon-search" circle></el-button>
-                </el-col>
+                <searchInfo></searchInfo>
               </el-col>
-              <el-table ref="noshenhetable" :data="noshenhetable" style="width: 100%" border>
+              <el-table
+                ref="noshenhetable"
+                :data="noshenhetable"
+                tooltip-effect="dark"
+                :default-sort="{ prop: 'date', order: 'descending' }"
+                style="width: 100%"
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column type="selection" align="center"> </el-table-column>
+
                 <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
                 <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
                 <el-table-column label="状态" align="center">
@@ -101,9 +126,10 @@
                 <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
                 <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
                 <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center">
+                <el-table-column fixed="right" label="操作" align="center" width="300px">
                   <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button>
+                    <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-view"></i></el-button> -->
+                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -113,7 +139,10 @@
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage"
-                  layout="total,  prev, pager, next, jumper"
+                  :page-sizes="[10, 20, 30, 40]"
+                  :page-size="10"
+                  background
+                  layout="total, sizes, prev, pager, next, jumper"
                   :total="total"
                 >
                 </el-pagination> </el-col
@@ -126,6 +155,7 @@
 </template>
 
 <script>
+import searchInfo from '@/layout/common/searchInfo.vue';
 export default {
   name: 'newsInfo',
   props: {
@@ -134,7 +164,9 @@ export default {
     noshenhetable: null,
     total: null,
   },
-  components: {},
+  components: {
+    searchInfo,
+  },
   data: () => ({
     currentPage: 1,
     activeName: 'first',
@@ -147,6 +179,9 @@ export default {
     },
   },
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
@@ -166,17 +201,37 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.info {
-  padding: 15px 0;
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
 }
-.info .input {
-  padding: 6px 0;
+.delete {
+  color: #e9021d;
 }
-.info .btn {
-  text-align: center;
+/deep/.el-pagination {
+  padding: 26px 20px;
 }
-/deep/.el-input__inner {
-  height: 30px;
-  line-height: 30px;
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
 }
 </style>

src/layout/companyuser/companyuserList.vue

@@ -1,18 +1,41 @@
 <template>
-  <div id="companyuserList">
+  <div id="list">
     <el-row>
       <el-col :span="24">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
-          <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
-          <el-table-column property="institution_name" label="	推荐单位名称" align="center"> </el-table-column>
-          <el-table-column property="phone" label="手机号" align="center"> </el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-col :span="24">
+          <el-table
+            ref="debtTable"
+            :data="debtTable"
+            tooltip-effect="dark"
+            :default-sort="{ prop: 'date', order: 'descending' }"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" align="center"> </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
+            <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
+            <el-table-column property="institution_name" label="	推荐单位名称" align="center"> </el-table-column>
+            <el-table-column property="phone" label="手机号" align="center"> </el-table-column>
+            <el-table-column label="操作" align="center" width="300px">
+              <template slot-scope="scope">
+                <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="10"
+              background
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+            >
+            </el-pagination>
+          </el-row>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -20,20 +43,69 @@
 
 <script>
 export default {
-  name: 'companyuserList',
+  name: 'list',
   props: {
     debtTable: null,
+    total: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    currentPage: 0,
+  }),
   created() {},
   computed: {},
   methods: {
-    deleteRow(id) {
-      this.$emit('deleteRow', id);
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
+    handleClick(id) {
+      console.log(id.id);
+      let newid = id.id;
+
+      this.$emit('handleClick', newid);
     },
   },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
+}
+.delete {
+  color: #e9021d;
+}
+/deep/.el-pagination {
+  padding: 26px 20px;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
+}
+</style>

src/layout/otheruser/otheruserForm.vue

@@ -3,28 +3,38 @@
     <el-row>
       <el-col :span="24" class="form">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="用户名称" prop="name">
-            <el-input v-model="ruleForm.name" placeholder="请输入用户名称"></el-input>
-          </el-form-item>
-          <el-form-item label="手机号" prop="phone">
-            <el-input v-model="ruleForm.phone" placeholder="请输入手机号"></el-input>
-          </el-form-item>
-          <el-form-item label="用户类型" prop="type">
-            <el-select v-model="ruleForm.type" placeholder="请选择用户类型">
-              <el-option label="金控集团后台管理员" value="0"></el-option>
-              <el-option label="金融机构用户" value="1"></el-option>
-              <el-option label="政府用户" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="用户角色" prop="characterid">
-            <el-select v-model="ruleForm.characterid" placeholder="请选择用户角色">
-              <el-option v-for="(item, index) in charList" :key="index" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
-            <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
-          </el-form-item>
+          <el-col :span="24">
+            <el-form-item label="用户名称" prop="name">
+              <el-input v-model="ruleForm.name" placeholder="请输入用户名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="ruleForm.phone" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="用户类型" prop="type">
+              <el-select v-model="ruleForm.type" placeholder="请选择用户类型">
+                <el-option label="金控集团后台管理员" value="0"></el-option>
+                <el-option label="金融机构用户" value="1"></el-option>
+                <el-option label="政府用户" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="用户角色" prop="characterid">
+              <el-select v-model="ruleForm.characterid" placeholder="请选择用户角色">
+                <el-option v-for="(item, index) in charList" :key="index" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="clickBtn">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button size="small" @click="resetForm('ruleForm')">取消</el-button>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-col>
     </el-row>
@@ -59,7 +69,95 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.form {
-  padding: 0 200px 0 0;
+p {
+  padding: 0;
+  margin: 0;
+}
+.top .shu {
+  float: left;
+  width: 4px;
+  height: 20px;
+  background: rgba(233, 2, 29, 1);
+}
+.top .title {
+  float: left;
+  padding: 0 10px;
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: bold;
+  color: rgba(40, 40, 40, 1);
+}
+/deep/.el-textarea__inner {
+  min-height: 100px !important;
+}
+/deep/.select {
+  width: 632px;
+}
+.selects {
+  width: 473px;
+  margin: 0 15px 0 0;
+}
+/deep/.el-radio__input.is-checked + .el-radio__label {
+  color: #e9021d;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  border-color: #e9021d;
+  background: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #e9021d;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button,
+.el-checkbox-button__inner {
+  margin: 0 15px 0 0;
+}
+/deep/.el-checkbox-button__inner {
+  padding: 7px 5px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button__inner:hover {
+  color: #e9021d;
+}
+/deep/.el-checkbox-button:first-child .el-checkbox-button__inner {
+  border-left: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button:last-child .el-checkbox-button__inner {
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  color: #e9021d;
+  background-color: #ffffff;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  box-shadow: none;
+}
+/deep/.el-switch.is-checked .el-switch__core {
+  border-color: #e9021d;
+  background-color: #e9021d;
+}
+.clickBtn .el-button {
+  width: 100px;
+  height: 40px;
+  padding: 0;
+  color: #ffffff;
+  background: #b9b9b9;
+  border-radius: 4px;
+  margin: 40px;
+}
+.clickBtn {
+  text-align: center;
+  margin: 40px 0;
+  border-top: 1px solid #ccc;
+}
+.clickBtn .el-button:first-child {
+  background-color: #e9021d;
 }
 </style>

src/layout/otheruser/otheruserList.vue

@@ -1,36 +1,53 @@
 <template>
-  <div id="otheruserList">
+  <div id="list">
     <el-row>
       <el-col :span="24">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
-          <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="name" label="用户名" align="center"> </el-table-column>
-          <el-table-column property="phone" label="手机号" align="center"> </el-table-column>
-          <el-table-column label="用户类型" align="center">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.type === '0' ? '金控集团后台管理员' : scope.row.type === '1' ? '金融机构用户' : '政府用户' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="密码重置" placement="bottom">
-                <el-button @click="clickRest(scope.row.id)" type="text"><i class="el-icon-refresh"></i></el-button>
-              </el-tooltip>
-              <el-button @click="$router.push({ path: '/otheruser/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
-              <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row class="page">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
+        <el-col :span="24">
+          <el-table
+            ref="debtTable"
+            :data="debtTable"
+            tooltip-effect="dark"
+            :default-sort="{ prop: 'date', order: 'descending' }"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
           >
-          </el-pagination>
-        </el-row>
+            <el-table-column type="selection" align="center"> </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
+            <el-table-column property="name" label="用户名" align="center"> </el-table-column>
+            <el-table-column property="phone" label="手机号" align="center"> </el-table-column>
+            <el-table-column label="用户类型" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{
+                  scope.row.type === '0' ? '金控集团后台管理员' : scope.row.type === '1' ? '金融机构用户' : '政府用户'
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="300px">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="密码重置" placement="bottom">
+                  <el-button @click="clickRest(scope.row.id)" type="text"><i class="el-icon-refresh"></i></el-button>
+                </el-tooltip>
+                <el-button @click="$router.push({ path: '/otheruser/detail', query: { id: scope.row.id } })" type="text"
+                  ><i class="el-icon-edit"></i
+                ></el-button>
+                <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="10"
+              background
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+            >
+            </el-pagination>
+          </el-row>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -38,18 +55,21 @@
 
 <script>
 export default {
-  name: 'otheruserList',
+  name: 'list',
   props: {
     debtTable: null,
     total: null,
   },
   components: {},
   data: () => ({
-    currentPage: 1,
+    currentPage: 0,
   }),
   created() {},
   computed: {},
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
@@ -67,8 +87,37 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.page {
-  text-align: center;
-  padding: 15px 0;
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
+}
+.delete {
+  color: #e9021d;
+}
+/deep/.el-pagination {
+  padding: 26px 20px;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
 }
 </style>

src/layout/region/regionList.vue

@@ -2,17 +2,47 @@
   <div id="regionList">
     <el-row>
       <el-col :span="24">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
+        <el-table
+          ref="debtTable"
+          :data="debtTable"
+          tooltip-effect="dark"
+          :default-sort="{ prop: 'date', order: 'descending' }"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" align="center"> </el-table-column>
+
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
           <el-table-column property="name" label="地区名称" align="center"> </el-table-column>
           <el-table-column property="order" label="排序" align="center"> </el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
+          <!-- <el-table-column fixed="right" label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button @click="$router.push({ path: '/region/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
+              <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col> -->
+          <el-table-column label="操作" align="center" width="300px">
             <template slot-scope="scope">
               <el-button @click="$router.push({ path: '/region/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
               <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
             </template>
           </el-table-column>
         </el-table>
+        <el-row>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="10"
+            background
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-row>
       </el-col>
     </el-row>
   </div>
@@ -29,6 +59,9 @@ export default {
   created() {},
   computed: {},
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
@@ -36,4 +69,38 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
+}
+.delete {
+  color: #e9021d;
+}
+/deep/.el-pagination {
+  padding: 26px 20px;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
+}
+</style>

src/views/companyidentify/detail.vue

@@ -126,18 +126,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/companyidentify/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-col :span="24" class="debt">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+        <topInfo :topTitle="topTitle" :display="display"></topInfo>
       </el-col>
 
       <el-col :span="24" class="main">
@@ -28,7 +28,7 @@ export default {
   },
   data: () => ({
     topTitle: '企业认证',
-    display: 'none',
+    display: 'block',
     debtTable: [],
     shenheTable: [],
     noshenhetable: [],
@@ -59,10 +59,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/companyup/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+          <topInfo :topTitle="topTitle" :display="display"></topInfo>
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="back">
@@ -128,18 +128,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/companyup/index.vue

@@ -31,7 +31,7 @@ export default {
   },
   data: () => ({
     topTitle: '企业信息',
-    display: 'none',
+    display: 'block',
     debtTable: [],
     shenheTable: [],
     noshenhetable: [],
@@ -66,10 +66,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/companyuser/index.vue

@@ -9,24 +9,11 @@
           <searchInfo></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <companyuserList :debtTable="debtTable" @deleteRow="deleteRow"></companyuserList>
+          <companyuserList :debtTable="debtTable" @deleteRow="deleteRow" :total="total"></companyuserList>
         </el-col>
       </el-col>
     </el-row>
   </div>
-  <!-- <div id="index">
-    <el-col :span="24" class="debt">
-      <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display"></topInfo>
-      </el-col>
-      <el-col :span="24" class="search">
-        <searchInfo></searchInfo>
-      </el-col>
-      <el-col :span="24" class="main">
-        <companyuserList :debtTable="debtTable" @deleteRow="deleteRow"></companyuserList>
-      </el-col>
-    </el-col>
-  </div> -->
 </template>
 
 <script>
@@ -46,6 +33,7 @@ export default {
     companyuserList, //其他用户列表
   },
   data: () => ({
+    total: 1,
     topTitle: '企业用户',
     display: 'block',
     debtTable: [

src/views/otheruser/detail.vue

@@ -3,15 +3,17 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
+          <!-- <topInfo :topTitle="topTitle" :display="display"></topInfo> -->
+          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="back">
+          <!-- <el-col :span="24" class="back">
             <detailTop @goBack="goBack"></detailTop>
-          </el-col>
-          <el-col :span="24" class="info">
+          </el-col> -->
+          <!-- <el-col :span="24" class="info">
             <otheruserForm :ruleForm="ruleForm" :charList="charList" @submitForm="submitForm" @resetForm="resetForm"></otheruserForm>
-          </el-col>
+          </el-col> -->
+          <otheruserForm :ruleForm="ruleForm" :charList="charList" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></otheruserForm>
         </el-col>
       </el-col>
     </el-row>
@@ -20,7 +22,7 @@
 
 <script>
 import topInfo from '@/layout/common/topInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
+import detailTopInfo from '@/layout/common/detailTopInfo.vue';
 import otheruserForm from '@/layout/otheruser/otheruserForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: otheruser } = createNamespacedHelpers('otheruser');
@@ -29,13 +31,13 @@ export default {
   name: 'detail',
   props: {},
   components: {
-    topInfo, //头部导航
-    detailTop, //头部返回
-    otheruserForm, //添加其他用户
+    detailTopInfo, //头部导航
+    otheruserForm, //头部返回
   },
   data: () => ({
-    display: 'none',
     topTitle: '用户信息管理',
+    display: 'block',
+    formTitle: '信息管理',
     ruleForm: {
       passwd: '123456',
       characterid: '',
@@ -108,18 +110,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/otheruser/index.vue

@@ -13,18 +13,6 @@
         </el-col>
       </el-col>
     </el-row>
-
-    <!-- <el-col :span="24" class="debt">
-      <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></otheruserList>
-      </el-col>
-      <el-col :span="24" class="search">
-        <searchInfo></searchInfo>
-      </el-col>
-      <el-col :span="24" class="main">
-        <otheruserList :debtTable="debtTable" :total="total" @deleteRow="deleteRow" @clickRest="clickRest"></otheruserList>
-      </el-col>
-    </el-col> -->
   </div>
 </template>
 
@@ -90,10 +78,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/region/index.vue

@@ -4,11 +4,14 @@
       <el-col :span="24" class="top">
         <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></topInfo>
       </el-col>
-      <el-col :span="24" class="search">
-        <searchInfo></searchInfo>
-      </el-col>
       <el-col :span="24" class="main">
-        <regionList :debtTable="debtTable" @deleteRow="deleteRow"></regionList>
+        <el-col :span="24" class="search">
+          <searchInfo></searchInfo>
+        </el-col>
+
+        <el-col :span="24" class="list">
+          <regionList :debtTable="debtTable" @deleteRow="deleteRow"></regionList>
+        </el-col>
       </el-col>
     </el-col>
   </div>
@@ -59,10 +62,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>