Commit 2d2dc236 authored by 刘斌's avatar 刘斌

fix: 修复培训和面试日期错误

parent 46ab860f
......@@ -97,6 +97,11 @@ const formSchema: VbenFormSchema[] = [
},
{
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
getVxePopupContainer,
},
fieldName: 'interviewDate',
label: '面试时间',
rules: 'required',
......
......@@ -5,9 +5,10 @@ import type { TrainingApi } from '#/api/hr/training';
import { computed, ref } from 'vue';
import { useVbenDrawer } from '@vben/common-ui';
import { getVxePopupContainer } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { apiAdd, apiUpdate } from '#/api/hr/training';
import { apiAdd, apiDetail, apiUpdate } from '#/api/hr/training';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
const emit = defineEmits<{
......@@ -63,12 +64,22 @@ const formSchema: VbenFormSchema[] = [
},
{
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
getVxePopupContainer,
},
fieldName: 'trainingTime',
label: '参训时间',
rules: 'required',
},
{
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
getVxePopupContainer,
},
fieldName: 'serviceEndDate',
label: '服务期',
rules: 'required',
......@@ -121,9 +132,10 @@ const [Drawer, drawerApi] = useVbenDrawer({
if (!isOpen) {
return null;
}
const data = drawerApi.getData<TrainingApi.Training>();
isUpdate.value = !!data?.id;
if (isUpdate.value) {
const { id } = drawerApi.getData() as { id?: number };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const data = await apiDetail(id);
await formApi.setValues(data);
} else {
formApi.resetForm();
......
......@@ -17,7 +17,14 @@ export default defineConfig(async () => {
changeOrigin: true,
rewrite: (path) => path.replace(/^\/file-preview/, ''),
// mock代理目标地址
target: 'http://119.184.127.215:18010/file-preview',
target: 'http://172.16.200.110:18010/file-preview',
ws: true,
},
'/getCorsFile': {
changeOrigin: true,
rewrite: (path) => path.replace(/^\/getCorsFile/, ''),
// mock代理目标地址
target: 'http://119.184.127.215:666/getCorsFile',
ws: true,
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment