diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue
index 8bff27dc..ca38556a 100644
--- a/src/components/common/BaseTable.vue
+++ b/src/components/common/BaseTable.vue
@@ -102,9 +102,9 @@ const changePagination = (e) => {
nextTick(onFetch);
};
-function reset(v = {}) {
+function reset(v) {
params.reset();
- emit("update:params", { ...v });
+ v && emit("update:params", { ...v });
nextTick(onFetch);
}
@@ -115,11 +115,11 @@ function resetSelected() {
emit("update:selectedRows", []);
}
-function clear(v = {}) {
+function clear(v) {
rowSelectKeys.value = [];
selectsData.value = [];
params.reset();
- emit("update:params", { ...v });
+ v && emit("update:params", { ...v });
emit("update:selectedRowKeys", []);
emit("update:selectedRows", []);
}
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 1128dbff..08cb00ea 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -47,7 +47,7 @@
-
+
搜索
重置
@@ -93,7 +93,7 @@
- 搜索
+ 搜索
重置
@@ -122,8 +122,8 @@
-
- 搜索
+
+ 搜索
重置
@@ -273,7 +273,8 @@
-
+
{{ item.name || "默认" }}
@@ -374,12 +375,12 @@ const member = ref(false);
const dept = ref(false);
const projectStuTableRef = ref();
const stuTableRef = ref();
-const projectParams = ref({ pid: props.infoId, type: props.infoType, studentName:"" });
+const projectParams = ref({ pid: props.infoId, type: props.infoType, studentName: "" });
const getProjectStu = () => projectStuTableRef.value.fetch();
const resetProjectStu = () => {
projectParams.value.studentName = "";
- projectStuTableRef.value.reset()
+ projectStuTableRef.value.reset();
};
const person = ref(false);
@@ -604,7 +605,7 @@ function onOrgSelectChange(e, l) {
const resetStu = () => {
nameSearch.value.keyword = "";
- stuTableRef.value.reset({ keyword: "", departId: null })
+ stuTableRef.value.reset({ keyword: "", departId: null });
};
//清空选择部门信息
const deleteDepSelect = () => {
@@ -619,7 +620,7 @@ const resetOrg = () => {
//重置受众
const resetAudienceInfo = () => {
audienceName.value.keyword = "";
- auditTableRef.value.reset({ keyword: "" })
+ auditTableRef.value.reset({ keyword: "" });
};
//确定添加授权
@@ -680,25 +681,26 @@ watch(visiable, () => {
activeKey.value = props.isGroup ? 4 : 1;
projectParams.value.studentName = "";
- nameSearch.value.keyword = "";
- searchOrgName.value.keyword = "";
+ nameSearch.value.keyword = "";
+ searchOrgName.value.keyword = "";
audienceName.value.keyword = "";
if (!visiable.value) {
- auditTableRef.value && auditTableRef.value.resetSelected() && auditTableRef.value.clear();
+ auditTableRef.value && auditTableRef.value.clear();
auditTableRef.value && auditTableRef.value.reset({ keyword: "" });
- stuTableRef.value && stuTableRef.value.resetSelected() && stuTableRef.value.clear();
- stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: null });
- projectStuTableRef.value && projectStuTableRef.value.resetSelected() && projectStuTableRef.value.clear();
- projectStuTableRef.value && projectStuTableRef.value.reset();
+ stuTableRef.value && stuTableRef.value.clear();
+ stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: null });
+ projectStuTableRef.value && projectStuTableRef.value.clear();
+ projectStuTableRef.value && projectStuTableRef.value.reset({ pid: props.infoId, type: props.infoType, studentName: "" });
}
});