From 2725e011e07f40d542518fd3050a7a7d508d493d Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Fri, 15 Nov 2024 14:47:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lecturerFeeManagement.js        |  2 ++
 src/views/lecturer/ExternalTeaching.vue | 17 +++++++++---
 src/views/lecturer/InsideLecturer.vue   |  1 +
 src/views/lecturer/InsideTeaching.vue   | 35 ++++++++++++++++++-------
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js
index a850af9d..152ff332 100644
--- a/src/api/lecturerFeeManagement.js
+++ b/src/api/lecturerFeeManagement.js
@@ -1,4 +1,6 @@
 import http from "./config";
+//内部授课页面 -- 讲师费详情
+export const getExpenseByCourseId = (obj) => http.get('/admin/teacherExpense/getExpenseByCourseId', {params: obj})
 // 获取讲师费列表
 export const getTeacherFeeList = (obj) => http.get('/admin/teacherExpense/list', {params: obj})
 //获取讲师费详情
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index ff884f2d..bbd2fac1 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -242,8 +242,8 @@
           ? '已开课' : '' }}</a-descriptions-item>
         <a-descriptions-item label="内容分类  ">{{ formParam.courseTypeName }}</a-descriptions-item>
         <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate }}</a-descriptions-item>
-        <a-descriptions-item label="授课时长  ">{{ formParam.teaching }} 分钟 
-          <span style="margin-left: 10px ;" v-if="formParam.teaching != null">({{ (formParam.teaching / 60
+        <a-descriptions-item label="授课时长  ">  <span > {{ formParam.teaching }} 分钟</span> 
+          <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
           ).toFixed(2) }}小时)</span>
         </a-descriptions-item>
         <a-descriptions-item label="评分  ">{{ formParam.score }}</a-descriptions-item>
@@ -297,9 +297,9 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, computed } from "vue";
+import { reactive, toRefs, ref, computed,onMounted } from "vue";
 import { useRouter } from "vue-router";
-import { useStore } from "vuex";
+import { useStore ,useRoute} from "vuex";
 import {
   RightOutlined,
   UpOutlined,
@@ -328,6 +328,15 @@ export default {
     ImportWork,
   },
   setup() {
+    onMounted(() => {
+      const search = sessionStorage.getItem('searchLecturer')
+      if(route.query.activeKey == 1){
+        state.moreid = 2
+        state.searchParam = JSON.parse(search)
+      }
+      searchSubmit()
+    })
+    const route = useRoute()
     const formRef = ref();
     const store = useStore();
     const router = useRouter();
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 273ecca7..f624d2b3 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -186,6 +186,7 @@
           <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; "
+              :maxLength="8"
                 @blur="clearNonNumber" placeholder="0" allowClear  suffix="分钟">
               </a-input>
                <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime === null">0.00小时</span>
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 5b180d86..a6e072db 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -133,11 +133,16 @@
           :scroll="{ x: 1500 }" :data-source="tableData" :loading="tableLoading" @expand="expandTable"
           :pagination="false">
           <template #bodyCell="{ record, column }">
+            <template v-if="column.key === 'teaching'">
+              <a-space style="display:flex ;justify-content: space-around;  ">
+                  <span>{{ record.teaching }} 分钟</span> 
+              </a-space>
+            </template>
             <template v-if="column.key === 'operation'">
               <a-space>
                 <a-button type="link"    @click="() => handleLook(record, String(record.courseform))">查看</a-button>
                 <a-button type="link" @click="() => handleModify(record, String(record.courseform))"   v-if="record.createFrom == 1 && record.courseStatus == 0 ">修改 </a-button>
-                <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                <a-button type="link" v-if="record.createFrom == 1" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
               </a-space>
             </template>
@@ -322,8 +327,10 @@
         <a-descriptions-item label="课程名称">{{ formParam.courseName }}</a-descriptions-item>
         <a-descriptions-item label="开课状态">{{ formParam.courseStatus == 0? '未开课' : formParam.courseStatus == 1
           ? '已开课' : '' }}</a-descriptions-item>
-        <a-descriptions-item label="授课时长  "><span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{
-          (formParam.teaching / 60).toFixed(2) }}小时</span> </a-descriptions-item>
+        <a-descriptions-item label="授课时长  ">
+          <span > {{ formParam.teaching }} 分钟</span> 
+          <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
+          ).toFixed(2) }}小时)</span> </a-descriptions-item>
         <a-descriptions-item label="授课/课程日期  ">{{ formParam.teachingDate }}</a-descriptions-item>
         <a-descriptions-item label="参训人数  ">{{ formParam.studys }}</a-descriptions-item>
         <a-descriptions-item label="评分  ">{{ formParam.score }}</a-descriptions-item>
