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

src/layout/otheruser/otheruserList.vue

@@ -13,11 +13,24 @@
           </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-pagination>
+        </el-row>
       </el-col>
     </el-row>
   </div>
@@ -28,17 +41,34 @@ export default {
   name: 'otheruserList',
   props: {
     debtTable: null,
+    total: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    currentPage: 1,
+  }),
   created() {},
   computed: {},
   methods: {
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
+    clickRest(id) {
+      this.$emit('clickRest', id);
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
   },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.page {
+  text-align: center;
+  padding: 15px 0;
+}
+</style>

src/views/otheruser/index.vue

@@ -8,7 +8,7 @@
         <searchInfo></searchInfo>
       </el-col>
       <el-col :span="24" class="main">
-        <otheruserList :debtTable="debtTable" @deleteRow="deleteRow"></otheruserList>
+        <otheruserList :debtTable="debtTable" :total="total" @deleteRow="deleteRow" @clickRest="clickRest"></otheruserList>
       </el-col>
     </el-col>
   </div>
@@ -33,6 +33,7 @@ export default {
     topTitle: '其他用户',
     display: 'block',
     debtTable: [],
+    total: '',
   }),
   created() {
     this.searchInfo();
@@ -42,9 +43,11 @@ export default {
     ...otheruser(['query', 'delete']),
     ...character({ userquery: 'query' }),
 
+    ...otheruser(['query', 'delete', 'update']),
     async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, limit, ...info });
       this.$set(this, `debtTable`, res.data);
+      this.$set(this, `total`, res.total);
     },
     // 添加
     clickBtn() {
@@ -56,6 +59,18 @@ export default {
       this.$checkRes(res, '删除成功', '删除失败');
       this.searchInfo();
     },
+    async clickRest(id) {
+      let data = {};
+      data.id = id;
+      data.passwd = '123456';
+      const res = await this.update(data);
+      if (res.errcode === 0) {
+        this.$message({
+          message: '密码重置成功',
+          type: 'success',
+        });
+      }
+    },
   },
 };
 </script>