|
|
@@ -118,6 +118,11 @@
|
|
|
label: '状态',
|
|
|
defaultSelectedValue: lastAgreementProgress,
|
|
|
},
|
|
|
+ {
|
|
|
+ options: selfAssessmentLevelOptions,
|
|
|
+ label: '等级',
|
|
|
+ defaultSelectedValue: lastAgreementLevel,
|
|
|
+ },
|
|
|
]"
|
|
|
:load="(page: number, pageSize: number, _tag: number, searchText: string, drop: number[]) => loadAgreementSignAdminList(page, pageSize, searchText, drop)"
|
|
|
:show-detail="(item) => router.push({ name: 'CollectAgreementSign', query: { id: item.agreementId && item.agreementId > 0 ? item.agreementId : 0, userId: item.userId ?? 0 } })"
|
|
|
@@ -140,6 +145,11 @@
|
|
|
label: '状态',
|
|
|
defaultSelectedValue: lastSelfAssessmentProgress,
|
|
|
},
|
|
|
+ {
|
|
|
+ options: selfAssessmentLevelOptions,
|
|
|
+ label: '等级',
|
|
|
+ defaultSelectedValue: lastSelfAssessmentLevel,
|
|
|
+ },
|
|
|
]"
|
|
|
:load="(page: number, pageSize: number, _tag: number, searchText: string, drop: number[]) => loadSelfAssessmentAdminList(page, pageSize, searchText, drop)"
|
|
|
:show-detail="(item) => router.push({ name: 'CollectEvaluationForm', query: { id: item.checkId ?? item.id, userId: item.userId } })"
|
|
|
@@ -210,7 +220,16 @@ const inheritorData = ref<GetContentListItem[]>([]);
|
|
|
const { variable: lastValueCategory } = useMemorizeVar('categoryLastSelectValue', 0);
|
|
|
const { variable: lastValueStatus } = useMemorizeVar('statusLastSelectValue', -10);
|
|
|
const { variable: lastSelfAssessmentProgress } = useMemorizeVar('adminSelfAssessmentProgress', -100);
|
|
|
+const { variable: lastSelfAssessmentLevel } = useMemorizeVar('adminSelfAssessmentLevel', 0);
|
|
|
const { variable: lastAgreementProgress } = useMemorizeVar('adminUserAgreementProgress', -100);
|
|
|
+const { variable: lastAgreementLevel } = useMemorizeVar('adminUserAgreementLevel', 0);
|
|
|
+
|
|
|
+const selfAssessmentLevelOptions: DropdownCommonItem[] = [
|
|
|
+ { id: 0, name: '全部等级' },
|
|
|
+ { id: 23, name: '国家级' },
|
|
|
+ { id: 24, name: '省级' },
|
|
|
+ { id: 25, name: '市级' },
|
|
|
+];
|
|
|
|
|
|
/** 自查评估表列表:进度筛选(与 ich/check/getList 一致) */
|
|
|
const selfAssessmentProgressOptions: DropdownCommonItem[] = [
|
|
|
@@ -393,14 +412,18 @@ async function loadAreaData(page: number, pageSize: number, dropDownValues: numb
|
|
|
/** 管理员:自查评估表分页(关键词、进度走接口) */
|
|
|
async function loadSelfAssessmentAdminList(page: number, pageSize: number, searchText: string, dropDownValues: number[]) {
|
|
|
const pv = dropDownValues?.[0];
|
|
|
+ const lv = dropDownValues?.[1];
|
|
|
lastSelfAssessmentProgress.value = pv ?? -100;
|
|
|
+ lastSelfAssessmentLevel.value = lv ?? 0;
|
|
|
const progress = pv != null && pv > -50 ? pv : undefined;
|
|
|
+ const level = lv != null && lv > 0 ? lv : undefined;
|
|
|
const list = await AssessmentContentApi.getInheritorList({
|
|
|
year: new Date().getFullYear(),
|
|
|
page,
|
|
|
pageSize,
|
|
|
keywords: searchText?.trim() || undefined,
|
|
|
progress,
|
|
|
+ level,
|
|
|
});
|
|
|
return {
|
|
|
page,
|
|
|
@@ -418,14 +441,18 @@ async function loadSelfAssessmentAdminList(page: number, pageSize: number, searc
|
|
|
/** 管理员:传承人传承协议分页(ich/check/getUserAgreement) */
|
|
|
async function loadAgreementSignAdminList(page: number, pageSize: number, searchText: string, dropDownValues: number[]) {
|
|
|
const pv = dropDownValues?.[0];
|
|
|
+ const lv = dropDownValues?.[1];
|
|
|
lastAgreementProgress.value = pv ?? -100;
|
|
|
+ lastAgreementLevel.value = lv ?? 0;
|
|
|
const progress = pv != null && pv > -50 ? pv : undefined;
|
|
|
+ const level = lv != null && lv > 0 ? lv : undefined;
|
|
|
const list = await AssessmentContentApi.getUserAgreementList({
|
|
|
year: new Date().getFullYear(),
|
|
|
page,
|
|
|
pageSize,
|
|
|
keywords: searchText?.trim() || undefined,
|
|
|
progress,
|
|
|
+ level,
|
|
|
});
|
|
|
console.log(list);
|
|
|
|