Browse Source

web-bug修改

liao-sea 1 year ago
parent
commit
a95c182fa4

+ 0 - 1
src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java

@@ -8,7 +8,6 @@ import com.hz.employmentsite.util.ExcelHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.InstitutionService;
-import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 

+ 0 - 3
src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -7,10 +7,7 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.JobHuntService;
 import com.hz.employmentsite.util.ExcelHelper;
-import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
-import com.hz.employmentsite.vo.companyService.PostVo;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
-import org.apache.commons.collections.IterableMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;

+ 1 - 1
src/main/java/com/hz/employmentsite/mapper/cquery/DoTaskCQuery.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface DoTaskCQuery {
-    List<DoTaskVo> getList(@Param("doTaskID") String doTaskID, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime,
+    List<DoTaskVo> getList(@Param("doTaskIDList") String doTaskIDList, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime,
                            @Param("finishStartTime") String finishStartTime, @Param("finishEndTime") String finishEndTime,
                            @Param("regionCode") String regionCode, @Param("streetCode") String streetCode,
                            @Param("workTypeId") String workTypeId, @Param("taskStatus") Integer taskStatus);

+ 1 - 1
src/main/java/com/hz/employmentsite/mapper/cquery/DoWorkCQuery.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface DoWorkCQuery {
-    List<DoWorkVo> getList(@Param("primaryKey")String primaryKey, @Param("userName")String userName,
+    List<DoWorkVo> getList(@Param("doWorkIDList")String doWorkIDList, @Param("userName")String userName,
                            @Param("workStartDate")String workStartDate, @Param("workEndDate")String workEndDate,
                            @Param("doTypeID")Integer doTypeID, @Param("regionCode")String regionCode, @Param("streetCode")String streetCode);
 }

+ 4 - 38
src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -94,7 +94,7 @@ public class SiteUserImpl implements SiteUserService {
         Boolean isExist = dbData != null;
         SysUser curSysUserData = data.userID != null ? sysUserMapper.selectByPrimaryKey(data.userID):null;
         Boolean isLinkUser = curSysUserData != null;
-        /*SysRoleExample roleExp = null;*/
+        SysRoleExample roleExp = null;
         /*注意:这里的data.roleID为用户类型ID*/
         if (!isExist) {
             //添加
@@ -109,18 +109,7 @@ public class SiteUserImpl implements SiteUserService {
             curSysUserData.setCreateBy(userId);
             curSysUserData.setRecordStatus(1);
             result += sysUserMapper.insert(curSysUserData);
-            //处理用户角色表
-            /*roleExp = new SysRoleExample();
-            roleExp.or().andUserTypeIDEqualTo(data.getRoleID());
-            var curRoleLink= sysRoleMapper.selectByExample(roleExp).stream().toList();
-            if (curRoleLink != null && curRoleLink.size() > 0){
-                for(SysRole curLinkData : curRoleLink) {
-                    SysUserSysRoleKey newLinkData = new SysUserSysRoleKey();
-                    newLinkData.setUserID(curSysUserData.getUserID());
-                    newLinkData.setRoleID(curLinkData.getRoleID());
-                    result += sysUserSysRoleMapper.insert(newLinkData);
-                }
-            }*/
+
             //处理站点人员表
             dbData = new PcSiteUser();
             dbData.setUserID(curSysUserData.getUserID());
@@ -136,29 +125,6 @@ public class SiteUserImpl implements SiteUserService {
             result += pcSiteUserMapper.insert(dbData);
         } else {
             //修改
-
-            //处理用户角色表(先删除再添加)
-            /*SysUserSysRoleExample userRoleExp = new  SysUserSysRoleExample();
-            userRoleExp.or().andUserIDEqualTo(data.userID);
-            var curUserRoleLink = sysUserSysRoleMapper.selectByExample(userRoleExp).stream().toList();
-            if (curUserRoleLink != null && curUserRoleLink.size() > 0){
-                for(SysUserSysRoleKey curLinkData : curUserRoleLink) {
-                    userRoleExp.or().andUserIDEqualTo(curLinkData.getRoleID());
-                    result += sysUserSysRoleMapper.deleteByExample(userRoleExp);
-                }
-            }
-            roleExp = new SysRoleExample();
-            roleExp.or().andUserTypeIDEqualTo(data.roleID);
-            var curRoleLink= sysRoleMapper.selectByExample(roleExp).stream().toList();
-            if (curRoleLink != null && curRoleLink.size() > 0){
-                for(SysRole curLinkData : curRoleLink) {
-                    SysUserSysRoleKey newLinkData = new SysUserSysRoleKey();
-                    newLinkData.setUserID(data.userID);
-                    newLinkData.setRoleID(curLinkData.getRoleID());
-                    result += sysUserSysRoleMapper.insert(newLinkData);
-                }
-            }*/
-
             //处理用户表
             if(isLinkUser){
                 curSysUserData.setName(data.siteUserName);
@@ -195,9 +161,9 @@ public class SiteUserImpl implements SiteUserService {
         pcSiteUserMapper.deleteByExample(contactExample);
         if (delSiteUserData != null && delSiteUserData.size() > 0){
             for(PcSiteUser curDelData : delSiteUserData) {
-                /*SysUserSysRoleExample userRoleExp = new SysUserSysRoleExample();
+                SysUserSysRoleExample userRoleExp = new SysUserSysRoleExample();
                 userRoleExp.or().andUserIDEqualTo(curDelData.getUserID());
-                sysUserSysRoleMapper.deleteByExample(userRoleExp);*/
+                sysUserSysRoleMapper.deleteByExample(userRoleExp);
                 SysUserExample userExp = new SysUserExample();
                 userExp.or().andUserIDEqualTo(curDelData.getUserID());
                 sysUserMapper.deleteByExample(userExp);

+ 2 - 2
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -41,8 +41,8 @@ public class JobUserServiceImpl implements JobUserService {
     private PcPostMapper pcPostMapper;
 
     @Override
-    public PageInfo<JobUserVo> getList(Integer page, Integer rows, List<String> jobUserIDList, String name, String siteId, String jobStatus, Integer sexId, Integer educationTypeId, Integer emphasisTypeId) {
-        PageHelper.startPage(page, rows);
+    public PageInfo<JobUserVo> getList(Integer pageIndex, Integer pageSize, List<String> jobUserIDList, String name, String siteId, String jobStatus, Integer sexId, Integer educationTypeId, Integer emphasisTypeId) {
+        PageHelper.startPage(pageIndex, pageSize);
 
         List<JobUserVo> list = jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(jobUserIDList), name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId);
 

+ 1 - 1
src/main/java/com/hz/employmentsite/services/service/jobUserManager/JobUserService.java

@@ -10,7 +10,7 @@ import com.hz.employmentsite.vo.jobUserManager.JobUserVo;
 import java.util.List;
 
 public interface JobUserService {
-    PageInfo<JobUserVo> getList(Integer page, Integer rows,List<String> jobUserIDList, String name, String siteId, String jobStatus,Integer sexId,Integer educationTypeId,Integer emphasisTypeId);
+    PageInfo<JobUserVo> getList(Integer pageIndex, Integer pageSize,List<String> jobUserIDList, String name, String siteId, String jobStatus,Integer sexId,Integer educationTypeId,Integer emphasisTypeId);
 
     JobUserVo getDataById(String id);
 

+ 2 - 3
src/main/resources/mapping/cquery/RoleCQuery.xml

@@ -102,9 +102,8 @@
     </select>
 
     <select id="selectUserForSettingList" resultType="com.hz.employmentsite.vo.user.UserInfoModel">
-        select u.userId,u.name,u.loginId,u.userId as 'key'
-        from sys_user u
-         left join sys_user_sys_role ur on u.userId = ur.userId and ur.roleID=#{roleID}
+        select u.userId,u.name,u.loginId,u.userId as 'key',u.userTypeId
+        from sys_user u left join sys_user_sys_role ur on u.userId = ur.userId and ur.roleID=#{roleID}
         where 1=1 and u.UserTypeID = #{userType} and ur.roleID is null
     </select>
     <select id="selectRoleUserByRolename" resultType="com.hz.employmentsite.vo.user.UserInfoModel">

+ 19 - 18
vue/src/views/baseSettings/institution/edit.vue

@@ -52,8 +52,8 @@
         <a-col :span="7"></a-col>
         <a-col :span="10"></a-col>
       </a-row>
-      <a-divider orientation="left">管理驿站 共计:{{manageSites.length}}</a-divider>
-      <a-row>
+      <a-divider orientation="left" v-if="opCategory==2">管理驿站 共计:{{manageSites.length}}</a-divider>
+      <!--      <a-row>
         <a-col :span="24" style="text-align: right; margin-top: 20px; margin-right: 20px">
           <Space>
             <a-button @click="addSite">
@@ -64,8 +64,8 @@
             </a-button>
           </Space>
         </a-col>
-      </a-row>
-      <a-row>
+      </a-row>-->
+      <a-row  v-if="opCategory==2">
         <a-col style="margin-bottom: 20px;">
           <a-table :columns="columns" :data-source="manageSites" :pagination="pagination"
                    :loading="formState.loading"
@@ -76,21 +76,22 @@
             <template #bodyCell="{ column ,index}">
               <template v-if="column.key === 'siteName'">
                 <div>
-                  <a-select
+                  <a-input v-model:value="manageSites[index][column.key]" style="border:none;text-align: center;"></a-input>
+<!--                  <a-select
                     ref="select"
                     v-model:value="manageSites[index][column.key]"
                     :options="allSites"
                     @change="manageSitesChange(index,manageSites[index][column.key])"
                     :field-names="{ label: 'siteName', value: 'siteID' }" style="width: 200px" >
-                  </a-select>
+                  </a-select>-->
                 </div>
               </template>
               <template v-if="column.key === 'detailAddress'">
                    {{manageSites[index][column.key]}}
               </template>
-              <template v-if="column.key === 'operation'">
+              <!--              <template v-if="column.key === 'operation'">
                 <a-button type="link" size="small" @click="delSite(index)">删除</a-button>
-              </template>
+              </template>-->
             </template>
           </a-table>
         </a-col>
@@ -120,7 +121,6 @@ import {getSiteList,getListByInstitutionID,getSiteByID} from "@/api/baseSettings
 import BUploadFile from "@/components/file/uploadFile.vue";
 import {message, TableColumnsType, TableProps} from "ant-design-vue";
 import {getPaginationTotalTitle} from "@/utils/common";
-/*import dayjs from "dayjs";*/
 
 interface InstitutionModel {
   dataModel: any;
@@ -149,7 +149,7 @@ export default defineComponent({
       {title: '序号', align: "center",key: 'siteID',customRender: item => `${pageParams.pageSize * (pageParams.pageIndex - 1) + item.index + 1}`},
       {title: '驿站名称', dataIndex: 'siteName', key: 'siteName', align: "center"},
       {title: '驿站地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"},
-      {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},
+     /* {title: '操作', key: 'operation', fixed: 'right',width:170, align: "center"},*/
     ];
     const pagination = computed(() => ({
       total: formState.total,
@@ -174,8 +174,9 @@ export default defineComponent({
     const allSites = ref<any>([]);
     const manageSites = ref<any>([]);
 
-    const loadData = (institutionID: any) => {
+    const loadData = (institutionID: any,operateType:any) => {
       getAllSites();
+      opCategory.value = operateType;
       getInstitutionByID(institutionID).then((result: any) => {
         formData.dataModel = result;
         console.log('dataModel',formData.dataModel);
@@ -198,7 +199,7 @@ export default defineComponent({
       });
     }
 
-    const addSite = () => {
+   /* const addSite = () => {
       if(allSites.value.length >0){
         const newSite = allSites.value[0];
         (manageSites.value as any[]).push({siteID:newSite.siteID,siteName:newSite.siteName,detailAddress:newSite.detailAddress});
@@ -210,7 +211,7 @@ export default defineComponent({
     const delSite = (site) =>{
       (manageSites.value as any[]).splice(site, 1);
       validateSameSite();
-    }
+    }*/
 
     const manageSitesChange = (index:any,siteID:any) =>{
       getSiteByID(siteID).then((result :any)=> {
@@ -219,7 +220,7 @@ export default defineComponent({
         console.log("manageSites",manageSites.value);
         validateSameSite();
       });
-    }
+    };
 
     const validateSameSite = ()=>{
       isAllowCommit.value = true;
@@ -241,7 +242,6 @@ export default defineComponent({
     };
 
     const onFinish = () => {
-      console.log("sssf");
       validateSameSite();
       if (isAllowCommit.value){
         formData.dataModel.manageSites = manageSites.value;
@@ -272,8 +272,8 @@ export default defineComponent({
       isAllowCommit,
       getAllSites,
       GetManageSites,
-      addSite,
-      delSite,
+      /*addSite,
+      delSite,*/
       handleTableChange,
       onSelectChange,
       manageSitesChange,
@@ -281,7 +281,8 @@ export default defineComponent({
   },
   created() {
     const id = history.state.params?.id;
-    this.loadData(id);
+    const operateType = history.state.params?.op;
+    this.loadData(id,operateType);
   },
 })
 </script>

+ 2 - 2
vue/src/views/baseSettings/institution/index.vue

@@ -163,11 +163,11 @@ export default defineComponent({
     };
 
     const onAdd =()=>{
-      tabsViewStore.addTabByPath('/baseSettings/institution/add', {id:null});
+      tabsViewStore.addTabByPath('/baseSettings/institution/add', {id:null,op:1});
     };
 
     const onEdit = (id: string) => {
-      tabsViewStore.addTabByPath('/baseSettings/institution/edit', {id:id});
+      tabsViewStore.addTabByPath('/baseSettings/institution/edit', {id:id,op:2});
     };
 
     return {

+ 1 - 0
vue/src/views/jobUserManager/jobhunt/index.vue

@@ -272,6 +272,7 @@ import {useTabsViewStore} from "@/store/modules/tabsView";
         dataList.value = result.list;
         formState.total = result.total;
         formState.loading = false;
+        console.log("huntParams",searchParamsState);
       };
 
       const onAdd =()=>{

+ 96 - 75
vue/src/views/jobUserManager/jobuser/edit.vue

@@ -423,7 +423,7 @@
                 </div>
               </template>
               <template v-if="column.key === 'educationOperation'">
-                <a-button type="link" size="small" @click="deleteEducation(index)">删除</a-button>
+                <a-button type="link" size="small" @click="delEducation(index)">删除</a-button>
               </template>
             </template>
           </a-table>
@@ -504,11 +504,11 @@
 
 <script lang="ts">
 import {defineComponent, reactive, ref, toRefs} from 'vue';
-// import {useRouter} from 'vue-router';
 import type {SelectProps, TableColumnsType} from 'ant-design-vue';
 import {useTabsViewStore} from '@/store/modules/tabsView';
 import BUploadFile from '@/components/file/uploadFile.vue';
 import {get} from "@/api/common";
+import { getSysDictionaryList } from '@/api/system/dictionary';
 import {save, getEducationList, getDataById, getExperienceList} from '@/api/jobUserManager/jobuser'
 
 interface FormState {
@@ -539,73 +539,8 @@ export default defineComponent(
       const regionList = ref<SelectProps['options']>();
       const streetList = ref<SelectProps['options']>();
       const familyNatureList = ref<SelectProps['options']>();
-      // const fullpath = router.currentRoute.value.fullPath;
-      const tabsViewStore = useTabsViewStore();
-      const isEdit = true;
-
-      const fileList = ref();
-      const setFileList = (files) => {
-        fileList.value = files;
-      };
-
-      get('/companyService/company/getSiteList', {}).then(data => {
-        siteList.value = data;
-      })
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'Gender'}).then(data => {
-        genderList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'KeyPersonType'}).then(data => {
-        keyPersonTypeList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'JobStatus'}).then(data => {
-        jobStatusList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'MaritalStatus'}).then(data => {
-        maritalStatusList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'BloodType'}).then(data => {
-        bloodTypeList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'Health'}).then(data => {
-        healthList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'CultureLevel'}).then(data => {
-        cultureList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'PoliticsStatus'}).then(data => {
-        politicsStatusList.value = data;
-      });
-
-      get('system/area/getCityList', {}).then(data => {
-        regionList.value = data;
-      });
-
-      get('system/dictionary/getDictionaryItemByCodeList', {code: 'FamilyNature'}).then(data => {
-        familyNatureList.value = data;
-      });
-
-      const changeCity = () => {
-        if (formState.dataModel.regionCode) {
-          get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
-            streetList.value = data;
-            // formState.dataModel.streetCode = "";
-          })
-        }
-      }
-
-      const regionChange = async function () {
-        formState.dataModel.streetCode = null;
-        changeCity();
-      }
 
+      const educationData = ref([]);
       const educationColumns: TableColumnsType = [
         {
           title: '序号',
@@ -650,9 +585,85 @@ export default defineComponent(
           width: 120
         },
         {title: '操作', key: 'educationOperation', fixed: 'right', width: 120, align: "center"},
-      ]
+      ];
+      // const fullpath = router.currentRoute.value.fullPath;
+      const tabsViewStore = useTabsViewStore();
+      const isEdit = true;
+
+      const fileList = ref();
+      const setFileList = (files) => {
+        fileList.value = files;
+      };
+
+      get('/companyService/company/getSiteList', {}).then(data => {
+        siteList.value = data;
+      })
+
+      const getHealthList = () => {
+        getSysDictionaryList('Health').then((data) => {
+          healthList.value = data;
+        });
+      };
+      const getGenderList = () => {
+        getSysDictionaryList('Gender').then((data) => {
+          genderList.value = data;
+        });
+      };
+      const getCultureList = () => {
+        getSysDictionaryList('CultureLevel').then((data) => {
+          cultureList.value = data;
+        });
+      };
+      const getJobStatusList = () => {
+        getSysDictionaryList('JobStatus').then((data) => {
+          jobStatusList.value = data;
+        });
+      };
+      const getBloodTypeList = () => {
+        getSysDictionaryList('BloodType').then((data) => {
+          bloodTypeList.value = data;
+        });
+      };
+      const getFamilyNatureList = () => {
+        getSysDictionaryList('FamilyNature').then((data) => {
+          familyNatureList.value = data;
+        });
+      };
+      const getKeyPersonTypeList = () => {
+        getSysDictionaryList('KeyPersonType').then((data) => {
+          keyPersonTypeList.value = data;
+        });
+      };
+      const getMaritalStatusList = () => {
+        getSysDictionaryList('MaritalStatus').then((data) => {
+          maritalStatusList.value = data;
+        });
+      };
+      const getPoliticsStatusList = () => {
+        getSysDictionaryList('PoliticsStatus').then((data) => {
+          politicsStatusList.value = data;
+        });
+      };
+
+
+      get('system/area/getCityList', {}).then(data => {
+        regionList.value = data;
+      });
+
+      const changeCity = () => {
+        if (formState.dataModel.regionCode) {
+          get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
+            streetList.value = data;
+            // formState.dataModel.streetCode = "";
+          })
+        }
+      }
+
+      const regionChange = async function () {
+        formState.dataModel.streetCode = null;
+        changeCity();
+      }
 
-      const educationData = ref([]);
       const loadEducation = (id: any) => {
         getEducationList(id).then(data => {
           if (data)
@@ -668,7 +679,7 @@ export default defineComponent(
           major: ''
         });
       }
-      const deleteEducation = (record) => {
+      const delEducation = (record) => {
         (educationData.value as any[]).splice(record, 1);
       }
 
@@ -721,6 +732,7 @@ export default defineComponent(
       const deleteExperience = (record) => {
         (experienceData.value as any[]).splice(record, 1);
       }
+
       const addExperience = () => {
         (experienceData.value as any[]).push({
           startTime: null,
@@ -730,7 +742,6 @@ export default defineComponent(
         });
       }
 
-
       const onClose = (reload: any) => {
         tabsViewStore.closeCurrentTabByPath('/jobusermgr/jobseeker/add');
         tabsViewStore.closeCurrentTabByPath('/jobusermgr/jobseeker/edit');
@@ -749,6 +760,15 @@ export default defineComponent(
       }
 
       const loadData = (id: any) => {
+        getHealthList();
+        getGenderList();
+        getCultureList();
+        getJobStatusList();
+        getBloodTypeList();
+        getFamilyNatureList();
+        getKeyPersonTypeList();
+        getMaritalStatusList();
+        getPoliticsStatusList();
         getDataById(id).then(data => {
           formState.dataModel = data;
           if (formState.dataModel.regionCode) {
@@ -765,9 +785,9 @@ export default defineComponent(
         onFinish,
         setFileList,
         addEducation,
-        deleteEducation,
+        delEducation,
         loadEducation,
-        educationColumns,
+        siteList,
         maritalStatusList,
         formState,
         formTableState,
@@ -789,7 +809,8 @@ export default defineComponent(
         loadExperienceData,
         deleteExperience,
         addExperience,
-        experienceColumns
+        experienceColumns,
+        educationColumns,
       }
     },
     created() {

+ 9 - 10
vue/src/views/jobUserManager/jobuser/index.vue

@@ -145,7 +145,6 @@ import {message, Modal} from "ant-design-vue";
 import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from "@ant-design/icons-vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import BImportExcel from "@/components/basic/excel/importExcel/importExcel.vue";
-// import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps";
 
 export default defineComponent({
   name: 'JobUserList',
@@ -158,12 +157,12 @@ export default defineComponent({
     const searchParamsState = reactive({
       pageIndex: 1,
       pageSize: 20,
-      name: '',
-      siteId: '',
-      jobStatus: '',
-      sexId: '',
-      educationTypeId: '',
-      emphasisTypeId: ''
+      name: null,
+      siteId: null,
+      jobStatus: null,
+      sexId: null,
+      educationTypeId: null,
+      emphasisTypeId: null
     });
     const formState = reactive({
       total: 0,
@@ -175,9 +174,9 @@ export default defineComponent({
         title: '序号',
         align: 'center',
         width: 80,
-        key: 'jobUserId',
+        key: 'jobUserID',
         customRender: (item) =>
-          `${searchParamsState.pageIndex * (searchParamsState.pageSize - 1) + item.index + 1}`,
+          `${searchParamsState.pageSize * (searchParamsState.pageIndex - 1) + item.index + 1}`,
       },
       {title: '姓名', dataIndex: 'name', key: 'name', width: 100},
       {title: '公民身份号码', dataIndex: 'identityNumber', key: 'identityNumber', width: 170},
@@ -226,7 +225,6 @@ export default defineComponent({
       if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
         age--; // 生日还未过,减去一岁
       }
-
       return age;
     }
     const onSelectChange = (selectedRowKeys: any) => {
@@ -254,6 +252,7 @@ export default defineComponent({
       console.log(dataList.value);
       formState.total = result.total;
       formState.loading = false;
+      console.log("userParams",searchParamsState);
     };
 
     get('/companyService/company/getSiteList', {}).then(data => {

+ 29 - 28
vue/src/views/system/role/roleUser.vue

@@ -17,17 +17,17 @@
         :model="searchParamsState"
       >
         <a-row :gutter="24">
-          <a-col :span="8">
+          <a-col :span="10">
             <a-form-item label="帐号" :label-col="{span:10}" name="loginID">
               <a-input v-model:value="searchParamsState.loginID" placeholder=""/>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="10">
             <a-form-item label="用户名称" :label-col="{span:8}" name="name">
               <a-input v-model:value="searchParamsState.name" placeholder=""/>
             </a-form-item>
           </a-col>
-          <a-col :span="3" style="text-align: left">
+          <a-col :span="4" style="text-align: left">
             <a-button type="primary" html-type="submit" @click="loadRoleUserList">查询</a-button>
           </a-col>
         </a-row>
@@ -43,7 +43,7 @@
                  :loading="formState.loading"
                  @change="handleTableChange"
                  :row-selection="{ selectedRowKeys: formState.selectedRowKeys, onChange: onSelectChange}"
-                 :row-key="record=>record.userId"
+                 :row-key="record=>record.userID"
                  bordered>
         </a-table>
       </div>
@@ -70,10 +70,10 @@
         >
           <a-table
             :scroll="{ x: 300, y: 500 }"
-            :row-key="record=>record.userId"
+            :row-key="record=>record.userID"
             :row-selection="
             getRowSelection({
-              disabled:false,
+              disabled:true,
               selectedKeys,
               onItemSelectAll,
               onItemSelect,
@@ -105,7 +105,6 @@ import {message, Modal} from "ant-design-vue";
 import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
 
 type tableColumn = Record<string, string>;
-
 const leftTableColumns = [
   {
     dataIndex: 'name',
@@ -181,35 +180,50 @@ export default defineComponent({
                              }: Record<string, any>) => {
       return {
         onSelectAll(selected: boolean, selectedRows: any[]) {
-          const treeSelectedKeys = selectedRows
-            .map((record) => record.userId);
+          const treeSelectedKeys = selectedRows.map((record) => record.userID);
           onItemSelectAll(treeSelectedKeys, selected);
+         /* console.log("当前选择的用户id集合",targetKeys.value);
+          console.log("selectedKeys",selectedKeys);*/
         },
         onSelect(record: any, selected: boolean) {
-          debugger;
-          onItemSelect(record.userId, selected);
+          onItemSelect(record.userID, selected);
+          /*console.log("当前userList",userList.value);
+          console.log("当前选择的用户id集合",targetKeys.value);
+          console.log("selectedKeys",selectedKeys);*/
         },
         selectedRowKeys: selectedKeys,
       };
     };
 
 
+    const onSelectChange = (selectedRowKeys: any) => {
+      formState.selectedRowKeys = selectedRowKeys;
+    };
+    const getUserList = () => {
+      getUserForSettingList({userType: userTypeID.value, roleID: searchParamsState.roleID}).then((result: any) => {
+        userList.value = result;
+      });
+    };
     const handleTableChange: TableProps['onChange'] = (
       pag: { pageSize: number; current: number }
     ) => {
       searchParamsState.page = pag.current
       loadRoleUserList();
     };
-    const onSelectChange = (selectedRowKeys: any) => {
-      formState.selectedRowKeys = selectedRowKeys;
-    };
+
+    const saveRoleUser = () => {
+      saveRoleUserList(searchParamsState.roleID, targetKeys.value).then(() => {
+        visibleUserModal.value = false;
+        loadRoleUserList();
+      });
+
+    }
 
     const show = (roleID, userType) => {
       searchParamsState.roleID = roleID;
       userTypeID.value = userType;
       formState.selectedRowKeys = [];
       formState.total = 0;
-
       loadRoleUserList();
       visible.value = true;
     };
@@ -250,28 +264,15 @@ export default defineComponent({
       getUserList();
     }
 
-    const saveRoleUser = () => {
-      saveRoleUserList(searchParamsState.roleID, targetKeys.value).then(() => {
-        visibleUserModal.value = false;
-        loadRoleUserList();
-      });
-
-    }
 
     const loadRoleUserList = async function () {
       formState.loading = true;
       const result: any = await getRoleUserList(searchParamsState);
-
       roleUserList.value = result.list;
       formState.total = result.total;
       formState.loading = false;
     }
 
-    const getUserList = () => {
-      getUserForSettingList({userType: userTypeID.value, roleID: searchParamsState.roleID}).then((result: any) => {
-        userList.value = result;
-      });
-    };
 
 
     return {