讲师管理bug

src/api/Lecturer.js

@@ -68,7 +68,7 @@ export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id
 //撤回培训发生组织
 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
 //讲师费统计详情
-export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId}`)
+export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}`)
 //查看月度讲师费详情
 export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}&startTime=${obj.startTime}&endTime=${obj.endTime}`)
 //查询未汇总的数据（批量确认弹框）

src/views/lecturer/ExternalTeaching.vue

@@ -481,15 +481,18 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.type == "1" || value.record.type == "0"
+                {String(value.record.type)
-                ? {
+                  ? {
-                  "1": "在线课",
+                    "0": "在线课",
-                  "0": "面授课",
+                    "1": "面授课",
-                }[value.record.type + ""] || ""
+                    "2": "课程开发",
-                : "-"}
+                    "3": "作业员入模培训",
-            </div>
+                    "4": "其他",
-          )
+                  }[value.record.type + ""]
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/ExternalTeachingDetail.vue

@@ -287,15 +287,18 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.waitStatus == "0" || value.record.waitStatus == "1"
+                {String(value.record.waitStatus)
-                ? {
+                  ? {
-                  "0": "在线课",
+                    "0": "在线课",
-                  "1": "面授课",
+                    "1": "面授课",
-                }[value.record.waitStatus + ""] || ""
+                    "2": "课程开发",
-                : "-"}
+                    "3": "作业员入模培训",
-            </div>
+                    "4": "其他",
-          )
+                  }[value.record.waitStatus + ""]
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/InsideTeaching.vue

@@ -706,15 +706,18 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.type == "1" || value.record.type == "0"
+                {String(value.record.type)
-                ? {
+                  ? {
-                  "1": "在线课",
+                    "0": "在线课",
-                  "0": "面授课",
+                    "1": "面授课",
-                }[value.record.type + ""] || ""
+                    "2": "课程开发",
-                : "-"}
+                    "3": "作业员入模培训",
-            </div>
+                    "4": "其他",
-          )
+                  }[value.record.type + ""]
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/InsideTeachingDetail.vue

@@ -295,15 +295,18 @@ export default {
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.waitStatus == "0" || value.record.waitStatus == "1"
+                {String(value.record.waitStatus)
-                ? {
+                  ? {
-                  "0": "在线课",
+                    "0": "在线课",
-                  "1": "面授课",
+                    "1": "面授课",
-                }[value.record.waitStatus + ""] || ""
+                    "2": "课程开发",
-                : "-"}
+                    "3": "作业员入模培训",
-            </div>
+                    "4": "其他",
-          )
+                  }[value.record.waitStatus + ""]
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/LecturerAPPEdit.vue

@@ -744,14 +744,14 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {String(value.record. courseType)
+              {String(value.record.courseType)
                 ? {
                   "0": "在线课",
                   "1": "面授课",
                   "2": "课程开发",
                   "3": "作业员入模培训",
                   "4": "其他",
-                }[value.record. courseType + ""]
+                }[value.record.courseType + ""]
                 : "-"}
             </div>
           )

src/views/lecturer/LecturerApproval.vue

@@ -919,14 +919,14 @@
           customRender: (value) => {
             return (
               <div>
-                {String(value.record. courseType)
+                {String(value.record.courseType)
                   ? {
                     "0": "在线课",
                     "1": "面授课",
                     "2": "课程开发",
                     "3": "作业员入模培训",
                     "4": "其他",
-                  }[value.record. courseType + ""]
+                  }[value.record.courseType + ""]
                   : "-"}
               </div>
             )

src/views/lecturer/LecturerFee.vue

@@ -846,14 +846,14 @@ getAllLevelList().then((res) => {
           customRender: (value) => {
             return (
               <div>
-                {String(value.record. courseType)
+                {String(value.record.courseType)
                   ? {
                     "0": "在线课",
                     "1": "面授课",
                     "2": "课程开发",
                     "3": "作业员入模培训",
                     "4": "其他",
-                  }[value.record. courseType + ""]
+                  }[value.record.courseType + ""]
                   : "-"}
               </div>
             )
@@ -1440,12 +1440,14 @@ const column = ref([
           customRender: (value) => {
             return (
               <div>
-                {value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3"
+                {String(value.record.courseType)
                   ? {
-                    "1": "项目开课",
+                    "0": "在线课",
-                    "2": "路径开课",
+                    "1": "面授课",
-                    "3": "面授开课",
+                    "2": "课程开发",
-                  }[value.record. courseType + ""] || ""
+                    "3": "作业员入模培训",
+                    "4": "其他",
+                  }[value.record.courseType + ""]
                   : "-"}
               </div>
             )

src/views/lecturer/LookExternalLecturer.vue

@@ -201,16 +201,18 @@ export default{
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.type == 1 || value.record.type == 2 || value.record.type == 0
+                {String(value.record.type)
-                ? {
+                  ? {
-                  "1": "在线课",
+                    "0": "在线课",
-                  "2": "路径开课",
+                    "1": "面授课",
-                  "0": "面授课",
+                    "2": "课程开发",
-                }[value.record.type + ""] || ""
+                    "3": "作业员入模培训",
-                : "-"}
+                    "4": "其他",
-            </div>
+                  }[value.record.type + ""]
-          )
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/LookInsideLecturer.vue

@@ -270,16 +270,18 @@ export default{
         width: 120,
         customRender: (value) => {
           return (
-            <div>
+              <div>
-              {value.record.type == 1 || value.record.type == 2 || value.record.type == 0
+                {String(value.record.type)
-                ? {
+                  ? {
-                  "1": "在线课",
+                    "0": "在线课",
-                  "0": "面授课",
+                    "1": "面授课",
-                  "2": "其他",
+                    "2": "课程开发",
-                }[value.record.type + ""] || ""
+                    "3": "作业员入模培训",
-                : "-"}
+                    "4": "其他",
-            </div>
+                  }[value.record.type + ""]
-          )
+                  : "-"}
+              </div>
+            )
         }
       },
       {

src/views/lecturer/MonthlyStatistics.vue

@@ -51,7 +51,7 @@
 								:tree-data="sysTypeOptions"
                 v-on:keydown.enter="enterPressHadlerSearch">
 							</a-tree-select> -->
-            <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.courseTypeId"
+            <a-select style="width: 230px" placeholder="请选择培训发生组织" v-model:value="searchParam.trainOrgId"
                 :options="getOrganizationList">
               </a-select>
           </a-form-item>
@@ -77,14 +77,6 @@
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
               </a-space>
             </template>
-            <template v-if="column.key === 'teacherOrg'">
-              <a-space style="display:flex ;justify-content: space-around;  ">
-                <a-popover>
-    <template #content>
-      <p>{{ record.teacherOrg }}</p>
-    </template>
-    </a-popover></a-space>
-  </template>
           </template>
         </a-table>
       </div>
@@ -117,7 +109,7 @@
         </a-form-item>
         <a-form-item class="select ">
           <a-range-picker format="YYYY-MM-DD"
-          valueFormat="YYYY-MM-DD" style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px" v-model:value="drawersearchdate" separator="至"
+          valueFormat="YYYY-MM-DD" style="width: 260px; height: 40px; margin-bottom: 20px; border-radius: 8px" v-model:value="drawer.drawersearchdate" separator="至"
             :placeholder="['      开始时间', '        结束时间']" @change="searchTimeChange" />
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -125,7 +117,7 @@
           <a-button class="resetbtn " @click="searchResetdrawer">重置</a-button>
 </div>
 </a-form>
-<span>讲师费发放情况</span>
+<!-- <span>讲师费发放情况</span> -->
 <a-table :scroll="{ x: 'max-content'}" :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column"  :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
             <template #bodyCell="{ record, column }">
             </template>
@@ -196,12 +188,12 @@ export default {
         departId: null,
         summaryDate:null,
         id: route.query.id,
-        trainOrgId: '',
+        // trainOrgId: '',
       },
       name:null,
       drawer: {
         name: '',
-        drawersearchdate: '',
+        drawersearchdate: [],
         pageNo: '1',
         pageSize: '10',
         endTime: '',
@@ -210,6 +202,13 @@ export default {
     })
     watch(
     )
+    const endOrg = (val) => {
+      if(val){
+        const parts = val.split('/');
+        const reversedParts = parts.reverse();
+        return reversedParts.join('/');
+      }
+    }
         //获取内容分类
         const store = useStore();
     const sysTypeOptions = computed(() => store.state.content_type);
@@ -237,12 +236,14 @@ export default {
         ellipsis: true,
         align: "center",
         width: 200,
-        scopedSlots: { customRender: "teacherOrg" },
+        customRender: ({text})=>{
+          return endOrg(text)
+        }
       },
       {
         title: '发薪地',
-        dataIndex: 'trainOrgName',
+        dataIndex: 'payrollPlace',
-        key: 'trainOrgName',
+        key: 'payrollPlace',
         ellipsis: true,
         align: "center",
         width: 200,
@@ -303,6 +304,7 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
+      state.searchParam.pageNo = 1;
       getTableDate();
     };
 
@@ -354,7 +356,7 @@ export default {
           let array = [];
           arr?.map((value) => {
             let obj = {
-              value: value.affiliationCode,
+              value: value.id,
               label: value.affiliationName,
             };
             array.push(obj);
@@ -368,18 +370,25 @@ export default {
     const handleLook = (record) => {
       state.drawer={
         name: '',
-        drawersearchdate: '',
+        drawersearchdate: [],
         pageNo: '1',
         pageSize: '10',
         endTime: '',
         startTime: '',
+        id: record.id,
       }
       state.opendrawer=true
       searchSubmitdrawer()
     }
     const searchTimeChange = (e) => {
-      state.drawer.startTime = e[0]
+      console.log(e,'eeeee')
-      state.drawer.endTime = e[1]
+      if(e){
+        state.drawer.startTime = e[0]
+        state.drawer.endTime = e[1]
+      }else{
+        state.drawer.startTime = ''
+        state.drawer.endTime = ''
+      }
       
     }
     const changePagination = (page, pageSize) => {
@@ -394,7 +403,7 @@ export default {
         `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherSummary?
         &name=${state.searchParam.name ? state.searchParam.name : ""}
         &billId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}
