账号,押金比例,钱包对应关系更改

src/views/basic_data/dealer/dealer_deposit.vue

@@ -98,7 +98,7 @@
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>
       </div>
@@ -366,9 +366,9 @@ export default {
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
-      this.currentPage = 1;
+
       this.getList({
-        pageNum: 1,
+        pageNum: this.currentPage,
         pageSize: this.pageSize,
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
@@ -378,8 +378,8 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getList({
-        pageNum: val,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
       });
@@ -391,7 +391,7 @@ export default {
         keyword: this.searchForm.customerName,
         currentStatus: this.searchForm.currentStatus,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: this.pageSize,
       });
     },
     //重置
@@ -423,6 +423,9 @@ export default {
       this.dialogForm.customerName = res.name;
       this.dialogForm.customerNumber = res.number;
 
+      if (!this.dialogForm.endTime) {
+        this.dialogForm.endTime = "2100-01-01 00:00:00";
+      }
       if (this.dialogForm.id) {
         await editDealerDeposit({
           ...this.dialogForm,
@@ -430,9 +433,6 @@ export default {
         });
         this.$message.success("编辑成功");
       } else {
-        if (this.dialogForm.endTime === "") {
-          this.dialogForm.endTime = "2100-01-01 00:00:00";
-        }
         await getDealerDepositAdd({
           ...this.dialogForm,
           rate: Number(this.dialogForm.rate / 100),

src/views/basic_data/dealer/dealer_stock.vue

@@ -70,7 +70,7 @@
       </div>
       <!-- 分页 -->
       <div class="fr">
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
         </el-pagination>
       </div>
     </div>
@@ -558,9 +558,9 @@ export default {
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
-      this.currentPage = 1;
+      // this.currentPage = 1
       this.getList({
-        pageNum: 1,
+        pageNum: this.currentPage,
         pageSize: this.pageSize,
         customerName: this.searchForm.customerName,
       });
@@ -569,18 +569,19 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val;
       this.getList({
-        pageNum: val,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
         customerName: this.searchForm.customerName,
       });
     },
     //搜索功能
     async searchFn() {
-      console.log(this.searchForm);
+      // console.log(this.searchForm);
+      this.currentPage = 1;
       await this.getList({
         customerName: this.searchForm.customerName,
-        pageNum: 1,
-        pageSize: 10,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
       });
     },
     //重置

src/views/setting/account.vue

@@ -21,22 +21,22 @@
         <!-- <div class="top clearfix">
           <div class="title fl">条件筛选</div>
         </div> -->
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="150px" size="mini" label-position="left">
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="账号名称" prop="name">
-                <el-input v-model="screenForm.name" placeholder="请输入账号名称"></el-input>
+            <el-col :xs="24" :sm="12" :lg="8">
+              <el-form-item label="账号/用户名名称:" prop="name">
+                <el-input v-model="screenForm.name" placeholder="请输入账号/用户名名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="角色" prop="roleId">
+            <el-col :xs="24" :sm="12" :lg="8">
+              <el-form-item label="角色:" prop="roleId">
                 <el-select class="selectStyle" v-model="screenForm.roleId" placeholder="请选择" filterable>
                   <el-option v-for="(v, i) in roleList" :key="i" :label="v.name" :value="v.adminRoleId">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-col :xs="24" :sm="12" :lg="8" class="tr">
               <el-form-item label="">
                 <el-button size="mini" @click="resetScreenForm">清空</el-button>
                 <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -632,6 +632,7 @@ export default {
 
           if (this.roleObj.type === 0) {
             params.adminWebsitIds = this.$refs.tree.getCheckedKeys();
+            params.roleName = this.roleObj.name;
             if (this.roleObj.name === "经销商") {
               params.customerId = this.AccountForm.dealer;
               params.isGroupCompany = this.AccountForm.isGroup;