fix:巡检计划编辑、保养计划编辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
This commit is contained in:
@@ -15,8 +15,8 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
|
||||
|
||||
import {modalSchema} from './data';
|
||||
import {getMachineTypeTree} from "#/api/property/machineType";
|
||||
import {personList} from "#/api/property/resident/person";
|
||||
import {renderDictValue} from "#/utils/render";
|
||||
import {userList} from "#/api/system/user";
|
||||
|
||||
const emit = defineEmits<{ reload: [] }>();
|
||||
|
||||
@@ -72,8 +72,8 @@ const [BasicModal, modalApi] = useVbenModal({
|
||||
record.maintainMonth = record.maintainMonth?.split(',')
|
||||
record.maintainDay = record.maintainDay?.split(',')
|
||||
}
|
||||
if (record.machineMaintainPlanStaffBoList) {
|
||||
record.userId = record.machineMaintainPlanStaffBoList.map(item=>item.userId)
|
||||
if (record.machineMaintainPlanStaffVos) {
|
||||
record.userId = record.machineMaintainPlanStaffVos.map(item=>item.userId.toString())
|
||||
}
|
||||
await formApi.setValues(record);
|
||||
}
|
||||
@@ -161,11 +161,11 @@ async function queryPersonData() {
|
||||
pageSize: 1000,
|
||||
pageNum: 1,
|
||||
}
|
||||
const res = await personList(params);
|
||||
const res = await userList(params);
|
||||
const options = res.rows.map((user) => ({
|
||||
label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
|
||||
+ '-' + user.phone + '-' + user.unitName,
|
||||
value: user.id,
|
||||
label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
|
||||
+ '-' + user.phonenumber,
|
||||
value: user.userId.toString(),
|
||||
}));
|
||||
formApi.updateSchema([{
|
||||
componentProps: () => ({
|
||||
|
Reference in New Issue
Block a user