diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts index 187f3cb..5d63245 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts @@ -1,12 +1,12 @@ import { FormSchema } from '@/components/Form'; -const basicOptions: LabelValueOptions = [ +/*const basicOptions: LabelValueOptions = [ { - label: '付晓晓', + label: '付晓晓222', value: '1', }, { - label: '周毛毛', + label: '周毛毛333', value: '2', }, ]; @@ -20,19 +20,39 @@ const storeTypeOptions: LabelValueOptions = [ label: '公开', value: '2', }, -]; +];*/ -export const schemas: FormSchema[] = [ +//项目基本信息schema +export const projectBaseInfoSchemas: FormSchema[] = [ + { + field: 'projectType', + component: 'Input', + label: '项目类别', + required: true, + }, { - field: 'f1', + field: 'annualId', component: 'Input', - label: '仓库名', + label: '计划年度', required: true, }, { + field: 'batchNo', + component: 'Input', + label: '批次', + defaultValue: 1, + required: true, + }, + { + field: 'projectName', + component: 'Input', + label: '项目名称', + required: true, + }, + /*{ field: 'f2', component: 'Input', - label: '仓库域名', + label: '仓库域名2', required: true, componentProps: { addonBefore: 'http://', @@ -41,11 +61,10 @@ export const schemas: FormSchema[] = [ colProps: { offset: 2, }, - }, - { + },{ field: 'f3', component: 'Select', - label: '仓库管理员', + label: '仓库管理员2', componentProps: { options: basicOptions, }, @@ -53,8 +72,7 @@ export const schemas: FormSchema[] = [ colProps: { offset: 2, }, - }, - { + },{ field: 'f4', component: 'Select', label: '审批人', @@ -62,17 +80,17 @@ export const schemas: FormSchema[] = [ options: basicOptions, }, required: true, - }, + },*/ { field: 'f5', component: 'RangePicker', label: '生效日期', required: true, - colProps: { + /*colProps: { offset: 2, - }, + },*/ }, - { + /*{ field: 'f6', component: 'Select', label: '仓库类型', @@ -83,67 +101,143 @@ export const schemas: FormSchema[] = [ colProps: { offset: 2, }, - }, + },*/ ]; -export const taskSchemas: FormSchema[] = [ + +//项目负责人schema +export const userSchemas: FormSchema[] = [ { - field: 't1', + field: 'name', component: 'Input', - label: '任务名', + label: '姓名', required: true, }, { - field: 't2', + field: 'sex', + label: '性别', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'sex', + // stringToNumber: true, + }, + }, + { + field: 'age', component: 'Input', - label: '任务描述', + label: '年龄', required: true, - colProps: { - offset: 2, - }, + // colProps: { span: 6 }, }, { - field: 't3', - component: 'Select', - label: '执行人', + label: '名族', + field: 'nation', + component: 'JDictSelectTag', componentProps: { - options: basicOptions, - }, - required: true, - colProps: { - offset: 2, + dictCode: 'nation', + // stringToNumber: true, }, + //colProps: { span: 6 }, }, { - field: 't4', - component: 'Select', - label: '责任人', + label: '党派', + field: 'political', + component: 'JDictSelectTag', componentProps: { - options: basicOptions, + dictCode: 'political', + // stringToNumber: true, }, - required: true, + //colProps: { span: 6 }, }, { - field: 't5', - component: 'TimePicker', - label: '生效日期', - required: true, + field: 'title', + component: 'Input', + label: '职称', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'job', + component: 'Input', + label: '职务', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'currentPerfession', + component: 'Input', + label: '现从事专业', + // required: true, + // colProps: { span: 6 }, + }, +]; + +//单位信息schema +export const departSchemas: FormSchema[] = [ + { + field: 'org_name', + component: 'Input', + label: '单位名称', + // required: true, + }, + { + field: 'category', + component: 'JDictSelectTag', + label: '单位性质', componentProps: { - style: { width: '100%' }, - }, - colProps: { - offset: 2, + dictCode: 'depart_category', + // stringToNumber: true, }, }, { - field: 't6', - component: 'Select', - label: '任务类型', + field: 'type', + component: 'JDictSelectTag', + label: '企业登记注册类型', componentProps: { - options: storeTypeOptions, - }, - required: true, - colProps: { - offset: 2, + dictCode: 'depart_type', + // stringToNumber: true, }, + // colProps: { span: 6 }, + }, + { + field: 'address', + component: 'Input', + label: '注册地址', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'fax', + component: 'Input', + label: '传真', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'bankName', + component: 'Input', + label: '开户银行', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'bankNo', + component: 'Input', + label: '账号', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'employeeNum', + component: 'Input', + label: '职工总数', + // required: true, + // colProps: { span: 6 }, + }, + { + field: 'lastYearFee', + component: 'Input', + label: '上年度研发经费', + // required: true, + // colProps: { span: 6 }, }, ]; diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue index cd76e1d..ac08d62 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue @@ -1,13 +1,13 @@