From 5c76f6411f99bb608d80713ee0e9f2a624c51697 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 13 Nov 2024 13:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/SearchTeacher.vue    |  9 ++++++---
 src/views/lecturer/ExternalLecturer.vue     | 16 ++++++++++++---
 src/views/lecturer/InsideLecturer.vue       | 17 ++++++++++++----
 src/views/lecturer/LecturerFee.vue          | 12 +++++++----
 src/views/lecturer/LecturerList.vue         |  9 ++++++++-
 src/views/lecturer/LookExternalLecturer.vue |  4 ++--
 src/views/lecturer/LookInsideLecturer.vue   |  4 ++--
 src/views/lecturer/Organization.vue         | 22 +++++++++++++++++----
 8 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue
index 71229b67..9c8c702c 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -201,7 +201,7 @@ const searchMember = (keyword) => {
           tSystemName:item.tSystemName,
           sLevelName:item.sLevelName,
           payrollPlaceCode: item.payrollPlaceCode,
-          payrollPlaceName:item.payrollPlaceName
+          payrollPlaceName:item.payrollPlaceName,
         }
       })
     }else{
@@ -230,10 +230,13 @@ const searchMember = (keyword) => {
           orgId: item.departId,
           tSystemName:item.tsystemName,
           sLevelName:item.sLevelName,
-          payrollPlaceCode: item.payrollPlaceCode,
-          payrollPlaceName:item.payrollPlaceName,
+          payrollPlaceCode: item.salaryId,
+          payrollPlaceName:item.salaryName,
           tlevelName: item.tlevelName,  //讲师级别
           tlevelId: item.tlevelId,      //讲师级别id
+          // salaryName: item.salaryName,    //发薪地
+          // salaryId: item.salaryId,
+          levelPay: item.levelPay
         }
       })
     }
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 5ba5f633..cea52a86 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -250,9 +250,9 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref,watch ,computed} from "vue";
+import { reactive, toRefs, ref,watch ,computed,onMounted} from "vue";
 import Editor from "@/components/project/Editor";
-import { useRouter } from "vue-router";
+import { useRouter,useRoute } from "vue-router";
 import { message } from "ant-design-vue";
 import {
   UploadOutlined,
@@ -275,6 +275,14 @@ export default {
     UploadOutlined,//图标--导出
   },
   setup() {
+    onMounted(() => {
+      const search = sessionStorage.getItem('searchExter')
+      if(route.query.activeKey == 2){
+        state.searchParam = JSON.parse(search)
+      }
+      searchSubmit()
+    })
+    const route = useRoute();
     const formRef = ref();
     const router = useRouter();
     const userInfo = computed(() => store.state.userInfo);
@@ -432,6 +440,7 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
+      state.searchParam.pageNo = 1
       getTableDate();
     };
     //重置
@@ -462,7 +471,7 @@ export default {
           message.error(err.data.msg)
         })
     };
-    getTableDate()
+    // getTableDate()
     //   // 翻页
     const changePagination = (page,pageSize) => {
       state.searchParam.pageNo = page;
@@ -650,6 +659,7 @@ export default {
     // }
     //表格内查看数据操作
     const handleLook = (record) => {
+      sessionStorage.setItem('searchExter', JSON.stringify(state.searchParam))
       let id = record.id
       router.push({ path: '/LookExternalLecturer', query: { id } })
     }
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 4e8edf06..5554d5aa 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -361,7 +361,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch,computed } from "vue";
+import { reactive, toRefs, ref, watch,computed,onMounted } from "vue";
 import { useStore } from "vuex";
 import {
   RightOutlined,
@@ -373,7 +373,7 @@ import Editor from "@/components/project/Editor";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import SearchTeacher from "@/components/project/SearchTeacher";
 import { message } from "ant-design-vue";
-import { useRouter } from "vue-router";
+import { useRouter,useRoute  } from "vue-router";
 import { getTeacherSystemList, getTeacherList, getPayRollPlace, getLevel, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState } from "../../api/Lecturer";
  import { fileUp } from "../../api/indexEval";
 import { teacherUpload } from "../../api/Teaching";
@@ -397,6 +397,15 @@ export default {
     UploadDragger,
   },
   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();
@@ -870,7 +879,7 @@ export default {
           message.error(err.data.msg)
         })
     };
-    getTableDate()
+    // getTableDate()
     //   // 翻页
     const changePagination = (page, pageSize) => {
       state.searchParam.pageNo = page;
@@ -1131,7 +1140,7 @@ export default {
     // }
     // //表格内查看数据操作
     const handleLook = (record) => {
-
+      sessionStorage.setItem('searchLecturer', JSON.stringify(state.searchParam))
       let id = record.id
       router.push({ path: '/LookInsideLecturer', query: { id } })
     }
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8b2ee91d..efcb5d8b 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -282,7 +282,7 @@
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item label="课酬基准" name="levelPay">
-                <a-input v-model:value="formParam.levelPay" placeholder="可手动更改"
+                <a-input v-model:value="formParam.levelPay" placeholder="自动键入"
                 @blur="clearlevelPayNumber"
                   allowClear showSearch  class="draitem">
                 </a-input>
@@ -364,23 +364,24 @@
 @closa="cancelTeachingDialog" :maskClosable="true"  width="60%" title="查看讲师费用">
 <span class="line"></span>
 <span>讲师费用详情</span>
-<a-descriptions style="padding-bottom: 35px;" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
+<a-descriptions style="padding-bottom: 35px;" bordered :column="2" :contentStyle="rowCenter" :labelStyle="{width:'160px'}">
     <a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
     <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
     <a-descriptions-item label="讲师组织" :span="2">{{formParam.orgName}}</a-descriptions-item>
     <a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item>
     <a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item>
     <a-descriptions-item label="发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="费用类型">"差字段"</a-descriptions-item>
+    <a-descriptions-item label="费用类型">{{{1:'在线',2:'面授',3:'课程'}[formParam?.courseType]}}</a-descriptions-item>
     <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item>
     <a-descriptions-item label="课程名称">{{formParam.courseName || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="授课时长  ">{{formParam.teachingDate || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="授课时长  ">{{formParam.teachingTime || '-'}}</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>
     <a-descriptions-item label="课酬基准  ">{{formParam.levelPay || '-'}}</a-descriptions-item>
     <a-descriptions-item label="计划费用  ">{{formParam.expense || '-'}}</a-descriptions-item>
     <a-descriptions-item label="应发费用  ">{{formParam.payableExpense || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item>
     <a-descriptions-item label="状态">{{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':'-'}}</a-descriptions-item>
     <a-descriptions-item label="备注  ">{{formParam.remark || '-'}}</a-descriptions-item>
   </a-descriptions>
@@ -1341,6 +1342,9 @@ const column = ref([
       const tlevelChange = (e) => {
         state.formParam.tlevelName = e?.tlevelName
         state.formParam.tlevelId = e?.tlevelId
+        // state.formParam.payrollPlace = e?.salaryName
+        // state.formParam.payrollPlaceId = e?.salaryId
+        state.formParam.levelPay = e?.levelPay
       }
       //导出功能
       const handleExport = ()=>{
diff --git a/src/views/lecturer/LecturerList.vue b/src/views/lecturer/LecturerList.vue
index ba5cb775..52bb7a0f 100644
--- a/src/views/lecturer/LecturerList.vue
+++ b/src/views/lecturer/LecturerList.vue
@@ -14,9 +14,10 @@
           </div>
   </template>
   <script lang="jsx">
-  import { reactive, toRefs, ref, watch } from "vue";
+  import { reactive, toRefs, ref, watch,onMounted } from "vue";
   import InsideLecturer from "../lecturer/InsideLecturer.vue"
   import ExternalLecturer from "../lecturer/ExternalLecturer.vue"
+  import { useRoute } from 'vue-router'
   import { useStore } from 'vuex'
    export default {
     name: "LecturerList",
@@ -25,12 +26,18 @@
       ExternalLecturer
     },
     setup() {
+      const route = useRoute()
       const store = useStore()
       const state = reactive({
         activeKey:'1'
       })
       watch(
       )
+      onMounted(() => {
+        if(route.query.activeKey){
+          state.activeKey = route.query.activeKey
+        }
+      })
      return {
         ...toRefs(state),
       }
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index 1f890bba..945983c3 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -5,9 +5,9 @@ ExternalLecturer
     <div class="LookExternalLecturer">
     <a-layout-header style="background: white;color: black; font-size: 20px ;">
      <span>查看讲师</span>
-     <router-link to="/lecturerList" class="goback">
+     <router-link :to="{ path: '/lecturerList', query: { activeKey: '2', } }" class="goback">
             <span class="return"></span>
-            <router-link class="returntext" to="/lecturerList" style="line-height:47px ">
+            <router-link class="returntext" :to="{ path: '/lecturerList', query: { activeKey: '2', } }" style="line-height:47px ">
               返回
             </router-link>
           </router-link>
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index e991f023..49f55531 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -3,12 +3,12 @@
     <div class="LookInsideLecturer">
     <a-layout-header style="background: white;color: black; font-size: 20px ;">
      <span>查看讲师</span>
-     <router-link to="/lecturerList" class="goback">
+     <router-link :to="{ path: '/lecturerList', query: { activeKey: '1', } }" class="goback">
             <span class="return"></span>
             <!-- <router-link class="returntext" to="/lecturerList" style="line-height:47px ">
               返回
             </router-link> -->
-            <div class="returntext" to="/goback" style="line-height:47px " @click="goback">
+            <div class="returntext" to="/goback" style="line-height:47px ">
               返回
               </div>
           </router-link>
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 9aab6844..e86bda9b 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -644,18 +644,32 @@ const getTableDate = (obj) => {
       content: val?'是否确认提交，一旦提交将进入（BPM系统）审核流程。':'是否确认保存？',
       ok: () => {
         if (state.vf == false) {
-          updateTrainOrg(state.formParam).then(response => {
-            message.success("修改成功");
+          updateTrainOrg(state.formParam).then(res => {
+            if(res.data.code == 200){
+              message.success("修改成功");
+              cancel()
+              searchSubmit();
+            }else{
+              message.error(res.data.msg)
+            }
+            state.teacherdialog = false;
+          }).catch(err=>{
+            message.destroy();
+            message.error(err.data.msg)
             state.teacherdialog = false;
             cancel()
-            searchSubmit();
-          });
+          })
         }else {
           addReviewer(state.formParam).then((res) => {
             message.success("保存成功");
             state.teacherdialog = false;
             cancel()
             searchSubmit();
+          }).catch(err=>{
+            message.destroy();
+            message.error(err.data.msg)
+            state.teacherdialog = false;
+            cancel()
           })
         }
       }