导出数据调整

2025-12-18 07:16:46 +08:00 · 2024-11-13 14:38:00 +08:00
parent 572d39d3bb
commit aa27a245d8
8 changed files with 56 additions and 76 deletions
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -100,14 +100,14 @@
        <a-row :gutter="16">
          <a-col :span="24">
            <a-form-item label="讲师名称" name="name">
-              <a-input v-model:value="formParam.name" class="draitem"   :maxlength="20"
+              <a-input v-model:value.trim="formParam.name" class="draitem"   :maxlength="20"
            placeholder="请输入讲师姓名" allowClear showSearch>
          </a-input>  
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item label="手机号码" name="mobile" prop="mobile">
-                <a-input  v-model:value="formParam.mobile"  class="draitem"
+                <a-input  v-model:value.trim="formParam.mobile"  class="draitem"
                  placeholder="请输入手机号码" allowClear showSearch   :maxLength="11" @blur="sendPhone">
                </a-input>
            </a-form-item>
@@ -117,7 +117,7 @@
        <a-row :gutter="16">
          <a-col :span="24">
            <a-form-item label="供应商" name="supplier">
-              <a-input  v-model:value="formParam.supplier"  class="draitem"   :maxlength="30"
+              <a-input  v-model:value.trim="formParam.supplier"  class="draitem"   :maxlength="30"
                  placeholder="请输入供应商" allowClear showSearch>
                </a-input>
            </a-form-item>
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -802,14 +802,7 @@ export default {
    const handleExport = () => {
      window.open(
        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?pageNo=${state.searchParam.pageNo
-        }&pageSize=${state.searchParam.pageSize}
-        &name=${state.searchParam.name ? state.searchParam.name : ""}
-        &courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}
-        &entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}
-        &beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}
-        &endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}
-        &courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}
-        &courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
+        }&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}&entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
      );
    }
    const clearstudysNumber = () => {
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -11,7 +11,7 @@
          </a-input>
        </a-form-item>
        <a-form-item class="select">
-          <a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId" allowClear
+          <a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam." allowClear
            :options="LecturerSystemList" @change="changetlevel">
          </a-select>
        </a-form-item>
@@ -75,16 +75,16 @@
          @expand="expandTable" :pagination="false">
          <template #bodyCell="{ record, column }">

-            <!-- <template v-if="column.key === 'orgName'">
+            <template v-if="column.key === 'orgName'">
              <a-space style="display:flex ;justify-content: space-around;  ">
                <a-popover>
                  <template #content>
-                    <p>{{ record.orgName }}</p>
+                    <p>{{ record.orgName}}</p>
                  </template>
                  <span>{{ record.neworganizationName }}</span>
                </a-popover>
              </a-space>
-            </template> -->
+            </template>
            <template v-if="column.key === 'operation'">
              <a-space>
                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
@@ -113,7 +113,7 @@
    </div>
    <!-- 弹窗组件 -->
    <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
-      width="40%" :title="teacherdialogtitle">
+      width="60%" :title="teacherdialogtitle">
      <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
        <a-row>
          <a-col :span="24">
@@ -154,7 +154,6 @@
                <template #content>
                  {{ formParam.orgNames }}
                </template>
-
                <a-input disabled v-model:value="formParam.orgName" class="draitem"
                  placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                </a-input>
@@ -185,9 +184,9 @@
          <a-col :span="24">
            <a-form-item label="初始授课时长" name="defaultTeachingTime">
              <a-input v-model:value="formParam.defaultTeachingTime" style="width:80%; height: 40px; border-radius: 8px; "
-                @blur="clearNonNumber" placeholder="0" allowClear showSearch suffix="分钟">
+                @blur="clearNonNumber" placeholder="0" allowClear  suffix="分钟">
              </a-input>
-               <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime == null">0.00小时</span>
+               <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime === null">0.00小时</span>
              <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime != null">{{
                (formParam.defaultTeachingTime / 60).toFixed(2) }}小时</span>
            </a-form-item>
@@ -315,7 +314,7 @@
              <span>提示</span>
            </div>
            <div class="body">
-              <span>您确定要删除此讲师吗</span>
+              <span>确定要将该讲师删除吗</span>
            </div>
            <div class="del_btnbox">
              <div class="del_btn btn2" @click="cancelTeacherDialog1" style="margin-right: 32px">
