diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue
index a4f949d1..8aa0c665 100644
--- a/src/components/common/BaseTable.vue
+++ b/src/components/common/BaseTable.vue
@@ -82,13 +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
- }
- emit('dataLists',data.value)
- })
+ // 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,
@@ -118,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 1dac8000..0c3c804c 100644
--- a/src/components/project/AddApprover.vue
+++ b/src/components/project/AddApprover.vue
@@ -52,7 +52,7 @@
+ type="checkbox">
@@ -72,14 +72,14 @@
@@ -145,12 +145,6 @@ const onlineLearningList = () =>{
}
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([])
diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue
index 92bcb626..9021b2c1 100644
--- a/src/components/project/lockLecturer.vue
+++ b/src/components/project/lockLecturer.vue
@@ -27,7 +27,7 @@
{{formData?.affiliationCode||'-'}}
{{formData?.affiliationName||'-'}}
- {{ 否(formData?.parentName) }}
+ 否({{ formData?.parentName }})
是({{ {1:'一',2:'二',3:'三'}[formData?.code] }}级审批)
{{formData?.act||'-'}}
@@ -104,7 +104,8 @@ const props = defineProps({
title: {
type: String,
default: ""
- }
+ },
+ parentName: String,
});
const emit = defineEmits({});
const visibleModal = ref(false)
@@ -288,6 +289,7 @@ watch(visible, (val)=>{
api.getAffiliationById(props.id).then(res=>{
if(res.data.code == 200){
formData.value = res.data.data
+ formData.value.parentName = props.parentName
formData.value.act = filterList(formData.value.affiliationUserList,0)
formData.value.one = filterList(formData.value.affiliationUserList,1)
formData.value.two = filterList(formData.value.affiliationUserList,2)
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 1ad05813..bc4f3cf3 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -35,7 +35,7 @@
-
+
查看
handleModify(record, String(record.courseform))">编辑
@@ -378,6 +378,9 @@ export default{
state.formParam.leveOneArray = []
state.formParam.leveTwoArray = []
state.formParam.leveThreeArray = []
+ state.formParam.leveOneValue = null
+ state.formParam.leveTwoValue = null
+ state.formParam.leveThreeValue = null
}
state.formParam.code = null
}