|
@@ -106,10 +106,7 @@ const normalizeRequestParams = (params: Record<string, any> = {}) => {
|
|
|
newParams.size = newParams.pageSize;
|
|
newParams.size = newParams.pageSize;
|
|
|
delete newParams.pageSize;
|
|
delete newParams.pageSize;
|
|
|
}
|
|
}
|
|
|
- if (Array.isArray(newParams.time) && newParams.time.length === 2) {
|
|
|
|
|
- [newParams.startTime, newParams.endTime] = newParams.time;
|
|
|
|
|
- }
|
|
|
|
|
- delete newParams.time;
|
|
|
|
|
|
|
+ // 单个日期选择器不需要特殊处理,直接使用 practiceStartDate 参数
|
|
|
if (!isAdmin.value && loginFirmId.value) {
|
|
if (!isAdmin.value && loginFirmId.value) {
|
|
|
newParams.firmId = loginFirmId.value;
|
|
newParams.firmId = loginFirmId.value;
|
|
|
}
|
|
}
|
|
@@ -123,17 +120,13 @@ const columns = reactive<ColumnProps<any>[]>([
|
|
|
{
|
|
{
|
|
|
label: "从业时间",
|
|
label: "从业时间",
|
|
|
prop: "practiceStartDate",
|
|
prop: "practiceStartDate",
|
|
|
- isShow: false,
|
|
|
|
|
search: {
|
|
search: {
|
|
|
el: "date-picker",
|
|
el: "date-picker",
|
|
|
props: {
|
|
props: {
|
|
|
- type: "datetimerange",
|
|
|
|
|
|
|
+ type: "date",
|
|
|
valueFormat: "YYYY-MM-DD",
|
|
valueFormat: "YYYY-MM-DD",
|
|
|
format: "YYYY-MM-DD",
|
|
format: "YYYY-MM-DD",
|
|
|
- startPlaceholder: "开始日期",
|
|
|
|
|
- endPlaceholder: "结束日期",
|
|
|
|
|
- rangeSeparator: "至",
|
|
|
|
|
- unlinkPanels: true
|
|
|
|
|
|
|
+ placeholder: "请选择从业时间"
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|