讲师管理bug

src/components/project/BatchLecturer.vue

@@ -2,7 +2,7 @@
   <a-drawer
     :visible="visible"
     :closable="false"
-    class="RouterFaceStus"
+     class="largeDrawerStyle"
     placement="right"
     width="70%"
   >
@@ -301,14 +301,14 @@ const queryDrawer = () => {
 <style lang="scss" scoped>
 
 
-.RouterFaceStus {
+.largeDrawerStyle {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
-
+    padding:24px;
     .headers {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;

src/components/project/ConfirmLecturer.vue

@@ -2,7 +2,7 @@
   <a-drawer
     :visible="visible"
     :closable="false"
-    class="RouterFaceStus"
+    class="largeDrawerStyle"
     placement="right"
     width="64%"
     :zIndex="1001"
@@ -533,14 +533,14 @@ const config = () => {
   }
 }
 
-.RouterFaceStus {
+.largeDrawerStyle {
   .drawerMains {
     min-width: 600px;
     // margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
-
+    padding:24px;
     .headers {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;

src/components/project/LookExternalLecturer.vue

@@ -1,6 +1,6 @@
 
 <template>
-  <a-drawer :visible="visible" placement="right" :closable="false" :maskClosable="false"
+  <a-drawer :visible="visible" class="largeDrawerStyle" placement="right" :closable="false" :maskClosable="false"
   width="80%" :title="false">
     <!-- 外部讲师查看详情 -->
     <div class="LookExternalLecturer">
@@ -332,6 +332,7 @@ export default{
   height: 100%;
   display: flex;
   flex-direction: column;
+  padding:24px;
   .header {
     padding: 0px 32px;
     height: 73px;

src/components/project/LookInsideLecturer.vue

@@ -1,5 +1,5 @@
 <template>
-    <a-drawer :visible="visible" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerStyle" :visible="visible" placement="right" :closable="false" :maskClosable="false"
       width="80%" :title="false">
       <!-- 内部讲师查看详情 -->
       <div class="LookInsideLecturer">
@@ -462,6 +462,7 @@ const handleup = ()=>{
 </script>
 <style lang="scss" scoped>
 .LookInsideLecturer {
+  padding:24px;
   .header {
     padding: 0px 32px;
     height: 73px;

src/views/lecturer/ExternalLecturer.vue

@@ -63,8 +63,9 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img
@@ -156,7 +157,7 @@
           <a-col :span="24">
             <a-form-item label="初始授课时长" name="teaching">
                 <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px ; "
-                placeholder="0" allowClear showSearch suffix="分钟" @blur="clearNonNumber">
+                  placeholder="0" allowClear showSearch suffix="分钟" @blur="clearNonNumber" @focus="focusTeaching">
                 </a-input>
                 <!-- <span style="margin-left: 5px ;" v-if="formParam.teaching !== null">{{ (formParam.teaching / 60
                 ).toFixed(2) }}小时</span>
@@ -213,6 +214,7 @@
                   <a-button style="margin-right: 20px;"  class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
                   </a-button>
         </div>
+      </div>
     </a-drawer>
 
     <!-- 删除功能弹窗 -->
@@ -346,7 +348,7 @@ export default {
         teacherType:'2',
         photo:null,
         status:1,
-        teaching:'',
+        teaching:0,
       },
       vf:true,
       searchParam: {
@@ -667,7 +669,7 @@ export default {
         status:1,
         teacherType:2,
         photo:null,
-        teaching:null,
+        teaching:0,
         name: null,
         mobile: null,
         email: null,
@@ -682,20 +684,20 @@ export default {
     const rules = {
       name: [{ required: true, message: '',log: '讲师不能为空' }],
       supplier:[{ required: true,  message: '',log:'供应商不能为空' }],
-      email:[
-        {
-          type: "email",
-          message: '',log: '请输入正确的邮箱地址',
-          trigger: "blur"
-         }
-        ],
-      mobile: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '',log: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+      // email:[
+      //   {
+      //     type: "email",
+      //     message: '',log: '请输入正确的邮箱地址',
+      //     trigger: "blur"
+      //    }
+      //   ],
+      // mobile: [
+      //     {
+      //       pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+      //       message: '',log: "请输入正确的手机号码",
+      //       trigger: "blur"
+      //     }
+      //   ]
     }
     const rule =()=>{
       if (state.formParam.name==null){
@@ -755,6 +757,9 @@ export default {
     }
     const sendEmail=()=>{
       const reg = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.\w{2,}$/;
+      if(!state.formParam.email){
+        return
+      }
       if (!reg.test(state.formParam.email)) {
         message.warning( '邮箱格式不正确')
         state.formParam.email=''
@@ -762,11 +767,15 @@ export default {
       }
     }
     const clearNonNumber = () => {
-      state.formParam.teaching = state.formParam.teaching.replace(/\D/g, '');
-      state.formParam.teaching = state.formParam.teaching.slice(0,8)
+      state.formParam.teaching = state.formParam.teaching?.replace(/\D/g, '');
+      state.formParam.teaching = state.formParam.teaching?.slice(0,8)
+      !state.formParam.teaching && (state.formParam.teaching = 0)
+    }
+    const focusTeaching = () => {
+      state.formParam.teaching == 0 && (state.formParam.teaching = null)
     }
     const sendRemark=()=>{
-      state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
+      state.formParam.remark = state.formParam.remark?.replace(/\s/g, '');
     }
     const repl = (val) => {
       if(val){
@@ -804,6 +813,7 @@ export default {
       ...toRefs(state),
       lecturerAdmin,
       clearNonNumber,
+      focusTeaching,
       enterPressHadlerSearch,
       validateField,
       rules,

src/views/lecturer/ExternalTeaching.vue

@@ -131,8 +131,9 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer v-model:visible="teacherdialog" placement="right" :maskClosable="false" :closable="false"
+    <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img
@@ -308,10 +309,12 @@
           <a-button class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
           </a-button>
         </div>
+      </div>
     </a-drawer>
     <!-- 查看授课记录 -->
-    <a-drawer v-model:visible="teachingdialog" placement="right" :maskClosable="false" :closable="false"
+    <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">查看讲师授课记录</div>
           <img
@@ -355,6 +358,7 @@
           <a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
           </a-button>
         </div> -->
+      </div>
     </a-drawer>
     <!-- 删除功能弹窗 -->
     <div>

src/views/lecturer/InsideLecturer.vue

@@ -113,8 +113,9 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer  v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false"
+    <a-drawer class="largeDrawerStyle" 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%;">
           <div class="headerTitle" style="margin-left: 14px;">{{ teacherdialogtitle }}</div>
           <img
@@ -357,6 +358,7 @@
             </a-button>
           </div>
         </div>
+      </div>
     </a-drawer>
 
     <!-- 删除功能弹窗 -->

src/views/lecturer/InsideTeaching.vue

@@ -140,8 +140,9 @@
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-drawer v-model:visible="teacherdialog" :closable="false" placement="right" :maskClosable="false"
+    <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img
@@ -385,10 +386,12 @@
           <a-button class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
           </a-button>
         </div>
+      </div>
     </a-drawer>
     <!--查看授课详情 -->
-    <a-drawer v-model:visible="teachingdialog" :closable="false" placement="right" :maskClosable="false"
+    <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">查看讲师授课记录</div>
           <img
@@ -455,6 +458,7 @@
           <a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
           </a-button>
         </div> -->
+      </div>
     </a-drawer>
     <!-- 删除功能弹窗 -->
     <div>

src/views/lecturer/LecturerAPPEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer :visible="visible" placement="right" :closable="false" :maskClosable="false"
+  <a-drawer class="largeDrawerStyle" :visible="visible" placement="right" :closable="false" :maskClosable="false"
     width="60%" :title="false">
   <div class="appedit">
     <div class="header" style="margin-top: -24px;">
@@ -74,8 +74,9 @@
       <button class="btn2" @click="paramsDrawer">提交</button>
     </div>
   </div>
-  <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
+  <a-drawer class="largeDrawerStyle" 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;">
       <div class="headerTitle">编辑讲师费</div>
       <img
@@ -388,6 +389,7 @@
       <a-button   class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
       </a-button>
     </div>
+  </div>
   </a-drawer>
   <a-modal
     :visible="modalVisible"
@@ -1197,7 +1199,7 @@ export default {
   overflow-x: auto;
   display: flex;
   flex-direction: column;
-
+  padding:24px;
   .header {
     padding: 0px 15px;
     height: 68px;

src/views/lecturer/LecturerApproval.vue

@@ -120,8 +120,9 @@
       </div>
       <!-- 弹窗组件 -->
 <!--查看讲师费详情 -->
-<a-drawer :closable="false" v-model:visible="teachingdialog" placement="right"
+<a-drawer class="largeDrawerStyle" :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;">
   <div class="headerTitle">汇总讲师费详情</div>
   <img
@@ -188,6 +189,7 @@
         </a-button>
         <!-- <a-button  class="drabtn"  @click="cancelTeachingDialog" type="primary" danger>拒绝</a-button> -->
       </div>
+    </div>
 </a-drawer>
        <!-- 修改状态功能弹窗 -->
        <div>

src/views/lecturer/LecturerFee.vue

@@ -156,8 +156,9 @@
         </div>
       </div>
       <!-- 弹窗组件 -->
-      <a-drawer v-model:visible="teacherdialog" placement="right" :closable="false" :maskClosable="false" dropdown-style="drawaer"
+      <a-drawer class="largeDrawerStyle" 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;">
           <div class="headerTitle">{{ teacherdialogtitle }}</div>
           <img
@@ -470,6 +471,7 @@
           <a-button   class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
           </a-button>
         </div>
+      </div>
       </a-drawer>
        <!-- 修改状态功能弹窗 -->
        <div>
@@ -499,8 +501,9 @@
         </a-modal>
       </div>
       <!-- <div> <Upload/> </div>         -->
-      <a-drawer v-model:visible="teachingdialog" placement="right"
+      <a-drawer class="largeDrawerStyle" v-model:visible="teachingdialog" placement="right"
         :closable="false"  width="60%" :title="false">
+        <div style="padding:24px;">
         <div class="headers" style="margin-top:-24px;">
           <div class="headerTitle">查看讲师费用</div>
           <img
@@ -556,6 +559,7 @@
         <a-button   class="drabtn" @click="cancelTeachingDialog(false)" :loading="buttonLoading">取消
         </a-button>
       </div> -->
+    </div>
 </a-drawer>
 <ImportWork v-model:showWork="showWork" :template="'讲师费导入模板'" :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
     </div>

src/views/lecturer/MonthlyStatistics.vue

@@ -99,8 +99,9 @@
       </div>
     </div>
    <!-- 抽屉 -->
-   <a-drawer v-model:visible="opendrawer" placement="right"
+   <a-drawer class="largeDrawerStyle" v-model:visible="opendrawer" placement="right"
 @closa="cancelTeachingDialog" :maskClosable="true"  width="60%" title="查看详情">
+<div style="padding:24px;">
 <a-form  layout="inline">
   <a-form-item class="select">
           <a-input v-model:value="drawer.name" style="width: 260px; height: 40px; border-radius: 8px"
@@ -137,6 +138,7 @@
         <a-button   class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
         </a-button>
       </div>
+    </div>
 </a-drawer>
   </div>
 </template>

src/views/lecturer/Organization.vue

@@ -88,7 +88,8 @@
       </a-modal>
     </div>
     <!-- 抽屉 -->
-    <a-drawer v-model:visible="teacherdialog" :closable="false" :title="false" placement="right" width="60%" :maskClosable="false" >
+    <a-drawer class="largeDrawerStyle" 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>
           <img
@@ -285,6 +286,7 @@
         <a-button  class="drabtn" type="primary" @click="createTeacherDialog(0)" :loading="buttonLoading">保存</a-button>
         <a-button v-if="editParams||editIndex>1" class="drabtn" type="primary" @click="createTeacherDialog(1)" :loading="buttonLoading">提交</a-button>
       </div>
+    </div>
     </a-drawer>
     <AddOrgContent :Addtitle="'选择组织'" v-model:showContent="showContent" v-model:AddContentList="formParam.affiliationOrgList" />
         </div>