diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 95df1ef7..9084072d 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -630,7 +630,27 @@ textarea { } //大型抽屉 +.largeDrawerInside { + .ant-drawer-content-wrapper { + .ant-drawer-header { + display: none !important; + } + .ant-drawer-body { + padding: 0; + + } + } + + .drawerMain { + min-width: 700px; + margin: 0px 32px 0px 32px; + overflow-x: auto; + display: flex; + flex-direction: column; + + } +} //弹窗-------------------------------------------------------- .modalStyle { diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index 3e091c05..8aa0c665 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -82,12 +82,13 @@ const postParam = computed(() => ({ ...params.value, ...props.params })); const { data, loading, total, fetch: onFetch } = props.request(props.url, postParam); - watch(()=>data.value,(val)=>{ - if(val&&props.selectedRowKeys){ - rowSelectKeys.value = props.selectedRowKeys - selectsData.value = props.selectedRows - } - }) + // watch(()=>data.value,(val)=>{ + // // if(val&&props.selectedRowKeys){ + // // rowSelectKeys.value = props.selectedRowKeys + // // selectsData.value = props.selectedRows + // // } + // emit('dataLists',data.value) + // }) const rowSelection = computed(() => (props.type ? { type: props.type, columnWidth: 20, @@ -117,7 +118,11 @@ } }); - onMounted(() => props.init && nextTick(onFetch)); + onMounted(() => { + props.init && nextTick(onFetch) + rowSelectKeys.value = props.selectedRowKeys + selectsData.value = props.selectedRows + }); function onSelectChange(e, l) { rowSelectKeys.value = e; diff --git a/src/components/project/AddApprover.vue b/src/components/project/AddApprover.vue index dd64423a..0c3c804c 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" + type="checkbox"> @@ -142,8 +143,8 @@ const onlineLearningList = () =>{ courseList.value = res.data.filter(item=>item.status == 0).map(item => item.courseId) }) } +const dataList = ref(false) const stuSelectRows = ref([]); - const stuSelectRowKeys = ref([]); const stuTableRef = ref(); const teaunm = ref([]) @@ -292,6 +293,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/BatchLecturer.vue b/src/components/project/BatchLecturer.vue index ce467f8c..aedb440e 100644 --- a/src/components/project/BatchLecturer.vue +++ b/src/components/project/BatchLecturer.vue @@ -2,7 +2,7 @@ @@ -301,7 +301,7 @@ const queryDrawer = () => {