Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/companyidentify/newsInfo.vue

@@ -29,7 +29,7 @@
                 <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" width="300px">
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
@@ -42,7 +42,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>
@@ -73,7 +76,7 @@
                 <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" width="300px">
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
@@ -85,7 +88,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>
@@ -116,7 +122,7 @@
                 <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" width="300px">
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
@@ -129,7 +135,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>

src/layout/companyup/newsInfo.vue

@@ -28,9 +28,8 @@
                 <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" width="300px">
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
@@ -80,9 +79,8 @@
                 <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" width="300px">
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>
@@ -126,9 +124,9 @@
                 <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" width="300px">
+
+                <el-table-column 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 size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
                   </template>
                 </el-table-column>

src/views/companyidentify/index.vue

@@ -66,6 +66,7 @@ export default {
 .main {
   height: 765px;
   background: #ffffff;
+  padding: 0 20px 0 20px;
 }
 .search {
   width: 97%;

src/views/companyup/index.vue

@@ -73,6 +73,7 @@ export default {
 .main {
   height: 765px;
   background: #ffffff;
+  padding: 0 20px 0 20px;
 }
 .search {
   width: 97%;