-        &trainOrgId=${state.searchParam.courseTypeId || ''}`)
+        &trainOrgId=${state.searchParam.trainOrgId || ''}`)
     }
      //重置
      const searchReset = () => {
@@ -406,19 +415,21 @@ export default {
           payrollPlaceId: null,
           departId: '',
           summaryDate:'',
-          trainOrgId: '',
+          // trainOrgId: '',
         };
         getTableDate();
       };
       //二级页面重置
       const searchResetdrawer =()=>{
+        const id = state.drawer.id
         state.drawer={
           name: '',
-          drawersearchdate: '',
+          drawersearchdate: [],
           pageNo: '1',
           pageSize: '10',
           endTime: '',
           startTime: '',
+          id,
         }
         searchSubmitdrawer()
       }
@@ -426,7 +437,7 @@ export default {
       const searchSubmitdrawer=()=>{
         state.tableLoadings = true
         const params = {
-          summaryId: '',
+          summaryId: state.drawer.id,
           name: state.drawer.name,
           endTime: state.drawer.endTime,
           startTime: state.drawer.startTime,
@@ -471,12 +482,14 @@ export default {
           customRender: (value) => {
             return (
               <div>
-                {value.record. courseType == "1" || value.record. courseType == "2"|| value.record.courseTypeype == "3"
+                {String(value.record.courseType)
                   ? {
-                    "1": "项目开课",
+                    "0": "在线课",
-                    "2": "路径开课",
+                    "1": "面授课",
-                    "3": "面授开课",
+                    "2": "课程开发",
-                  }[value.record. courseType + ""] || ""
+                    "3": "作业员入模培训",
+                    "4": "其他",
+                  }[value.record.courseType + ""]
                   : "-"}
               </div>
             )
@@ -501,22 +514,22 @@ export default {
       },
       {
           title: '讲师体系',
-          dataIndex: 'systemName',
+          dataIndex: 'tsystemName',
-          key: 'systemName',
+          key: 'tsystemName',
         ellipsis: true, align: "center",
           width: 120,
         },
       {
           title: '讲师级别 ',
-          dataIndex: 'levelName',
+          dataIndex: 'tlevelName',
-          key: 'levelName',
+          key: 'tlevelName',
         ellipsis: true, align: "center",
           width: 120,
         },
       {
         title: '讲师发薪地 ',
-        dataIndex: 'teacherpayrollPlace',
+        dataIndex: 'payrollPlace',
-        key: 'teacherpayrollPlace',
+        key: 'payrollPlace',
         ellipsis: true,
         align: "center",
         width: 120,
@@ -524,8 +537,8 @@ export default {
     
       {
           title: '基准课酬 ',
-          dataIndex: 'teacherlevelPay',
+          dataIndex: 'levelPay',
-          key: 'teacherlevelPay',
+          key: 'levelPay',
         ellipsis: true, align: "center",
           width: 100,
         },
@@ -553,7 +566,7 @@ export default {
         
         state.drawer={
           name: '',
-          drawersearchdate: '',
+          drawersearchdate: [],
           pageNo: '1',
           pageSize: '10',
           endTime: '',
@@ -590,6 +603,7 @@ export default {
       getOrganizationLista,
       searchResetdrawer,
       sysTypeOptions,
+      endOrg,
     }
   },
 };