master
Gitea 3 weeks ago
parent b7386df49b
commit 1762ed53ec
  1. 6
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/entity/InnovationVoucher.java
  2. 4
      jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
  3. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.data.ts
  4. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList.vue
  5. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList1.vue
  6. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue
  7. 4
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue
  8. 4
      jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue

@ -83,10 +83,10 @@ public class InnovationVoucher implements Serializable {
@Dict(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 proDept; 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") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "使用单位") @ApiModelProperty(value = "服务单位")
private java.lang.String applyDept; private java.lang.String applyDept;
/**是否同意*/ /**是否同意*/
@Excel(name = "是否同意", width = 15, dicCode = "cxq_sf_sta") @Excel(name = "是否同意", width = 15, dicCode = "cxq_sf_sta")

@ -161,9 +161,9 @@ spring:
slow-sql-millis: 5000 slow-sql-millis: 5000
datasource: datasource:
master: 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 username: root
password: root password: ycwl2022.
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置 # 多数据源配置
#multi-datasource1: #multi-datasource1:

@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'proDept_dictText' dataIndex: 'proDept_dictText'
}, },
{ {
title: '使用单位', title: '服务单位',
align: "center", align: "center",
dataIndex: 'applyDept_dictText' dataIndex: 'applyDept_dictText'
}, },
@ -85,7 +85,7 @@ export const superQuerySchema = {
proMoney: {title: '申领金额',order: 3,view: 'number', type: 'number',}, proMoney: {title: '申领金额',order: 3,view: 'number', type: 'number',},
attachment: {title: '附件',order: 4,view: 'file', type: 'string',}, attachment: {title: '附件',order: 4,view: 'file', type: 'string',},
proDept: {title: '申领单位',order: 5,view: 'sel_depart', 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',}, sfState: {title: '是否同意',order: 7,view: 'list', type: 'string',dictCode: 'cxq_sf_sta',},
state: {title: '审核状态',order: 8,view: 'list', type: 'string',dictCode: 'in_exam_status',}, state: {title: '审核状态',order: 8,view: 'list', type: 'string',dictCode: 'in_exam_status',},
useState: {title: '使用状态',order: 9,view: 'list', type: 'string',dictCode: 'cxq_use_sta',}, useState: {title: '使用状态',order: 9,view: 'list', type: 'string',dictCode: 'cxq_use_sta',},

@ -31,8 +31,8 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="applyDept"> <a-form-item name="applyDept">
<template #label><span title="使用单位">使用单位</span></template> <template #label><span title="服务单位">服务单位</span></template>
<j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear /> <j-select-dept placeholder="请选择服务单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>

@ -31,8 +31,8 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="applyDept"> <a-form-item name="applyDept">
<template #label><span title="使用单位">使用单位</span></template> <template #label><span title="服务单位">服务单位</span></template>
<j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear /> <j-select-dept placeholder="请选择服务单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>

@ -31,8 +31,8 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="applyDept"> <a-form-item name="applyDept">
<template #label><span title="使用单位">使用单位</span></template> <template #label><span title="服务单位">服务单位</span></template>
<j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear /> <j-select-dept placeholder="请选择服务单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>

@ -31,8 +31,8 @@
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="applyDept"> <a-form-item name="applyDept">
<template #label><span title="使用单位">使用单位</span></template> <template #label><span title="服务单位">服务单位</span></template>
<j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear /> <j-select-dept placeholder="请选择服务单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>

@ -30,7 +30,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="使用单位" v-bind="validateInfos.applyDept" id="InnovationVoucherForm-applyDept" name="applyDept"> <a-form-item label="服务单位" v-bind="validateInfos.applyDept" id="InnovationVoucherForm-applyDept" name="applyDept">
<j-select-dept v-model:value="formData.applyDept" :multiple="false" checkStrictly allow-clear /> <j-select-dept v-model:value="formData.applyDept" :multiple="false" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -75,7 +75,7 @@
const confirmLoading = ref<boolean>(false); const confirmLoading = ref<boolean>(false);
// //
const validatorRules = reactive({ const validatorRules = reactive({
applyDept: [{ required: true, message: '请选择使用单位!'},], applyDept: [{ required: true, message: '请选择服务单位!'},],
}); });
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

Loading…
Cancel
Save