@@ -71,7 +72,7 @@
:centere="true"
:closable="false"
style="margin-top: 400px"
- :zIndex="9999"
+ :zIndex="1001"
@cancel="close"
>
@@ -122,6 +123,7 @@ const props = defineProps({
default: ''
}
});
+const loadingData = ref(false)
const modalVisible = ref(false)
const numTime = ref(0)
const close = () => {
@@ -134,10 +136,10 @@ const handleConfirm = () => {
}
numTime.value+=1
localStorage.setItem('numTime',numTime.value)
- const ids = expenseList.value.map(item=>item.id)
+ const ids = expenseList.value?.map(item=>item.id)
api.teacherExpenseConfirm(ids).then(res=>{
console.log(res,'resssss')
- const obj = ids.map(item=>{
+ const obj = ids?.map(item=>{
return {
id: item,
status: 1
@@ -162,6 +164,7 @@ const clickItem = (item,i) => {
}
watch(()=>props.visible,(val)=>{
if(val){
+ loadingData.value = true
numTime.value = Number(localStorage.getItem('numTime')||0)
api.getListByAffiliation(
{
@@ -173,8 +176,12 @@ watch(()=>props.visible,(val)=>{
).then(res=>{
if(res.data.code === 200){
forData.value = res.data.data
- expenseList.value = res.data.data[indexList.value]?.expenseList
+ expenseList.value = res.data.data[indexList.value]?.expenseList || []
}
+ loadingData.value = false
+ }).catch(()=>{
+ message.error('获取数据失败,请重新尝试')
+ loadingData.value = false
})
}else{
nameUserNo.value = null
@@ -333,6 +340,10 @@ const columns = [
]
const closeDrawer = () => emit("update:visible", false);
const qureyDrawer = () => {
+ if(!expenseList.value.length){
+ return message.error('暂无可提交的数据')
+ return
+ }
dialog({
content: '是否确认讲师费信息无误?提交后按“培训发生组织”汇总至审批中心,等待验证后“提交”进入审批流程。',
ok: () => {
@@ -346,6 +357,10 @@ const qureyDrawer = () => {
})
}
const config = () => {
+ if(!expenseList.value.length){
+ message.error('暂无可提交的数据')
+ return
+ }
modalVisible.value = true;
}
diff --git a/src/components/project/ProjectManagerLecturer.vue b/src/components/project/ProjectManagerLecturer.vue
index eae285a3..1cf51527 100644
--- a/src/components/project/ProjectManagerLecturer.vue
+++ b/src/components/project/ProjectManagerLecturer.vue
@@ -1,10 +1,10 @@
{
+ return triggerNode.parentNode || document.body;
+ }
+ "
v-model:value="managerArray"
:placeholder="placeholder"
:options="options"
@@ -61,7 +61,9 @@ watch(()=>props.arrayList, ()=>{
managerArray.value = props.arrayList
})
const options = ref([])
+const keyword = ref('')
const getList = () => {
+ loading.value = true
getUserList(keyword.value).then(res=>{
loading.value = false
if(res.data.code == 200){
@@ -72,7 +74,7 @@ const getList = () => {
userNo: e.userNo,
userName: e.realName,
}))
- console.log(options.value,'xixixixi')
+ // console.log(options.value,'xixixixi')
}
}).catch(()=>{
loading.value = false
@@ -80,17 +82,12 @@ const getList = () => {
})
}
const throttList = throttle(getList, 600);
-const keyword = ref('')
//搜索学员
const searchMember = (val) => {
- options.value = []
- loading.value = true
keyword.value = val
throttList()
};
const focus = () => {
- options.value =[]
- loading.value = true
keyword.value = ''
getList()
}
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index 30541c68..a01dd863 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -55,7 +55,7 @@
:pagination="pagination"
>
- 编辑
+ 编辑
移除
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index ce058425..0554081d 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -110,7 +110,7 @@
handleLook(record, String(record.courseform))">查看
- handleModify(record, String(record.courseform))">编辑
+ handleModify(record, String(record.courseform))">编辑
diff --git a/src/views/lecturer/LecturerFeeManagement.vue b/src/views/lecturer/LecturerFeeManagement.vue
index 26bba200..1b1116be 100644
--- a/src/views/lecturer/LecturerFeeManagement.vue
+++ b/src/views/lecturer/LecturerFeeManagement.vue
@@ -6,7 +6,7 @@
-
+
@@ -14,10 +14,11 @@