diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue index f5dd19b9..13c0819b 100644 --- a/src/components/project/LookInsideLecturer.vue +++ b/src/components/project/LookInsideLecturer.vue @@ -409,6 +409,13 @@ export default { key: 'updateName', ellipsis: true, align: "center", width: 120, + customRender: (value) => { + return ( +
+ { value.record.updateName || '-' } +
+ ) + } }, ]) //晋级记录列表数据 diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index 1951c91b..37556d78 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -12,7 +12,7 @@ :disabled="disabled" v-model:value="selectData" style="width: 100%" - placeholder="请查询姓名或工号" + :placeholder="placeholder" :options="isOpen?options:selectOptions" :filter-option="false" showSearch @@ -117,6 +117,10 @@ const props = defineProps({ lecturer: { type: Boolean, default: false, + }, + placeholder: { + type: String, + default: '请查询姓名或工号' } }) const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id','update:payrollPlaceCode','update:payrollPlaceName']) diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 390851f4..c793678e 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -90,7 +90,7 @@ @@ -175,7 +173,7 @@ + v-model:id="formParam.id" v-model:system="tSystemNames" v-model:level="formParam.tlevelId" placeholder="请查询姓名或工号(只可查询非讲师人员)"> diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue index ad030f3c..cf617cbc 100644 --- a/src/views/lecturer/OrganizationApproval.vue +++ b/src/views/lecturer/OrganizationApproval.vue @@ -27,7 +27,7 @@ 全部 待提交 审核中 - + 已完成 审核失败 @@ -769,9 +769,12 @@ export default { state.tableLoading = true; let objA = { status: status?status:state.searchParam.status, + name: state.searchParam.name, + leaderName: state.searchParam.leaderName, + isParent: state.searchParam.isParent, //TODO GX03 //审批未通过意外的数据 - approvalType:1, + // approvalType:1, moduleType:1, }; console.log("执行 gx getTableDate objA",objA); diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue index a63cd0ac..938d812a 100644 --- a/src/views/lecturer/OrganizationList.vue +++ b/src/views/lecturer/OrganizationList.vue @@ -25,6 +25,22 @@ /> + + + + {{ item.label }} + + +