diff --git a/public/resource/img/modalback.png b/public/resource/img/modalback.png new file mode 100644 index 0000000..2790458 Binary files /dev/null and b/public/resource/img/modalback.png differ diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue index e742b2f..49ccddf 100644 --- a/src/components/Form/src/jeecg/components/JImageUpload.vue +++ b/src/components/Form/src/jeecg/components/JImageUpload.vue @@ -25,7 +25,7 @@ - + example diff --git a/src/components/Modal/src/index.less b/src/components/Modal/src/index.less index d39a0bc..9ad6990 100644 --- a/src/components/Modal/src/index.less +++ b/src/components/Modal/src/index.less @@ -47,6 +47,9 @@ .ant-modal-body { padding: 0; + background: url(../public/resource/img/modalback.png); + background-repeat: no-repeat; + background-size: cover; > .scrollbar > .scrollbar__bar.is-horizontal { display: none; diff --git a/src/layouts/default/index.vue b/src/layouts/default/index.vue index e106ab0..66f6c41 100644 --- a/src/layouts/default/index.vue +++ b/src/layouts/default/index.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue index 408cd47..3f21164 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue +++ b/src/views/admin/orgapplyinfo/OrgApplyInfoList.vue @@ -77,7 +77,12 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; import { cloneDeep } from "lodash-es"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + + + +const { createMessage } = useMessage(); const formRef = ref(); const queryParam = reactive({}); const toggleSearchStatus = ref(false); @@ -202,7 +207,7 @@ function handleInitAccount(record) { var userInfo = {userName: record.tel,realname: record.name,orgCode:record.id} console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo) defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => { - handleSuccess(); + handleSuccess(); }) } @@ -260,7 +265,7 @@ function getTableAction(record) { // label: '信息推送', // onClick: handlePushInfo.bind(null, record), // auth: 'orgapplyinfo:nu_org_apply_info:edit', - // ifShow: record.buildStatus == '5' + // ifShow: record.buildStatus == '5'n // }, ]; } diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue index 7556168..b5e6609 100644 --- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -171,7 +171,17 @@ allow-clear placeholder="请输入驳回原因"> - + + + {{formData.auditBy}} + + + + + {{formData.auditTime}} + + + diff --git a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue index 13bdc3d..692d788 100644 --- a/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue +++ b/src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue @@ -57,7 +57,7 @@ - +
说明:请上传pdf文件,并且只能上传一份文件
@@ -141,6 +141,8 @@ const formData = reactive>({ franchiseTime: null, contract: null, contractNote: null, + auditBy: '', + auditTime: null, }); const tempNullVal = ref('') const { createMessage } = useMessage(); @@ -167,6 +169,14 @@ const disabled = computed(() => { return props.formDisabled; }); +const checkFileType = (file) => { + const isPDF = file.type === 'application/pdf' || file.name.endsWith('.pdf'); + if (!isPDF) { + createMessage.error('只能上传 PDF 文件!'); + return false; // 阻止上传 + } + return true; +}; /** * 新增