From c2a31220b11495d0a2a8ef6467352aba71dd4d29 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 17 Dec 2024 11:19:50 +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/assets/scss/common.scss                   | 20 ++++++++
 src/components/project/BatchLecturer.vue      |  4 +-
 src/components/project/ConfirmLecturer.vue    |  4 +-
 .../project/LookExternalLecturer.vue          |  2 +-
 src/components/project/LookInsideLecturer.vue |  2 +-
 src/components/project/OrgClass.vue           | 24 +++++----
 src/views/courselibrary/CoursewareManage.vue  |  3 +-
 src/views/lecturer/ExternalLecturer.vue       |  2 +-
 src/views/lecturer/ExternalTeaching.vue       |  4 +-
 src/views/lecturer/InsideLecturer.vue         |  2 +-
 src/views/lecturer/InsideTeaching.vue         |  4 +-
 src/views/lecturer/LecturerAPPEdit.vue        |  4 +-
 src/views/lecturer/LecturerApproval.vue       |  2 +-
 src/views/lecturer/LecturerFee.vue            |  4 +-
 src/views/lecturer/MonthlyStatistics.vue      | 51 ++++++++++++++-----
 src/views/lecturer/Organization.vue           |  2 +-
 16 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 95df1ef7..9084072d 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -630,7 +630,27 @@ textarea {
 }
 
 //大型抽屉
