人员列表接口替换

zhangwencui

7 天以前 bd96ac239ba897edc2f8bed5cfb426e0f54ee877

人员列表接口替换

 src/api/personnelManagement/onboarding.js

@@ -47,3 +47,11 @@
    method: "get",
  });
}
// 查询在职员工台账
export function staffOnJobListPage(query) {
    return request({
        url: '/staff/staffOnJob/listPage',
        method: 'get',
        params: query,
    })
}

 src/pages.json

@@ -535,13 +535,13 @@
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/productionManagement/operationScheduling/index",
      "style": {
        "navigationBarTitleText": "工序排产",
        "navigationStyle": "custom"
      }
    },
    // {
    //   "path": "pages/productionManagement/operationScheduling/index",
    //   "style": {
    //     "navigationBarTitleText": "工序排产",
    //     "navigationStyle": "custom"
    //   }
    // },
    {
      "path": "pages/productionManagement/productionReport/index",
      "style": {
@@ -549,13 +549,13 @@
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/productionManagement/productionCosting/index",
      "style": {
        "navigationBarTitleText": "生产核算",
        "navigationStyle": "custom"
      }
    },
    // {
    //   "path": "pages/productionManagement/productionCosting/index",
    //   "style": {
    //     "navigationBarTitleText": "生产核算",
    //     "navigationStyle": "custom"
    //   }
    // },
    {
      "path": "pages/inventoryManagement/receiptManagement/index",
      "style": {
@@ -800,4 +800,4 @@
    "navigationBarTitleText": "RuoYi",
    "navigationBarBackgroundColor": "#FFFFFF"
  }
}
}

 src/pages/index.vue

@@ -86,29 +86,29 @@
    <!--      </view>-->
    <!--    </view>-->
    <!--    &lt;!&ndash; 协同办公模块 &ndash;&gt;-->
    <!--    <view class="common-module collaboration-module">-->
    <!--      <view class="module-header">-->
    <!--        <view class="module-title-container">-->
    <!--          <text class="module-title">协同办公</text>-->
    <!--        </view>-->
    <!--      </view>-->
    <!--      <view class="module-content">-->
    <!--        <up-grid :border="false"-->
    <!--                 col="4">-->
    <!--          <up-grid-item v-for="(item, index) in collaborationItems"-->
    <!--                        :key="index"-->
    <!--                        @click="handleCommonItemClick(item)">-->
    <!--            <view class="icon-container"-->
    <!--                  :style="{ background: item.bgColor }">-->
    <!--              <up-icon :name="item.icon"-->
    <!--                       :size="58"-->
    <!--                       color="#ffffff"></up-icon>-->
    <!--            </view>-->
    <!--            <text class="item-label">{{item.label}}</text>-->
    <!--          </up-grid-item>-->
    <!--        </up-grid>-->
    <!--      </view>-->
    <!--    </view>-->
    <view class="common-module collaboration-module">
      <view class="module-header">
        <view class="module-title-container">
          <text class="module-title">协同办公</text>
        </view>
      </view>
      <view class="module-content">
        <up-grid :border="false"
                 col="4">
          <up-grid-item v-for="(item, index) in collaborationItems"
                        :key="index"
                        @click="handleCommonItemClick(item)">
            <view class="icon-container"
                  :style="{ background: item.bgColor }">
              <up-icon :name="item.icon"
                       :size="58"
                       color="#ffffff"></up-icon>
            </view>
            <text class="item-label">{{item.label}}</text>
          </up-grid-item>
        </up-grid>
      </view>
    </view>
    <!-- 生产管控模块 -->
    <!--        <view class="common-module production-module">-->
    <!--            <view class="module-header">-->

 src/pages/managementMeetings/meetApplication/index.vue

@@ -151,7 +151,7 @@
              <u-checkbox v-for="option in employees"
                          :key="option.id"
                          :name="option.id"
                          :label="`${option.staffName} (${option.postJob})`"
                          :label="`${option.staffName} (${option.postName})`"
                          class="checkbox-item"></u-checkbox>
            </view>
          </u-checkbox-group>