@@ -391,9 +398,9 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref,computed ,watch} from "vue";
+import { reactive, toRefs, ref,computed ,watch ,onMounted} from "vue";
 import moment, { Moment } from 'moment';
-import { useRouter } from "vue-router";
+import { useRouter,useRoute  } from "vue-router";
 import {
   RightOutlined,
   UpOutlined,
@@ -407,7 +414,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 import { message } from "ant-design-vue";
 import { getTeacherSystemList, infoteacher, getTeacherExpertise } from "../../api/Lecturer";
 import { getNewInTeacherCourseList, getOrganization, getTeacherCourseList, insertInTeacherCourse, updateInTeacherCourse,  deleteInTeacherCourse } from "../../api/Teaching";
-import{getTeacherFeeDetail} from "../../api/lecturerFeeManagement";
+import{getExpenseByCourseId} from "../../api/lecturerFeeManagement";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 import ImportWork from "../../components/lecturer/ImportWork.vue";
 import { fileUp } from "../../api/Lecturer";
@@ -431,6 +438,15 @@ export default {
     FolderAddOutlined,//图标--新增
   },
   setup() {
+    onMounted(() => {
+      const search = sessionStorage.getItem('searchLecturer')
+      if(route.query.activeKey == 1){
+        state.moreid = 2
+        state.searchParam = JSON.parse(search)
+      }
+      searchSubmit()
+    })
+    const route = useRoute()
     const formRef = ref();
     const router = useRouter();
     const state = reactive({
@@ -724,7 +740,8 @@ export default {
         dataIndex: 'teaching',
         key: 'teaching',
         elipsis: true, align: "center",
-        width: 120,
+        scopedSlots: { customRender: "teaching" },
+        width: 400, 
       },
       {
         title: '参训人数',
@@ -931,7 +948,7 @@ export default {
       console.log( state.formParam)
       if (state.vf == false) {
         updateInTeacherCourse(state.formParam).then(response => {
-            message.success("修改成功");
+            message.success("编辑成功");
             state.teacherdialog = false;
             cancel()
             getTableDate(); 
@@ -1155,7 +1172,7 @@ export default {
     // },
     ])
     const gettableDatas = (record) => {
-      getTeacherFeeDetail({ id: record.id })
+      getExpenseByCourseId({ id: record.id })
         .then((res) => {
           console.log(res)
           tableDatas.value = res.data.data.records

From 0cdea1c5900e2b7b67dd5b808b822de976007e68 Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Fri, 15 Nov 2024 16:13:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue | 4 ++--
 src/views/lecturer/ExternalTeaching.vue | 4 ++--
 src/views/lecturer/InsideTeaching.vue   | 2 +-
 src/views/lecturer/LecturerFee.vue      | 4 ++--
 src/views/lecturer/LecturerSystem.vue   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index a9e0e5fc..67fe9edf 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -540,7 +540,7 @@ export default {
       state.formParam = {...state.formParam}
       if (state.vf == false) {
           updateInTeacher(state.formParam).then(response => {
-            message.success("修改成功");
+            message.success("编辑成功");
             state.teacherdialog = false;
             cancel()
             getTableDate(); 
@@ -549,7 +549,7 @@ export default {
         else {
           insertTeacher(state.formParam)
             .then((res) => {
-              message.success("保存成功");
+              message.success("新增成功");
               state.teacherdialog = false;
               cancel()
         getTableDate(); 
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index bbd2fac1..7b56c59d 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -687,7 +687,7 @@ export default {
       state.formParam = { ...state.formParam }
       if (state.vf == false) {
         updateInTeacherCourse(state.formParam).then(response => {
-          message.success("修改成功");
+          message.success("编辑成功");
           state.teacherdialog = false;
           cancel()
           getTableDate();
@@ -696,7 +696,7 @@ export default {
       else {
         insertInTeacherCourse(state.formParam)
           .then((res) => {
-            message.success("保存成功");
+            message.success("新增成功");
             state.teacherdialog = false;
             cancel()
             getTableDate();
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index a6e072db..2e3d5a98 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -957,7 +957,7 @@ export default {
         else {
           insertInTeacherCourse(state.formParam)
             .then((res) => {
-              message.success("保存成功");
+              message.success("添加成功");
               state.teacherdialog = false;
               cancel()
         getTableDate(); 
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index b55ce759..ccfd6e03 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -1008,7 +1008,7 @@ getAllLevelList().then((res) => {
       state.formParam.name = state.formParam?.name?.split('/')[0]
       if (state.vf == false) {
         updateTeacherFee(state.formParam).then(response => {
-            message.success("修改成功");
+            message.success("编辑成功");
             state.teacherdialog = false;
             cancel()
             getTableDate(); 
@@ -1021,7 +1021,7 @@ getAllLevelList().then((res) => {
         else {
           addTeacherFee(state.formParam)
             .then((res) => {
-              message.success("保存成功");
+              message.success("新增成功");
               state.teacherdialog = false;
               cancel()
               getTableDate(); 
diff --git a/src/views/lecturer/LecturerSystem.vue b/src/views/lecturer/LecturerSystem.vue
index 6dc494ab..dcaaa5d5 100644
--- a/src/views/lecturer/LecturerSystem.vue
+++ b/src/views/lecturer/LecturerSystem.vue
@@ -389,7 +389,7 @@ export default {
         .then(() => {
           if (state.vf == false) {
             updateSystem(state.formParam).then(response => {
-          message.success("修改成功");
+          message.success("编辑成功");
           state.teacherdialog = false;
           cancel()
       getTableDate();
@@ -398,7 +398,7 @@ export default {
       else {
         addLecturerSystem(state.formParam)
           .then((res) => {
-            message.success("保存成功");
+            message.success("新增成功");
             state.teacherdialog = false;
             cancel()
       getTableDate();

From b04493865f7649288efcc146c8c24666f7d78682 Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Fri, 15 Nov 2024 16:48:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 4 ++--
 src/views/lecturer/InsideLecturer.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 7b56c59d..8830b2b8 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -298,8 +298,8 @@
 </template>
 <script lang="jsx">
 import { reactive, toRefs, ref, computed,onMounted } from "vue";
-import { useRouter } from "vue-router";
-import { useStore ,useRoute} from "vuex";
+import { useRouter ,useRoute} from "vue-router";
+import { useStore } from "vuex";
 import {
   RightOutlined,
   UpOutlined,
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index a27f70b1..4b3637fa 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -979,7 +979,7 @@ export default {
       state.formParam = {...state.formParam,...state.tSystemNames}
       if (state.vf == false) {
         updateInTeacher(state.formParam).then(response => {
-            message.success("修改成功");
+            message.success("编辑成功");
             state.teacherdialog = false;
             cancel()
             getTableDate(); 
@@ -991,7 +991,7 @@ export default {
         else {
           insertTeacher(state.formParam)
             .then((res) => {
-              message.success("保存成功");
+              message.success("新增成功");
               state.teacherdialog = false;
               cancel()
         getTableDate();