From 9de8eb61d8335f3e649e7050cd44eeafc3f0c03c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Sat, 21 Dec 2024 16:13:30 +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/BatchLecturer.vue      | 10 +++++---
 src/components/project/ConfirmLecturer.vue    | 10 +++++---
 .../project/LookExternalLecturer.vue          |  7 ++++++
 src/components/project/LookInsideLecturer.vue |  7 ++++++
 src/views/courselibrary/CoursewareManage.vue  |  2 +-
 src/views/lecturer/ExternalLecturer.vue       | 24 ++++++++++++++++---
 src/views/lecturer/ExternalTeaching.vue       |  9 ++++++-
 src/views/lecturer/InsideTeaching.vue         | 13 +++++++---
 src/views/lecturer/LecturerAPPEdit.vue        | 11 +++++++--
 src/views/lecturer/LecturerApproval.vue       | 13 +++++++---
 src/views/lecturer/LecturerFee.vue            | 22 +++++++++++------
 11 files changed, 102 insertions(+), 26 deletions(-)

diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue
index 3feea00d..8cfa4f2b 100644
--- a/src/components/project/BatchLecturer.vue
+++ b/src/components/project/BatchLecturer.vue
@@ -267,9 +267,13 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
-    customRender: ({ text })=>{
-      return text||'-'
-    }
+    customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
   },
   {
     title: '课酬基准',
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 2a59d042..8025c755 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -362,9 +362,13 @@ const columns = [
     dataIndex: 'score',
     key: 'score',
     align: 'center',
-    customRender: ({ text })=>{
-      return text||'-'
-    }
+    customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
   },
   {
     title: '课酬基准',
diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index 40f768be..6b70c534 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -227,6 +227,13 @@ export default{
         key: 'score',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '开课状态',
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index 989652e8..e1af1015 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -290,6 +290,13 @@ export default{
         key: 'score',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '开课状态',
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1f7c1ea4..4180f2d9 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4080,7 +4080,7 @@ function onFocusEnd(){
       editPlan(postData)
         .then((res) => {
           if(res.data.code == 200){
-            getTableDate3();
+            handleSearchTable();
             handleCancelStu();
             rest();
           }else{
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index 7078b132..c0fce274 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -142,7 +142,7 @@
           <a-row :gutter="16">
             <a-col :span="24">
               <a-form-item label="手机号码" name="mobile" prop="mobile">
-                  <a-input  v-model:value.trim="formParam.mobile"  class="draitem"
+                  <a-input type="number" v-model:value.trim="formParam.mobile"  class="draitem"
                     placeholder="请输入手机号码" allowClear showSearch   :maxLength="11" @blur="sendPhone">
                   </a-input>
               </a-form-item>
@@ -316,6 +316,8 @@ export default {
     const router = useRouter();
     const userInfo = computed(() => store.state.userInfo);
     const state = reactive({
+      phoneEmil: 0,
+      phoneEmilTwo: 0,
       lookExternalVisi:false,
       lookExterId: null,
       currentPage1: 1,
@@ -527,6 +529,8 @@ export default {
     // 新增讲师
     const addTeacher = () => {
       cancel()
+      state.phoneEmil = 0
+      state.phoneEmilTwo = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
       // state.formParam.photo =userInfo.value?.avatar
@@ -538,6 +542,8 @@ export default {
     
     //修改讲师信息弹窗
     const handleModify = (record) => {
+      state.phoneEmil = 0
+      state.phoneEmilTwo = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '编辑讲师'
       state.id = record.id
@@ -566,6 +572,14 @@ export default {
           return message.error(rules[formItemNames[i]][0].log)
         }
       }
+      if(state.phoneEmil){
+          message.destroy()
+          return message.warning( '手机号格式不正确')
+      }
+      if(state.phoneEmilTwo){
+         message.destroy()
+          return message.warning( '邮箱格式不正确')
+      }
       state.formParam.description = repl(state.formParam.description)
       state.formParam = {...state.formParam}
       if (state.vf == false) {
@@ -745,24 +759,28 @@ export default {
       state.formParam.name = state.formParam?.name?.replace(/\s/g, '');
     }
     const sendPhone=()=>{
+      state.phoneEmil = 0
       console.log(state.formParam.mobile)
       const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
       if (!state.formParam.mobile) {
       } else if (!reg.test(state.formParam.mobile)) {
         message.warning( '手机号格式不正确')
-        state.formParam.mobile=''
+        // state.formParam.mobile=''
+        state.phoneEmil = 1
         // state.formParam.mobile = state.formParam.mobile.replace(/\D/g, '');
       }
       
     }
     const sendEmail=()=>{
+      state.phoneEmilTwo = 0
       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=''
+        // state.formParam.email=''
+        state.phoneEmilTwo = 2
         // state.formParam.email = state.formParam.email.replace( /[\u4e00-\u9fa5]/g, '');
       }
     }
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index df3ed142..fd8ef57c 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -341,7 +341,7 @@
             <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
             ).toFixed(2) }}小时)</span>
           </a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score  ||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-'}}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys  ||'-'}}</a-descriptions-item>
           <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
         </a-descriptions>
@@ -700,6 +700,13 @@ export default {
         key: 'score',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
       },
 
       {
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index e1c2c8a0..bcec7113 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -423,7 +423,7 @@
             ).toFixed(2) }}小时)</span> </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.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</a-descriptions-item>
           <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item>
           <a-descriptions-item label="备注  ">{{ formParam.remark||'-' }}</a-descriptions-item>
         </a-descriptions>
@@ -881,6 +881,13 @@ export default {
         key: 'score',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
       },
       {
         title: '是否生成课时费 ',
@@ -1340,8 +1347,8 @@ export default {
       getExpenseByCourseId({ courseId: record.courseId })
         .then((res) => {
           console.log(res)
-          tableDatas.value = res.data.data.records
-          state.tableDataTotal = Number(res.data.data.total);
+          tableDatas.value = res.data.data
+          // state.tableDataTotal = Number(res.data.data.total);
         }).catch(err => {
           message.destroy()
         })
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 47173fdd..c2020f47 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -893,6 +893,9 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
+        customRender: ({text}) => {
+          return text || '-'
+        }
       },
       {
         title: '课程类型',
@@ -966,8 +969,12 @@ export default {
         ellipsis: true,
         align: "center",
         width: 160,
-        customRender: ({text}) => {
-          return text || "-";
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
         }
       },
       {
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index 6b6673d6..58ec5f0e 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -959,6 +959,9 @@
           ellipsis: true,
           align: "center",
           width: 120,
+          customRender: ({text}) => {
+          return text || '-'
+        }
         },
         {
           title: '基准课酬 ',
@@ -994,9 +997,13 @@
           ellipsis: true,
           align: "center",
           width: 120,
-          customRender: ({text}) => {
-            return text || "-";
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 3cfb816c..c7c8eab7 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -528,7 +528,7 @@
     <a-descriptions-item label="授课时间  ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
     <a-descriptions-item label="授课时长  ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></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.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}</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> -->
@@ -997,9 +997,13 @@ getAllLevelList().then((res) => {
           key: 'score',
         ellipsis: true, align: "center",
           width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',
@@ -1640,9 +1644,13 @@ const column = ref([
           key: 'courseAssess',
         ellipsis: true, align: "center",
           width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
+          customRender: (value) => {
+          return (
+            <div>
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+            </div>
+          )
+        }
         },
         {
           title: '课程类型 ',