bug修改，角色调整

src/api/system/user/types.ts

@@ -55,7 +55,7 @@ export interface UserVO extends BaseEntity {
  */
 export interface UserForm {
   id?: string;
-  syncMemberFlag: boolean;
+  syncMemberFlag: string;
   userId?: string;
   deptId?: number;
   userName: string;

src/views/oms/aftersale/index.vue

@@ -59,7 +59,7 @@
           <el-table-column label="退款金额" prop="returnAmount" width="120" align="center" />
           <el-table-column label="售后类型" prop="type" width="80" align="center">
             <template v-slot="scope">
-            {{ getAftersaleTypeText(scope.row) }}
+              {{ getAftersaleTypeText(scope.row) }}
             </template>
           </el-table-column>
           <el-table-column label="申请时间" prop="createTime" width="180" align="center">
@@ -258,7 +258,7 @@ export default {
       this.loading = true;
       const { pageNum, pageSize } = this.queryParams;
       const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum, size: pageSize };
       listOmsAftersale(query, pageReq).then((response) => {
         const { records, total } = response.data || {};
         this.omsAftersaleList = records;

src/views/oms/order/index.vue

@@ -516,7 +516,7 @@ export default {
         query.receiverCity = null;
         query.receiverDistrict = null;
       }
-      const pageReq = { current: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum , size: pageSize };
       listOmsOrder(query, pageReq).then((response) => {
         const { records, total } = response.data || {};
         this.omsOrderList = records;

src/views/oms/orderDeliveryHistory/index.vue

@@ -124,7 +124,7 @@ export default {
       this.loading = true;
       const { pageNum, pageSize } = this.queryParams;
       const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum, size: pageSize };
       listOmsOrderDeliveryHistory(query, pageReq).then((response) => {
         const { records, total } = response.data || {};
         this.omsOrderDeliveryHistoryList = records;

src/views/pms/brand/index.vue

@@ -25,7 +25,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"  v-hasPermi="['pms:brand:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['pms:brand:add']">新增</el-button>
           </el-col>
         </el-row>
       </template>
@@ -134,7 +134,7 @@ export default {
       this.loading = true;
       const { pageNum, pageSize } = this.queryParams;
       const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum, size: pageSize };
       listPmsBrand(query, pageReq).then((response) => {
         const { records, total } = response.data || {};
         this.pmsBrandList = records;

src/views/system/user/index.vue

@@ -131,13 +131,7 @@
                   <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
                 </el-tooltip>
                 <el-tooltip v-if="scope.row.userId !== 1" content="分配租户" placement="top">
-                  <el-button
-                    v-hasPermi="['system:user:edit']"
-                    link
-                    type="primary"
-                    icon="CircleCheck"
-                    @click="handleAuthTenant(scope.row)"
-                  ></el-button>
+                  <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Reading" @click="handleAuthTenant(scope.row)"></el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -387,7 +381,7 @@ const initFormData: UserForm = {
   remark: '',
   postIds: [],
   roleIds: [],
-  syncMemberFlag: true
+  syncMemberFlag: ''
 };
 
 const initData: PageData<UserForm, UserQuery> = {

src/views/ums/member/index.vue

@@ -732,7 +732,7 @@ export default {
       this.loading = true;
       const { current: pageNum, size: pageSize } = this.queryParams;
       let query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
+      const pageReq = { current: pageNum, size: pageSize };
       if (!this.dateRange || this.dateRange.length > 0) {
         query = { ...this.addDateRange2(query, this.dateRange) };
       }