@@ -178,7 +178,7 @@
    saveMeetingApplication,
    getRoomEnum,
  } from "@/api/managementMeetings/meeting";
  import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
  import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
  import dayjs from "dayjs";

  const userStore = useUserStore();
@@ -412,10 +412,12 @@
    initPageData();
    initTimeOptions();
    getMeetingRooms();
    getStaffOnJob().then(res => {
      employees.value = res.data.sort((a, b) =>
        a.postJob.localeCompare(b.postJob)
    staffOnJobListPage().then(res => {
      console.log(res.data.records, "res.data.records");
      employees.value = res.data.records.sort((a, b) =>
        a.postName.localeCompare(b.postName)
      );
      console.log(employees.value, "employees.value");
    });
  });


 src/pages/managementMeetings/meetExamine/index.vue

@@ -102,7 +102,7 @@
    getExamineList,
    getRoomEnum,
  } from "@/api/managementMeetings/meetExamine";
  import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
  import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
  import { onShow } from "@dcloudio/uni-app";
  import useUserStore from "@/store/modules/user";
  import dayjs from "dayjs";
@@ -138,10 +138,10 @@
  const staffList = ref([]);
  // 员工列表查询
  const getStaffOnJobList = () => {
    return getStaffOnJob()
    return staffOnJobListPage()
      .then(res => {
        console.log(res.data, "res.data");
        staffList.value = res.data;
        staffList.value = res.data.records;
      })
      .catch(() => {
        closeToast();
@@ -174,7 +174,7 @@
            .map(staff => {
              return {
                id: staff.id,
                name: `${staff.staffName}(${staff.postJob})`,
                name: `${staff.staffName}(${staff.postName})`,
              };
            });
          console.log(it, "it2");

 src/pages/managementMeetings/meetPublish/index.vue

@@ -102,7 +102,7 @@
    getMeetingPublish,
    getRoomEnum,
  } from "@/api/managementMeetings/meetExamine";
  import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
  import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
  import { onShow } from "@dcloudio/uni-app";
  import useUserStore from "@/store/modules/user";
  import dayjs from "dayjs";
@@ -138,10 +138,10 @@
  const staffList = ref([]);
  // 员工列表查询
  const getStaffOnJobList = () => {
    return getStaffOnJob()
    return staffOnJobListPage()
      .then(res => {
        console.log(res.data, "res.data");
        staffList.value = res.data;
        staffList.value = res.data.records;
      })
      .catch(() => {
        closeToast();
@@ -174,7 +174,7 @@
            .map(staff => {
              return {
                id: staff.id,
                name: `${staff.staffName}(${staff.postJob})`,
                name: `${staff.staffName}(${staff.postName})`,
              };
            });
          console.log(it, "it2");

 src/pages/managementMeetings/meetSummary/index.vue

@@ -102,7 +102,7 @@
    getMeetingPublish,
    getRoomEnum,
  } from "@/api/managementMeetings/meetExamine";
  import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
  import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
  import { onShow } from "@dcloudio/uni-app";
  import useUserStore from "@/store/modules/user";
  import dayjs from "dayjs";
@@ -138,10 +138,10 @@
  const staffList = ref([]);
  // 员工列表查询
  const getStaffOnJobList = () => {
    return getStaffOnJob()
    return staffOnJobListPage()
      .then(res => {
        console.log(res.data, "res.data");
        staffList.value = res.data;
        staffList.value = res.data.records;
      })
      .catch(() => {
        closeToast();
@@ -169,12 +169,13 @@
          it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format(
            "HH:mm:ss"
          )} ~ ${dayjs(it.endTime).format("HH:mm:ss")}`;
          console.log(staffList.value, "staffList.value");
          it.participants = staffList.value
            .filter(staff => staffs.some(id => id == staff.id))
            .map(staff => {
              return {
                id: staff.id,
                name: `${staff.staffName}(${staff.postJob})`,
                name: `${staff.staffName}(${staff.postName})`,
              };
            });
          console.log(it, "it2");