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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 @@
-
@@ -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 @@
({{ (formParam.teaching / 60
).toFixed(2) }}小时)
- {{ formParam.score ||'-'}}
+ {{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-'}}
{{ formParam.studys ||'-'}}
{{ formParam.remark ||'-' }}
@@ -700,6 +700,13 @@ export default {
key: 'score',
ellipsis: true, align: "center",
width: 120,
+ customRender: (value) => {
+ return (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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) }}小时)
{{ formParam.teachingDate||'-' }}
{{ formParam.studys||'-' }}
- {{ formParam.score||'-' }}
+ {{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}
{{ formParam.courseTypeName||'-' }}
{{ formParam.remark||'-' }}
@@ -881,6 +881,13 @@ export default {
key: 'score',
ellipsis: true, align: "center",
width: 120,
+ customRender: (value) => {
+ return (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
}
},
{
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 (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
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 @@
{{(formParam.teachingDate) || '-'}}
{{formParam.teachingTime || '-'}}分 ({{(formParam.teachingTime/60).toFixed(2)}}小时)
{{formParam.studys || '-'}}
- {{formParam.score || '-'}}
+ {{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0):'-' }}
{{formParam.levelPay || '-'}}
{{formParam.expense || '-'}}
@@ -997,9 +997,13 @@ getAllLevelList().then((res) => {
key: 'score',
ellipsis: true, align: "center",
width: 120,
- customRender: ({ text })=>{
- return text||'-'
- }
+ customRender: (value) => {
+ return (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
title: '课程类型 ',
@@ -1640,9 +1644,13 @@ const column = ref([
key: 'courseAssess',
ellipsis: true, align: "center",
width: 120,
- customRender: ({ text })=>{
- return text||'-'
- }
+ customRender: (value) => {
+ return (
+
+ {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0) : '-'}
+
+ )
+ }
},
{
title: '课程类型 ',