diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index 3e091c05..a4f949d1 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -87,6 +87,7 @@ rowSelectKeys.value = props.selectedRowKeys selectsData.value = props.selectedRows } + emit('dataLists',data.value) }) const rowSelection = computed(() => (props.type ? { type: props.type, diff --git a/src/components/project/AddApprover.vue b/src/components/project/AddApprover.vue index dd64423a..1dac8000 100644 --- a/src/components/project/AddApprover.vue +++ b/src/components/project/AddApprover.vue @@ -51,7 +51,8 @@ "> + v-model:selectedRows="stuSelectRows" v-model:selectedRowKeys="stuSelectRowKeys" + @dataLists="dataLists" type="checkbox"> @@ -71,14 +72,14 @@
{{ item.realName }} -
+
{{ item.realName }} -
+
@@ -142,8 +143,14 @@ const onlineLearningList = () =>{ courseList.value = res.data.filter(item=>item.status == 0).map(item => item.courseId) }) } +const dataList = ref(false) const stuSelectRows = ref([]); - +const deleteStu = (i) => { + dataList.value && stuTableRef.value.remove(i) +} +const dataLists = (data) => { + dataList.value = data +} const stuSelectRowKeys = ref([]); const stuTableRef = ref(); const teaunm = ref([]) @@ -292,6 +299,7 @@ watch(visiable, () => { if (!visiable.value) { stuTableRef.value && stuTableRef.value.clear(); stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: '' }); + dataList.value = false } }); diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 00f89d93..6964f98f 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -219,6 +219,10 @@ const removeId = (e,i) =>{ expenseList.value = expenseList.value.filter(item=>item.id !== e.id) } forData.value[indexList.value].summaryTotal = forData.value[indexList.value]?.summaryTotal - e.payableExpense + if(!forData.value[indexList.value].expenseList.length){ + forData.value.splice(indexList.value,1) + forData.value.length > 0 && clickItem(forData.value[0],0) + } } }) } diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index f3182839..92bcb626 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -26,7 +26,10 @@ {{formData?.affiliationCode||'-'}} {{formData?.affiliationName||'-'}} - {{formData?.isParent==1?'否':'是'}} + + {{ 否(formData?.parentName) }} + 是({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批) + {{formData?.act||'-'}} {{formData?.one||'-'}} {{formData?.two||'-'}}