@@ -853,16 +852,17 @@ export default {
      let objA = { ...state.searchParam };
      getTeacherList(objA)
        .then((res) => {
-          tableData.value = res.data.data.records
+          // tableData.value = res.data.data.records
          console.log(tableData.value,'tableData.value')
-          // let objA = res.data.data.records
-          // objA.map((item) => {
-          //   if (item.orgName !== null) {
-          //     item.neworganizationName = item.orgName.split('/')
-          //     item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
-          //   }
-          // })
-          // tableData.value = objA
+          let objA = res.data.data.records
+          objA.map((item) => {
+            if (item.orgName !== null) {
+              item.neworganizationName = item.orgName.split('/')
+              item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
+            }
+            // console.log(item.orgName)
+          })
+          tableData.value = objA
          state.tableDataTotal = Number(res.data.data.total);
          state.tableLoading = false
        }).catch(err => {
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -1173,19 +1173,7 @@ export default {
    const handleExport = () => {
      window.open(
        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo
-        }&pageSize=${state.searchParam.pageSize} 
-        &recordType=1
-        &name=${state.searchParam.name ? state.searchParam.name : ""}
-        &courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}
-        &createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ""}
-        &courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}
-        &tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}
-        &beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}
-        &endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}
-        &orgId=${state.searchParam.orgId ? state.searchParam.orgId : ""}
-        &courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}
-        &scoreranges=${state.searchParam.scoreranges ? state.searchParam.scoreranges : ""}
-        &studysranges=${state.searchParam.studysranges ? state.searchParam.studysranges : ""}
+        }&pageSize=${state.searchParam.pageSize}&recordType=1&name=${state.searchParam.name ? state.searchParam.name :''}&courseName=${state.searchParam.courseName ? state.searchParam.courseName :''}&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ''}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus :''}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ''}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ''}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ''}&orgId=${state.searchParam.orgId ? state.searchParam.orgId :''}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ''}&scoreranges=${state.searchParam.scoreranges ? state.searchParam.scoreranges : ''}&studysranges=${state.searchParam.studysranges ? state.searchParam.studysranges : ' '}
      `)
      console.log(state.searchParam.name,state.searchParam,'参数')
    }
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -884,13 +884,7 @@
      //导出功能
      const handleExport = ()=>{
        window.open (
-          `${process.env.VUE_APP_BASE_API}/teacher/fee/exportTeacherFee?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&teacherNo=${
-            state.searchParam.teacherNo ? state.searchParam.teacherNo : ""
-          }&tsystemName=${ state.searchParam.tsystemName ?  state.searchParam.tsystemName : ""}&levelId=${
-            state.searchParam.levelId ? state.searchParam.levelId : ""
-          }&courseType=${ state.searchParam.courseType ?  state.searchParam.courseType : ""}&certStatus=${
-            state.searchParam.certStatus ? state.searchParam.certStatus : ""
-          }&salaryName=${state.searchParam.salaryName ?  state.searchParam.salaryName : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ?  state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
+          `${process.env.VUE_APP_BASE_API}/teachez/fee/exportTeacherFee?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&trainorgId=${state.searchParam.trainorgId ? state.searchParam.trainorgId : ""}&status=${ state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${ state.searchParam.endTime ?  state.searchParam.endTime : ""}`
        );
        // this.download('lesson_records/export', {
        //           ...state.searchParam
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1345,10 +1345,7 @@ const column = ref([
      const handleExport = ()=>{
        window.open (
          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
-          }&tsystemId=${ state.searchParam.tsystemId ?  state.searchParam.tsystemId : ""}&levelId=${state.searchParam.levelId ? state.searchParam.levelId : ""
-          }&courseType=${ state.searchParam.courseType ?  state.searchParam.courseType : ""}&certStatus=${
-            state.searchParam.certStatus ? state.searchParam.certStatus : ""
-          }&salaryName=${state.searchParam.salaryName ?  state.searchParam.salaryName : ""}&status=${state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
+          }&trainOrgId=${ state.searchParam.trainOrgId ?  state.searchParam.trainOrgId : ""}&type=${state.searchParam.type ? state.searchParam.type : ""}&tsystemId=${ state.searchParam.tsystemId ?  state.searchParam.tsystemId : ""}&levelId=${ state.searchParam.levelId ? state.searchParam.levelId : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
        );
        // this.download('lesson_records/export', {
        //           ...state.searchParam
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -5,7 +5,7 @@
    <div class="filter" >
      <a-form layout="inline">
          <a-form-item  class="select">
-            <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="请选择资源归属" allowClear
+            <a-select style="width: 276px" v-model:value="searchParam.trainOrgId" placeholder="请选择资源归属" allowClear
              :options="TrainOrglist" 
              v-on:keydown.enter="enterPressHadlerSearch"/>
          </a-form-item>
@@ -81,7 +81,7 @@
                </a-input>
              </div>
              <div class="select">
-                <a-select style="width: 230px" v-model:value="queryFeeMonthly.trainorgId" placeholder="发薪地"
+                <a-select style="width: 230px" v-model:value="queryFeeMonthly.trainOrgId" placeholder="发薪地"
                  :options="TrainOrglist">
                </a-select>
              </div>
@@ -100,7 +100,7 @@
                @expand="expandTable" :pagination="false">
                <template #bodyCell="{ record, column }">
                  <template v-if="column.key === 'operationa'">
-                    <a-space style="display:flex ;justify-content: space-around;  ">
+                    <a-space style="display:flex ;justify-content: space-around;">
                      <a-button type="link" @click="() => handleLooka(record, String(record.courseform))">查看</a-button>
                    </a-space>
                  </template>
@@ -196,19 +196,19 @@ export default {
      teacherdialog: false,
      teacherdialoga: false,
      teacherdialogtitle: null,
-      // searchdate: null, //选择时间
-      startTime: null, //开始时间
-      endTime: null, //结束时间
+      searchdate: null, //选择时间
+      // startTime: null, //开始时间
+      // endTime: null, //结束时间
      searchParam: {
        pageNo: "1",
        pageSize: "10",
-        searchdate: null, //选择时间
+        summaryDate: null, //选择时间
        // startDate: null,
        // endDate: null,
      },
      queryFeeMonthly: {
        teacherNo: null,
-        trainorgId: null,
+        trainOrgId: null,
        departId: null,
        pageNo: "1",
        pageSize: "10"
@@ -286,10 +286,10 @@ export default {
    };
     //修改时间
     const searchTimeChange = (e, date) => {
-      console.log(date);
-      console.log(state.searchdate );
-      state.searchdate =date;
-      // console.log(date, state.searchParam.startDate, state.searchParam.endDate);
+      // console.log(date);
+      // console.log(state.searchdate );
+      // state.searchdate =date;
+      // // console.log(date, state.searchParam.startDate, state.searchParam.endDate);
    };
    //二级页面搜索
    const searchFeeMonthlya = () => {
@@ -299,7 +299,7 @@ export default {
    const getTableDate = (obj) => {
      state.tableLoading = true
      let objA = { ...state.searchParam };
-      objA.searchdate=state.searchdate!==null? state.searchdate: "", 
+      objA.summaryDate = state.searchdate ? dayjs(state.searchdate).format("YYYY-MM-DD") : "",
      console.log(objA)
      expenseSummaryList(objA)
        .then((res) => {
@@ -323,12 +323,12 @@ export default {
    }
     //重置
     const searchReset = () => {
+      state.searchdate=null,
        state.searchParam = { 
          pageNo: "1",
        pageSize: "10",
-        startDate: null,
-        endDate: null,
-        trainorgId: null,
+        summaryDate: null,
+        trainOrgId: null,
        };
        getTableDate();
      };
@@ -358,18 +358,18 @@ export default {
    const TrainOrglista = () => {
      getTrainOrg().then((res) => {
        if (res.data.code === 200) {
-          let arr = res.data.data;
+          let arr = res.data.data.records;
          let array = [];
          arr.map((value) => {
            let obj = {
              value: value.id,
-                label: value.name,
+                label: value.affiliationName,
            };
            array.push(obj);
          });
          TrainOrglist.value = array;
        }
-        console.log("获取发薪地", TrainOrglist);
+        console.log("获取发薪地",TrainOrglist);
      })
    }
    TrainOrglista()
@@ -411,7 +411,7 @@ export default {
    const cancel = () => {
      state.queryFeeMonthly = {
        teacherNo: null,
-        trainorgId: null,
+        trainOrgId: null,
        departId: null,
        pageNo: "1",
        pageSize: "10"
@@ -745,7 +745,7 @@ export default {
      window.open(
        `${process.env.VUE_APP_BASE_API}/teacher/fee/exportTeacherMonthlyFee?pageNo=${state.currentPage2
        }&pageSize=${state.pageSize2}
-        &userNo=${state.queryFeeMonthly.trainorgId ? state.queryFeeMonthly.trainorgId : ""}
+        &userNo=${state.queryFeeMonthly.trainOrgId ? state.queryFeeMonthly.trainOrgId : ""}
        &teacherNo=${state.queryFeeMonthly.teacherNo ? state.queryFeeMonthly.teacherNo : ""}
        &departId=${state.queryFeeMonthly.departId ? state.queryFeeMonthly.departId : ""}`)
    }
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -203,7 +203,7 @@ export default {
    const sysTypeOptions = computed(() => store.state.content_type);
    const columns = ref([
      {
-        title: '讲师姓名 ',
+        title: '讲师名称',
        dataIndex: 'name',
        key: 'name',
        elipsis: true,
@@ -251,6 +251,14 @@ export default {
        align: "center",
        width: 200,
      },
+      {
+        title: '开发课程时长 ',
+        dataIndex: 'teachingTime',
+        key: 'teachingTime',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
      {
        title: '计划费用 ',
        dataIndex: 'expense',