From 6fcd227418599076a2f56af68f6d1c8e29232022 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 17 May 2023 17:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Esso?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrgTable.vue |  2 +-
 src/views/System/Org.vue    | 28 ++++++++++++++--------------
 src/views/System/User.vue   | 20 ++++++++++----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue
index f6e3f0e..164ca55 100644
--- a/src/components/OrgTable.vue
+++ b/src/components/OrgTable.vue
@@ -679,7 +679,7 @@ export default {
         }
       }
       const param = {
-        pageNo: this.page,
+        page: this.page,
         pageSize: this.pageSize,
         ...this.searchForm
       }
diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue
index 6e4615b..7ca4700 100644
--- a/src/views/System/Org.vue
+++ b/src/views/System/Org.vue
@@ -47,7 +47,7 @@
                 <vxe-column show-overflow type="checkbox" width="77"></vxe-column>
                 <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
                     <template #default="{ row, rowIndex }">
-                        {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+                        {{ rowIndex + (q.page - 1) * q.pageSize + 1 }}
                     </template>
                 </vxe-column>
                 <vxe-column show-overflow show-header-overflow field="departmentCode" title="部门编码"></vxe-column>
@@ -74,7 +74,7 @@
             <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="q.pageNo"
+                :current-page="q.page"
                 :page-sizes="[5, 10, 20]"
                 :page-size="q.pageSize"
                 layout="total, sizes, prev, pager, next, jumper"
@@ -91,7 +91,7 @@
                   <el-form-item label="部门编码:" required>
                     <el-input v-model="form.departmentCode" :disabled="dialogTitle=='编辑'" maxlength="50" show-word-limit placeholder="请输入部门编码"></el-input>
                   </el-form-item>
-                  <el-form-item label="部门级别:" required>
+                  <el-form-item label="部门级别:" >
                     <el-input v-model="form.leveL" maxlength="10" show-word-limit placeholder="请输入部门级别"></el-input>
                   </el-form-item>
                   <el-form-item label="父部门编码:" >
@@ -150,7 +150,7 @@ export default {
       q: {
         longName: '', // 用户名
         // roleName: '', // 角色名称
-        pageNo: 1,
+        page: 1,
         pageSize: 10
       },
       total: 0,
@@ -173,7 +173,7 @@ export default {
   },
   methods: {
     search () {
-      this.q.pageNo = 1
+      this.q.page = 1
       this.sysOrgList()
     },
     // 多选用户
@@ -190,10 +190,10 @@ export default {
       this.$api.org.sysOrgList(this.q).then(({ data }) => {
         this.tableData = data.records
         this.total = data.total
-        this.q.pageNo = data.current
+        this.q.page = data.current
         this.q.pageSize = data.size
-        if (!data.records.length && this.q.pageNo !== 1) {
-          this.q.pageNo = 1
+        if (!data.records.length && this.q.page !== 1) {
+          this.q.page = 1
           this.sysOrgList()
         }
       })
@@ -203,7 +203,7 @@ export default {
       this.q = {
         longName: '', // 部门名称
         // roleName: '', // 角色名称
-        pageNo: 1,
+        page: 1,
         pageSize: 10
       }
       this.total = 0
@@ -213,12 +213,12 @@ export default {
     // 单页数据量
     handleSizeChange (val) {
       this.q.pageSize = val
-      this.q.pageNo = 1
+      this.q.page = 1
       this.sysOrgList()
     },
     // 第几页
     handleCurrentChange (val) {
-      this.q.pageNo = val
+      this.q.page = val
       this.sysOrgList()
     },
     // 新增
@@ -264,9 +264,9 @@ export default {
       if (!this.form.departmentCode) {
         return this.$message.warning('请检查部门编码') && false
       }
-      if(!this.form.leveL ){
-        return this.$message.warning('请检查部门级别') && false
-      }
+      // if(!this.form.leveL ){
+      //   return this.$message.warning('请检查部门级别') && false
+      // }
       if ( !(/^[0-9]*$/.test(this.form.leveL))) {
         return this.$message.warning('部门级别只能为纯数字') && false
       }
diff --git a/src/views/System/User.vue b/src/views/System/User.vue
index 2f8434a..0416f8d 100644
--- a/src/views/System/User.vue
+++ b/src/views/System/User.vue
@@ -47,7 +47,7 @@
                 <vxe-column show-overflow type="checkbox" width="77"></vxe-column>
                 <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
                     <template #default="{ row, rowIndex }">
-                        {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+                        {{ rowIndex + (q.page - 1) * q.pageSize + 1 }}
                     </template>
                 </vxe-column>
                 <vxe-column show-overflow show-header-overflow field="ACCOUNT" title="用户名"></vxe-column>
@@ -74,7 +74,7 @@
             <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="q.pageNo"
+                :current-page="q.page"
                 :page-sizes="[5, 10, 20]"
                 :page-size="q.pageSize"
                 layout="total, sizes, prev, pager, next, jumper"
@@ -141,7 +141,7 @@ export default {
       q: {
         account: '', // 用户名
         roleName: '', // 角色名称
-        pageNo: 1,
+        page: 1,
         pageSize: 10
       },
       total: 0,
@@ -182,7 +182,7 @@ export default {
       this.visibleOrgTable=true
     },
     search () {
-      this.q.pageNo = 1
+      this.q.page = 1
       this.sysUserList()
     },
     // 获取所有用户
@@ -190,10 +190,10 @@ export default {
       this.$api.user.sysUserList(this.q).then(({ data }) => {
         this.tableData = data.records
         this.total = data.total
-        this.q.pageNo = data.current
+        this.q.page = data.current
         this.q.pageSize = data.size
-        if (!data.records.length && this.q.pageNo !== 1) {
-          this.q.pageNo = 1
+        if (!data.records.length && this.q.page !== 1) {
+          this.q.page = 1
           this.sysUserList()
         }
       })
@@ -203,7 +203,7 @@ export default {
       this.q = {
         account: '', // 用户名
         roleName: '', // 角色名称
-        pageNo: 1,
+        page: 1,
         pageSize: 10
       }
       this.total = 0
@@ -213,12 +213,12 @@ export default {
     // 单页数据量
     handleSizeChange (val) {
       this.q.pageSize = val
-      this.q.pageNo = 1
+      this.q.page = 1
       this.sysUserList()
     },
     // 第几页
     handleCurrentChange (val) {
-      this.q.pageNo = val
+      this.q.page = val
       this.sysUserList()
     },
     // 新增