diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index c79b2348..c678f4c6 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -61,7 +61,7 @@
请仔细核对讲师费信息,确认无误后,将自动进入(BPM系统)审批流程。
@@ -132,12 +132,12 @@ const close = () => {
modalVisible.value = false;
}
const handleConfirm = () => {
- if(numTime.value >= 10){
- message.error('提交审批次数已达上限')
- return
- }
- numTime.value+=1
- localStorage.setItem('numTime',numTime.value)
+ // if(numTime.value >= 10){
+ // message.error('提交审批次数已达上限')
+ // return
+ // }
+ // numTime.value+=1
+ // localStorage.setItem('numTime',numTime.value)
const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
if(!ids.length){
return message.error('暂无可提交的数据')
@@ -177,7 +177,7 @@ const clickItem = (item,i) => {
watch(()=>props.visible,(val)=>{
if(val){
loadingData.value = true
- numTime.value = Number(localStorage.getItem('numTime')||0)
+ // numTime.value = Number(localStorage.getItem('numTime')||0)
api.getListByAffiliation(
{
name: '',
@@ -486,9 +486,9 @@ const config = () => {
.body {
width: 100%;
- padding: 0 30px;
+ padding: 0 50px;
margin: 34px auto 56px auto;
- margin-top: 10px;
+ margin-top: 40px;
display: flex;
justify-content: center;
align-items: center;
@@ -646,7 +646,7 @@ const config = () => {
.btn1 {
cursor: pointer;
- width: 100px;
+ width: 120px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue
index 4a4b7056..2e18cdda 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -224,12 +224,14 @@ const searchMember = (keyword) => {
avatar: item.avatar,
gender: item.gender
}
- })
+ }) || []
}else{
+ options.value = []
loading.value = false
}
}).catch(()=>{
loading.value = false
+ options.value = []
})
const params = {
pageNo: 1,
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index ed931266..d9b0720a 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -73,7 +73,7 @@
@click="cancelTeacherDialog"
/>
-
+
@@ -106,7 +106,15 @@
-
+
+
+
+ 讲师姓名
+
@@ -114,7 +122,15 @@
-
+
+
+
+ 供应商
+
@@ -542,8 +558,9 @@ export default {
state.formParam.supplier = state.formParam?.supplier?.trim()
const formItemNames = Object.keys(rules);
for(let i=0;i
' : state.formParam.description
- // state.formParam.photo = state.formParam.photo === null ? userInfo.value?.avatar : state.formParam.photo
+ state.formParam.photo = state.formParam.photo == null ? null : state.formParam.photo.includes('upload') ? res.data.data.photo : '/upload'+res.data.data.photo
})
.catch((err) => {
message.destroy()
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index e48ddb6d..35113c53 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -3,7 +3,7 @@
-
+
-
+
-
+
基本信息
@@ -158,7 +158,15 @@
-
+
+
+
+ 讲师姓名
+
@@ -177,7 +185,15 @@
-
+
+
+
+ 讲师体系
+
@@ -188,7 +204,15 @@
-
+
+
+
+ 讲师级别
+
@@ -197,10 +221,18 @@
-
+
+
+
+ 初始授课时长
+
+ @change="clearNonNumber" @blur="blurNumber" @focus="focusNumber" placeholder="请输入初始授课时长" allowClear suffix="分钟">
-
+
-
-
@@ -33,12 +33,12 @@
-
-
@@ -52,7 +52,7 @@
>
-
- {{ (record?.teaching / 60).toFixed(2) +'小时'|| '-' }}
+ {{ record?.teaching ?record?.teaching+'分钟': '-' }}
@@ -311,10 +311,11 @@
讲师信息
-
+
{{ formParam.teacherName ||'-'}}
{{ formParam.userNo||'-' }}
- {{ formParam.orgName||'-' }}
+ {{ formParam.orgName||'-' }}
+ {{ formParam.trainOrg||'-' }}
{{ formParam.tsystemName||'-' }}
{{ formParam.tlevelName||'-'
}}
@@ -764,7 +765,7 @@ export default {
width: 120,
},
{
- title: '授课时长(H) ',
+ title: '授课时长(分钟) ',
dataIndex: 'teaching',
key: 'teaching',
ellipsis: true, align: "center",
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 1bddc6b6..c0a92ced 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -3,7 +3,7 @@
width="60%" :title="false">