update
1.更新im 2.修改最近提的问题
This commit is contained in:
@@ -4,7 +4,10 @@ import { render } from '/@/utils/common/renderUtils';
|
||||
import { getHospitalsList, getNewHospitalApi } from '../../system/user/user.api';
|
||||
import { personType } from '/@/views/emergency/outburst/ScheduleCustom/ScheduleDefault.api';
|
||||
import dayjs from 'dayjs';
|
||||
import { onSitePersonNewApi } from '/@/views/emergency/communication/components/commApi';
|
||||
import {
|
||||
employListApi,
|
||||
onSitePersonNewApi, secondDepartApi
|
||||
} from '/@/views/emergency/communication/components/commApi';
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
import moment from 'moment';
|
||||
import { getZHospitalApi } from '/@/views/emergency/EmergencySeriousDisease/EmergencySeriousDisease.api';
|
||||
@@ -436,3 +439,82 @@ export function getBpmFormSchema(_formData): FormSchema[] {
|
||||
// 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
|
||||
return formSchema;
|
||||
}
|
||||
|
||||
const mColumns: BasicColumn[] = [
|
||||
{
|
||||
title: '员工姓名',
|
||||
dataIndex: 'realname',
|
||||
},
|
||||
{
|
||||
title: '单位名称',
|
||||
dataIndex: ['secondDepart', 'departName'],
|
||||
},
|
||||
];
|
||||
const mSearchFormSchema: FormSchema[] = [
|
||||
{
|
||||
label: '员工姓名',
|
||||
field: 'realname',
|
||||
component: 'Input',
|
||||
},
|
||||
{
|
||||
label: '单位名称',
|
||||
field: 'orgCode',
|
||||
component: 'ApiSelect',
|
||||
componentProps: () => {
|
||||
return {
|
||||
api: secondDepartApi,
|
||||
resultField: 'result',
|
||||
labelField: 'departName',
|
||||
valueField: 'orgCode',
|
||||
immediate: true,
|
||||
}
|
||||
}
|
||||
},
|
||||
];
|
||||
|
||||
export const tableProps = {
|
||||
tableProps: {
|
||||
api: employListApi,
|
||||
columns: mColumns,
|
||||
canResize: false,
|
||||
immediate: false,
|
||||
rowKey: (record: Recordable) => {
|
||||
return JSON.stringify({
|
||||
id: record.id,
|
||||
realname: record?.realname
|
||||
});
|
||||
},
|
||||
formConfig: {
|
||||
labelWidth: 63,
|
||||
schemas: mSearchFormSchema,
|
||||
autoSubmitOnEnter: true,
|
||||
showAdvancedButton: false,
|
||||
fieldMapToNumber: [],
|
||||
fieldMapToTime: [],
|
||||
baseColProps: {
|
||||
xs: 12,
|
||||
sm: 12,
|
||||
md: 12,
|
||||
lg: 12,
|
||||
xl: 12,
|
||||
xxl: 12,
|
||||
},
|
||||
actionColOptions: {
|
||||
span: 24,
|
||||
offset: 0,
|
||||
xs: 12,
|
||||
sm: 12,
|
||||
md: 12,
|
||||
lg: 12,
|
||||
xl: 12,
|
||||
xxl: 12,
|
||||
},
|
||||
// resetFunc: () => {
|
||||
// setTimeout(async () => {
|
||||
// await chooseDom.value.getForm().setFieldsValue(paramsInfo.value);
|
||||
// });
|
||||
// },
|
||||
},
|
||||
showActionColumn: false,
|
||||
},
|
||||
}
|
||||
|
||||
+21
-5
@@ -13,7 +13,14 @@
|
||||
<BasicForm @register="registerForm" style="overflow: auto" />
|
||||
</BasicDrawer>
|
||||
<!-- <UserSelectModal rowKey="id" @register="registerSelUserModal" @getSelectResult="onSelectUserOk" />-->
|
||||
<replace-other ref="replaceOtherRef" title="选择用户" @choose-employ="onSelectUserOk" />
|
||||
<!-- <replace-other ref="replaceOtherRef" title="选择用户" @choose-employ="onSelectUserOk" />-->
|
||||
<ChooseSome
|
||||
:width="750"
|
||||
@register="registerUserDrawer"
|
||||
@select-some="onSelectUserOk"
|
||||
title="选择用户"
|
||||
:tableprops="tableProps"
|
||||
/>
|
||||
<list-user-by-person-type @register="registerListModal" />
|
||||
</div>
|
||||
</template>
|
||||
@@ -22,14 +29,15 @@
|
||||
import { ref, unref } from 'vue';
|
||||
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
|
||||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||||
import { formSchema } from '../EmergencySeriousDisease.data';
|
||||
import {formSchema, tableProps} from '../EmergencySeriousDisease.data';
|
||||
import { saveOrUpdate } from '../EmergencySeriousDisease.api';
|
||||
import UserSelectModal from '/@/components/Form/src/jeecg/components/modal/UserSelectModalIllness.vue';
|
||||
import { useModal } from '/@/components/Modal';
|
||||
import { useDrawer } from '/@/components/Drawer';
|
||||
import ListUserByPersonType from '/@/views/emergency/EmergencySeriousDisease/components/listUserByPersonType.vue';
|
||||
import ReplaceOther from '/@/views/emergency/communication/components/replaceOther.vue';
|
||||
const [registerSelUserModal, selUserModal] = useDrawer();
|
||||
import ChooseSome from "/@/views/compoents/chooseSome/index.vue";
|
||||
const [registerUserDrawer, {openDrawer}] = useDrawer();
|
||||
const [registerListModal, { openDrawer: openListModal }] = useDrawer();
|
||||
// Emits声明
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
@@ -39,7 +47,15 @@
|
||||
//设置标题
|
||||
const title = ref<string>('');
|
||||
formSchema[0].componentProps.onClick = () => {
|
||||
replaceOtherRef.value.showModal();
|
||||
// replaceOtherRef.value.showModal();
|
||||
openDrawer(true, {
|
||||
selectedRowKeys: [
|
||||
JSON.stringify({
|
||||
id: getFieldsValue().userId,
|
||||
realname: getFieldsValue().realname,
|
||||
})
|
||||
]
|
||||
});
|
||||
};
|
||||
formSchema[7].componentProps.onOptionsChange = (options) => {
|
||||
onSelectHospital(options);
|
||||
@@ -64,7 +80,7 @@
|
||||
// });
|
||||
|
||||
//表单配置
|
||||
const [registerForm, { setProps, resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
|
||||
const [registerForm, { setProps, resetFields, setFieldsValue, validate, clearValidate, updateSchema, getFieldsValue }] = useForm({
|
||||
//labelWidth: 150,
|
||||
schemas: formSchema,
|
||||
showActionButtonGroup: false,
|
||||
|
||||
Reference in New Issue
Block a user