From 0c146895469b9f5e3bcf52a66ef30bd35e292dca Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 15 Nov 2024 14:21:56 +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 |  2 +-
 src/views/lecturer/InsideLecturer.vue    | 30 ++++++++++++++++++++++--
 src/views/lecturer/LecturerFee.vue       | 27 ++++++++++++++-------
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue
index 05264917..648580af 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -228,7 +228,7 @@ const searchMember = (keyword) => {
           level:  item.name+'('+item.userNo+')'+item.sLevelName,
           key: item.id,
           orgName: item.orgName,
-          orgId: item.departId,
+          orgId: item.orgId,
           tSystemName:item.tsystemName,
           sLevelName:item.sLevelName,
           payrollPlaceCode: item.salaryId,
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 91978a42..1d02c30e 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -112,8 +112,16 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
-      width="40%" :title="teacherdialogtitle">
+    <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
+      width="40%" :title="false">
+      <div class="headers">
+        <div class="headerTitle">{{ teacherdialogtitle }}</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="@/assets/images/basicinfo/close.png"
+          @click="cancelTeacherDialog"
+        />
+      </div>
       <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
         <a-row>
           <a-col :span="24">
@@ -1328,6 +1336,24 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.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;
+  }
+}
 .selectonlineface{
   z-index: 999;
   width: 679px;
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 8cb57c2b..b55ce759 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -155,8 +155,16 @@
         </div>
       </div>
       <!-- 弹窗组件 -->
-      <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
-        width="60%" :title="teacherdialogtitle">
+      <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
+        width="60%" :title="false">
+        <div class="headers">
+          <div class="headerTitle">{{ teacherdialogtitle }}</div>
+          <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="@/assets/images/basicinfo/close.png"
+            @click="cancelTeacherDialog"
+          />
+        </div>
         <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" >
           <!-- 讲师姓名  name  讲师工号  userNo-->
           <a-row :gutter="16">
@@ -164,7 +172,7 @@
               <a-form-item label="讲师名称" name="name">
                <SearchTeacher :disabled="!!id" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo"
                 v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
-                v-model:payrollPlaceName="formParam.payrollPlace" v-model:level="formParam.tlevelId" ></SearchTeacher>
+                v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -984,6 +992,7 @@ getAllLevelList().then((res) => {
     //保存
     const createTeacherDialog = async () => {
       console.log(state.formParam,'formParam')
+      state.formParam.expense = String(state.formParam.expense)
       state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : ""
       state.formParam.tsystemName = state.tSystemNames.systemName
       state.formParam.tsystemId = state.tSystemNames.systemId
@@ -994,7 +1003,6 @@ getAllLevelList().then((res) => {
           return message.error(rules[formItemNames[i]][0].log)
         }
       }
-      state.formParam.expense = String(state.formParam.expense)
       state.formParam.orgName = state.formParam.orgNames
       state.formParam = {...state.formParam,...state.tSystemNames}
       state.formParam.name = state.formParam?.name?.split('/')[0]
@@ -1006,6 +1014,7 @@ getAllLevelList().then((res) => {
             getTableDate(); 
           }).catch(err=>{
             message.destroy()
+            state.teacherdialog = false;
             message.error(err.data.msg)
           })
         }
@@ -1015,9 +1024,10 @@ getAllLevelList().then((res) => {
               message.success("保存成功");
               state.teacherdialog = false;
               cancel()
-        getTableDate(); 
+              getTableDate(); 
             }).catch(err=>{
             message.destroy()
+            state.teacherdialog = false;
             message.error(err.data.msg)
           })
         }
@@ -1217,7 +1227,7 @@ getAllLevelList().then((res) => {
       state.formParam.teachingTime = state.formParam.teachingTime?.replace(/\D/g, '');
       state.formParam.teachingTime = state.formParam.teachingTime?.slice(0,8);
       state.formParam.teachingTime == 0 && (state.formParam.teachingTime = null);
-      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime);
+      state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.expense = state.formParam.levelPay*(state.formParam.teachingTime/60).toFixed(2));
     }
     const clearstudysNumber = () => {
       state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
@@ -1225,7 +1235,7 @@ getAllLevelList().then((res) => {
     const  clearscoreNumber= () => {
       state.formParam.score = state.formParam.score?.replace(/\D/g, '');
       state.formParam.score == 0 && (state.formParam.score = null);
-      state.formParam.score > 10 && (state.formParam.score = 10);
+      state.formParam.score > 10 && (state.formParam.score = '10');
     }
     const payExpense = () => {
       state.formParam.payableExpense = state.formParam.payableExpense?.replace(/\D/g, '');
@@ -1236,7 +1246,7 @@ getAllLevelList().then((res) => {
       state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, '');
       state.formParam.levelPay = state.formParam.levelPay?.slice(0,8);
       state.formParam.levelPay == 0 && (state.formParam.levelPay = null);
-      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime)
+      state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = state.formParam.levelPay*(state.formParam.teachingTime/60).toFixed(2))
     }
       const rules = {
         name: [{ required: true, message:'',log: '讲师不能为空' }],
@@ -1443,6 +1453,7 @@ const column = ref([
         
       ])
       const tlevelChange = (e) => {
+        console.log(e,'eeeee')
         state.formParam.tlevelName = e?.tlevelName
         state.formParam.tlevelId = e?.tlevelId
         // state.formParam.payrollPlace = e?.salaryName