master
Gitea 2 weeks ago
parent 4eafe624d1
commit 7d8d91f75a
  1. 4
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
  2. 7
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts
  3. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue
  4. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
  5. 15
      jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm.vue

@ -78,6 +78,10 @@ public class InnovationVoucher implements Serializable {
@Excel(name = "附件", width = 15) @Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件") @ApiModelProperty(value = "附件")
private java.lang.String attachment; private java.lang.String attachment;
/**申请理由*/
@Excel(name = "申请理由", width = 15)
@ApiModelProperty(value = "申请理由")
private java.lang.String applicationReason;
/**申领单位*/ /**申领单位*/
@Excel(name = "申领单位", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Excel(name = "申领单位", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")

@ -36,10 +36,15 @@ export const columns: BasicColumn[] = [
dataIndex: 'proDept_dictText' dataIndex: 'proDept_dictText'
}, },
{ {
title: '申请理由',
align: "center",
dataIndex: 'applicationReason',
},
/* {
title: '服务单位', title: '服务单位',
align: "center", align: "center",
dataIndex: 'applyDept_dictText' dataIndex: 'applyDept_dictText'
}, },*/
/* { /* {
title: '是否同意', title: '是否同意',
align: "center", align: "center",

@ -84,6 +84,10 @@
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button> <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template> </template>
<template v-if="column.dataIndex==='applicationReason'">
<!--富文本件字段回显插槽-->
<div v-html="text"></div>
</template>
</template> </template>
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->

@ -72,6 +72,10 @@
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button> <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template> </template>
<template v-if="column.dataIndex==='applicationReason'">
<!--富文本件字段回显插槽-->
<div v-html="text"></div>
</template>
</template> </template>
</BasicTable> </BasicTable>
<!-- 表单区域 --> <!-- 表单区域 -->

@ -19,6 +19,11 @@
<a-input-number v-model:value="formData.proMoney" placeholder="请输入申领金额" style="width: 100%" /> <a-input-number v-model:value="formData.proMoney" placeholder="请输入申领金额" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-item label="申请理由" v-bind="validateInfos.applicationReason" id="InnovationVoucherForm-applicationReason" name="applicationReason">
<j-editor v-model:value="formData.applicationReason" :autoFocus="false"/>
</a-form-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="附件" v-bind="validateInfos.attachment" id="InnovationVoucherForm-attachment" name="attachment"> <a-form-item label="附件" v-bind="validateInfos.attachment" id="InnovationVoucherForm-attachment" name="attachment">
<j-upload v-model:value="formData.attachment" ></j-upload> <j-upload v-model:value="formData.attachment" ></j-upload>
@ -37,6 +42,7 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue'; import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
import { getValueType } from '/@/utils'; import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../InnovationVoucher.api'; import { saveOrUpdate } from '../InnovationVoucher.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
@ -51,10 +57,11 @@
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({ const formData = reactive<Record<string, any>>({
id: '', id: '',
proName: '', proName: '',
proType: '', proType: '',
proMoney: undefined, proMoney: undefined,
attachment: '', attachment: '',
applicationReason: '',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@ -80,7 +87,7 @@
return props.formDisabled; return props.formDisabled;
}); });
/** /**
* 新增 * 新增
*/ */

Loading…
Cancel
Save