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 af9291b..b64a1e0 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 @@ -83,10 +83,10 @@ public class InnovationVoucher implements Serializable { @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @ApiModelProperty(value = "申领单位") private java.lang.String proDept; - /**使用单位*/ - @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") - @ApiModelProperty(value = "使用单位") + @ApiModelProperty(value = "服务单位") private java.lang.String applyDept; /**是否同意*/ @Excel(name = "是否同意", width = 15, dicCode = "cxq_sf_sta") diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 87b2058..fee8638 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -161,9 +161,9 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://10.100.200.177:3306/zmd_cxq?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://182.92.169.222:3306/zmd_cxq?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: ycwl2022. driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts index 18a76e9..a7f72ca 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts @@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'proDept_dictText' }, { - title: '使用单位', + title: '服务单位', align: "center", dataIndex: 'applyDept_dictText' }, @@ -85,7 +85,7 @@ export const superQuerySchema = { proMoney: {title: '申领金额',order: 3,view: 'number', type: 'number',}, attachment: {title: '附件',order: 4,view: 'file', type: 'string',}, proDept: {title: '申领单位',order: 5,view: 'sel_depart', type: 'string',}, - applyDept: {title: '使用单位',order: 6,view: 'sel_depart', type: 'string',}, + applyDept: {title: '服务单位',order: 6,view: 'sel_depart', type: 'string',}, sfState: {title: '是否同意',order: 7,view: 'list', type: 'string',dictCode: 'cxq_sf_sta',}, state: {title: '审核状态',order: 8,view: 'list', type: 'string',dictCode: 'in_exam_status',}, useState: {title: '使用状态',order: 9,view: 'list', type: 'string',dictCode: 'cxq_use_sta',}, diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue index 9dcfbb1..007f985 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue @@ -31,8 +31,8 @@ - - + + diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue index 5764adc..fef21b8 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue @@ -31,8 +31,8 @@ - - + + diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue index 3d25294..79b4ed5 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue @@ -31,8 +31,8 @@ - - + + diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue index e228117..8e9fd83 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue @@ -31,8 +31,8 @@ - - + + diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue index 99303a7..bc7bf0c 100644 --- a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue +++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue @@ -30,7 +30,7 @@ - + @@ -75,7 +75,7 @@ const confirmLoading = ref(false); //表单验证 const validatorRules = reactive({ - applyDept: [{ required: true, message: '请选择使用单位!'},], + applyDept: [{ required: true, message: '请选择服务单位!'},], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });