From 13101873f30dca416b38ed34ca527cdf0ed5eabd Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 31 Dec 2024 09:21:33 +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/views/lecturer/ExternalLecturer.vue      |  1 +
 src/views/lecturer/InsideLecturer.vue        |  1 +
 src/views/lecturer/LecturerFeeStatistics.vue | 16 +++++++--------
 src/views/lecturer/Organization.vue          | 21 ++++++++++++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index d93ed152..ca3aec27 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -753,6 +753,7 @@ export default {
       getTeacherById({id:state.id}).then((res) => {
         console.log("外部讲师详情", res.data);
         state.formParam = res.data.data
+        state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime == null ? 0 : state.formParam.defaultTeachingTime
         state.formParam.description = state.formParam.description == null ? '<p><br></p>' : state.formParam.description
         state.formParam.photo = state.formParam.photo == null ? null : state.formParam.photo.includes('upload') ? res.data.data.photo : '/upload'+res.data.data.photo
       })
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index e64d0bfd..915112ae 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -1294,6 +1294,7 @@ export default {
           //     objA.neworgName= objA.neworgName[objA.neworgName.length-1]
           // }
           state.formParam = res.data.data
+          state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime == null ? 0 : state.formParam.defaultTeachingTime
           state.formParam.description = state.formParam.description == null ? '<p><br></p>' : state.formParam.description
           state.formParam.workExperience = state.formParam.workExperience == null ? '<p><br></p>' : state.formParam.workExperience
           state.formParam.courses = state.formParam.courses == null ? '<p><br></p>' : state.formParam.courses
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index 660f7be4..6b8e2446 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -247,14 +247,14 @@ export default {
     watch(
     )
     const columns = ref([
-      {
-        title: '编号 ',
-        dataIndex: 'trainOrgId',
-        key: 'trainOrgId',
-        ellipsis: true,
-        align: "center",
-        width:'100px',
-      },
+      // {
+      //   title: '编号 ',
+      //   dataIndex: 'trainOrgId',
+      //   key: 'trainOrgId',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width:'100px',
+      // },
       {
         title: '培训发生组织 ',
         dataIndex: 'trainOrgName',
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 141ff09f..f039c762 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -90,6 +90,9 @@
       </a-modal>
     </div>
     <!-- 抽屉 -->
+    <div class="example" v-if="example">
+      <a-spin />
+    </div>
     <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" :closable="false" :title="false" placement="right" width="60%" :maskClosable="false" >
       <div style="padding:24px;">
         <div class="headers" style="margin-top: -24px">
@@ -318,6 +321,7 @@ export default{
     setup() {
       const formRef = ref();
       const state = reactive({
+        example: false,
         editParams: true,
         editIndex: 0,
         tableDataTotal: 0,
@@ -816,6 +820,7 @@ const getTableDate = (obj) => {
     dialog({
       content: val?'是否确认提交，一旦提交将进入（BPM系统）审核流程。':'是否确认保存？',
       ok: () => {
+        state.example = true;
         if (state.vf == false) {
           updateTrainOrg(state.formParam).then(res => {
             if(res.data.code == 200){
@@ -826,10 +831,12 @@ const getTableDate = (obj) => {
               message.error(res.data.msg)
             }
             state.teacherdialog = false;
+            state.example = false;
           }).catch(err=>{
             message.destroy();
             message.error(err.data.msg)
             state.teacherdialog = false;
+            state.example = false;
             cancel()
           })
         }else {
@@ -838,11 +845,13 @@ const getTableDate = (obj) => {
             state.teacherdialog = false;
             cancel()
             searchSubmit();
+            state.example = false;
           }).catch(err=>{
             message.destroy();
             message.error(err.data.msg)
             state.teacherdialog = false;
             cancel()
+            state.example = false;
           })
         }
       }
@@ -903,6 +912,18 @@ const getTableDate = (obj) => {
 
 </script>
 <style lang="scss" scoped>
+.example{
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.45);
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .headers {
   height: 73px;
   border-bottom: 1px solid #e8e8e8;