diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
index b64a1e0..bbc9433 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
@@ -78,6 +78,10 @@ public class InnovationVoucher implements Serializable {
@Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件")
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")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts
index dee492a..b0778e3 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts
@@ -36,10 +36,15 @@ export const columns: BasicColumn[] = [
dataIndex: 'proDept_dictText'
},
{
+ title: '申请理由',
+ align: "center",
+ dataIndex: 'applicationReason',
+ },
+/* {
title: '服务单位',
align: "center",
dataIndex: 'applyDept_dictText'
- },
+ },*/
/* {
title: '是否同意',
align: "center",
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue
index 007f985..1ff3bd2 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue
@@ -84,6 +84,10 @@
无文件
下载
+
+
+
+
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
index bb3abba..72b4833 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
@@ -72,6 +72,10 @@
无文件
下载
+
+
+
+
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm.vue
index 5ae5e1d..4a92c97 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm.vue
+++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm.vue
@@ -19,6 +19,11 @@
+
+
+
+
+
@@ -37,6 +42,7 @@
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.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 { saveOrUpdate } from '../InnovationVoucher.api';
import { Form } from 'ant-design-vue';
@@ -51,10 +57,11 @@
const emit = defineEmits(['register', 'ok']);
const formData = reactive>({
id: '',
- proName: '',
- proType: '',
+ proName: '',
+ proType: '',
proMoney: undefined,
- attachment: '',
+ attachment: '',
+ applicationReason: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
@@ -80,7 +87,7 @@
return props.formDisabled;
});
-
+
/**
* 新增
*/