+.largeDrawerInside {
+  .ant-drawer-content-wrapper {
+    .ant-drawer-header {
+      display: none !important;
+    }
 
+    .ant-drawer-body {
+      padding: 0;
+
+    }
+  }
+
+  .drawerMain {
+    min-width: 700px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+
+  }
+}
 
 //弹窗--------------------------------------------------------
 .modalStyle {
diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index ce467f8c..aedb440e 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -2,7 +2,7 @@
   <a-drawer
     :visible="visible"
     :closable="false"
-     class="largeDrawerStyle"
+     class="largeDrawerInside"
     placement="right"
     width="70%"
   >
@@ -301,7 +301,7 @@ const queryDrawer = () => {
 <style lang="scss" scoped>
 
 
-.largeDrawerStyle {
+.largeDrawerInside {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index f524d677..00f89d93 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -2,7 +2,7 @@
   <a-drawer
     :visible="visible"
     :closable="false"
-    class="largeDrawerStyle"
+    class="largeDrawerInside"
     placement="right"
     width="64%"
     :zIndex="1001"
@@ -533,7 +533,7 @@ const config = () => {
   }
 }
 
-.largeDrawerStyle {
+.largeDrawerInside {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index a0d52c0e..2952a66c 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -1,6 +1,6 @@
 
 <template>
-  <a-drawer :visible="visible" class="largeDrawerStyle" placement="right" :closable="false" :maskClosable="false"
+  <a-drawer :visible="visible" class="largeDrawerInside" placement="right" :closable="false" :maskClosable="false"
   width="80%" :title="false">
     <!-- 外部讲师查看详情 -->
     <div class="LookExternalLecturer">
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index c0a25b7e..284efc38 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-drawer class="largeDrawerStyle" :visible="visible" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerInside" :visible="visible" placement="right" :closable="false" :maskClosable="false"
       width="80%" :title="false">
       <!-- 内部讲师查看详情 -->
       <div class="LookInsideLecturer">
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index b9287a59..0ff1d251 100644
--- a/src/components/project/OrgClass.vue
+++ b/src/components/project/OrgClass.vue
@@ -18,6 +18,7 @@
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
     :placeholder="placeholder"
     :labelInValue="true"
+    allow-clear
     v-model:treeExpandedKeys="stuTreeExpandedKeys"
     :loading="orgLoading"
     :load-data="onLoadData"
@@ -65,10 +66,10 @@ const keydownEnter = (e) => {
 }
 watch(props, () => {
   stuTreeExpandedKeys.value = [];
-  if (labelValue.value.value !== props.value) {
+  if (labelValue.value?.value !== props.value) {
     labelValue.value = { value: props.value, label: props.name };
   }
-  if (labelValue.value.label !== props.name) {
+  if (labelValue.value?.label !== props.name) {
     labelValue.value = { value: props.value, label: props.name };
   }
 });
@@ -83,16 +84,17 @@ function onLoadData(treeNode) {
 }
 
 function change(
-  { label, value },
+  values,
   obj,
-  {
-    triggerNode: {
-      props: { namePath },
-    },
-  }
+  // {
+  //   triggerNode: {
+  //     props: { namePath },
+  //   },
+  // }
+  node
 ) {
-  emit("update:name", label);
-  emit("update:fullName", namePath);
-  emit("update:value", value);
+  emit("update:name", values?.label);
+  emit("update:fullName", node?.triggerNode?.props?.namePath);
+  emit("update:value", values?.value);
 }
 </script>
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7db346c6..1f7c1ea4 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4089,8 +4089,9 @@ function onFocusEnd(){
           state.addLoading = false;
         })
         .catch((err) => {
+          message.destroy()
           message.error(err.data.msg)
-          state.loading = false;
+          state.addLoading = false;
           console.log(err);
         });
       state.cstm_hs = false;
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 763fc10b..ac423528 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -63,7 +63,7 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
     width="700px" :title="false">
       <div style="padding:24px">
         <div class="headers" style="margin-top:-24px;width: 110%;margin-left: -24px;">
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index dc324563..982420a1 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -131,7 +131,7 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" placement="right" :maskClosable="false" :closable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :maskClosable="false" :closable="false"
       width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
@@ -312,7 +312,7 @@
       </div>
     </a-drawer>
     <!-- 查看授课记录 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teachingdialog" placement="right" :maskClosable="false" :closable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right" :maskClosable="false" :closable="false"
       width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 5b326592..66e29950 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -113,7 +113,7 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
       width="700" :title="false">
       <div style="padding:24px">
         <div class="headers" style="margin-top:-24px;margin-left: -25px;width: 110%;">
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 5857a0e4..41da74fe 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -140,7 +140,7 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" :closable="false" placement="right" :maskClosable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" :closable="false" placement="right" :maskClosable="false"
       width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
@@ -389,7 +389,7 @@
       </div>
     </a-drawer>
     <!--查看授课详情 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teachingdialog" :closable="false" placement="right" :maskClosable="false"
+    <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" :closable="false" placement="right" :maskClosable="false"
       width="60%" :title="false">
       <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 628cb916..ec531af8 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-drawer class="largeDrawerStyle" :visible="visible" placement="right" :closable="false" :maskClosable="false"
+  <a-drawer class="largeDrawerInside" :visible="visible" placement="right" :closable="false" :maskClosable="false"
     width="60%" :title="false">
   <div class="appedit">
     <div class="header" style="margin-top: -24px;">
@@ -74,7 +74,7 @@
       <button class="btn2" @click="paramsDrawer">提交</button>
     </div>
   </div>
-  <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
+  <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
     width="60%" :title="false">
     <div style="padding:24px;">
     <div class="headers" style="margin-top:-24px;">
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index c16a0ac3..09d31213 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -120,7 +120,7 @@
       </div>
       <!-- 弹窗组件 -->
 <!--查看讲师费详情 -->
-<a-drawer class="largeDrawerStyle" :closable="false" v-model:visible="teachingdialog" placement="right"
+<a-drawer class="largeDrawerInside" :closable="false" v-model:visible="teachingdialog" placement="right"
 @closa="cancelTeachingDialog"  width="60%" :title="false">
 <div style="padding:24px;">
 <div class="headers" style="margin-top:-24px;">
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 150bf20b..15226aae 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -156,7 +156,7 @@
         </div>
       </div>
       <!-- 弹窗组件 -->
-      <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
+      <a-drawer class="largeDrawerInside" v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
         width="60%" :title="false">
         <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
@@ -501,7 +501,7 @@
         </a-modal>
       </div>
       <!-- <div> <Upload/> </div>         -->
-      <a-drawer class="largeDrawerStyle" v-model:visible="teachingdialog" placement="right"
+      <a-drawer class="largeDrawerInside" v-model:visible="teachingdialog" placement="right"
         :closable="false"  width="60%" :title="false">
         <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 3b7e688f..1d38be1e 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -99,12 +99,20 @@
       </div>
     </div>
    <!-- 抽屉 -->
-   <a-drawer class="largeDrawerStyle" v-model:visible="opendrawer" placement="right"
-@closa="cancelTeachingDialog" :maskClosable="true"  width="60%" title="查看详情">
+   <a-drawer class="largeDrawerInside" v-model:visible="opendrawer" placement="right"
+@closa="cancelTeachingDialog" :maskClosable="true"  width="60%" :title="false">
 <div style="padding:24px;">
+  <div class="headers" style="margin-top:-24px;">
+    <div class="headerTitle">查看详情</div>
+    <img
+      style="width: 29px; height: 29px; cursor: pointer"
+      src="@/assets/images/basicinfo/close.png"
+      @click="cancelTeachingDialog"
+    />
+  </div>
 <a-form  layout="inline">
   <a-form-item class="select">
-          <a-input v-model:value="drawer.name" style="width: 260px; height: 40px; border-radius: 8px"
+          <a-input @pressEnter="searchSubmitdrawer" v-model:value="drawer.name" style="width: 260px; height: 40px; border-radius: 8px"
             placeholder="请输入课程名称进行搜索" allowClear showSearch>
           </a-input>
         </a-form-item>
@@ -221,7 +229,7 @@ export default {
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '讲师工号',
@@ -229,7 +237,7 @@ export default {
         key: 'userNo',
         align: "center",
         ellipsis: true,
-        width: 200,
+        width: 160,
       },
       {
         title: '所属组织 ',
@@ -248,7 +256,7 @@ export default {
         key: 'payrollPlace',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '授课时长(系统 ) ',
@@ -256,7 +264,7 @@ export default {
         key: 'teachingSystem',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '授课时长(录入) ',
@@ -264,7 +272,7 @@ export default {
         key: 'teachingEnter',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '开发课程时长 ',
@@ -272,7 +280,7 @@ export default {
         key: 'expense',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '计划费用 ',
@@ -280,7 +288,7 @@ export default {
         key: 'expense',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '应发费用 ',
@@ -288,16 +296,16 @@ export default {
         key: 'payableExpense',
         ellipsis: true,
         align: "center",
-        width: 200,
+        width: 160,
       },
       {
         title: '操作 ',
         dataIndex: 'operation',
         key: 'operation',
         ellipsis: true,
-        align: "right",
+        align: "center",
         fixed: "right",
-        width: 120,
+        width: 160,
         scopedSlots: { customRender: "action" },
       },
     ])
@@ -652,7 +660,24 @@ export default {
 .select .ant-picker {
   width: 410px !important;
 }
+.headers {
+  height: 73px;
+  border-bottom: 1px solid #e8e8e8;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  // background-color: red;
+  margin-bottom: 20px;
+  flex-shrink: 0;
 
+  .headerTitle {
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    line-height: 25px;
+    // margin-left: 24px;
+  }
+}
 .addTimeBox {
   position: relative;
   display: flex;
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index fe0481c7..1ad05813 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -88,7 +88,7 @@
       </a-modal>
     </div>
     <!-- 抽屉 -->
-    <a-drawer class="largeDrawerStyle" v-model:visible="teacherdialog" :closable="false" :title="false" placement="right" width="60%" :maskClosable="false" >
+    <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">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>