yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令图片改为上传至管理平台

This commit is contained in:
1378012178@qq.com 2025-10-09 14:49:30 +08:00
parent 7a52d9a149
commit 279bdc20bc
18 changed files with 998 additions and 920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101 VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101
@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
VITE_APP_SUB_jeecg-app-1 = '//localhost:8091' VITE_APP_SUB_jeecg-app-1 = '//localhost:8091'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-体型标签默认图片 # 长者标签-体型标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png'
# 长者标签-情绪标签默认图片 # 长者标签-情绪标签默认图片

5
.env.development2
View File

@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102 VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102
@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-体型标签默认图片 # 长者标签-体型标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png'
# 长者标签-情绪标签默认图片 # 长者标签-情绪标签默认图片

5
.env.development3
View File

@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/nursing-unit_103","http://localhost:8093/nursing-unit_103"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/nursing-unit_103","http://localhost:8093/nursing-unit_103"],["/upload","http://localhost:3300/upload"],["/opeexup","http://localhost:8081/opeapi/"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8093/nursing-unit_103 VITE_GLOB_DOMAIN_URL=http://localhost:8093/nursing-unit_103
@ -20,6 +20,9 @@ VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-体型标签默认图片 # 长者标签-体型标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png'
# 长者标签-情绪标签默认图片 # 长者标签-情绪标签默认图片

6
.env.production
View File

@ -4,6 +4,9 @@ VITE_USE_MOCK = false
# 发布路径 # 发布路径
VITE_PUBLIC_PATH = /biz101 VITE_PUBLIC_PATH = /biz101
# 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/opeexup","https://www.focusnu.com/opeapi/"]]
# 是否启用gzip或brotli压缩 # 是否启用gzip或brotli压缩
# 选项值: gzip | brotli | none # 选项值: gzip | brotli | none
# 如果需要多个可以使用“,”分隔 # 如果需要多个可以使用“,”分隔
@ -21,6 +24,9 @@ VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101
# 接口父路径前缀 # 接口父路径前缀
VITE_GLOB_API_URL_PREFIX= VITE_GLOB_API_URL_PREFIX=
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/upFiles/'
# 长者标签-体型标签默认图片 # 长者标签-体型标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png' VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'https://www.focusnu.com/media/default/bodyDefault.png'
# 长者标签-情绪标签默认图片 # 长者标签-情绪标签默认图片

9
src/api/common/api.ts
View File

@ -20,6 +20,7 @@ enum Api {
getApiAddressByOrgCode = '/sys/api/getApiAddressByOrgCode', getApiAddressByOrgCode = '/sys/api/getApiAddressByOrgCode',
getOrgUrlByOrgCode = '/sys/api/getOrgUrlByOrgCode', getOrgUrlByOrgCode = '/sys/api/getOrgUrlByOrgCode',
getMediaUrlByOrgCode = '/sys/api/getMediaUrlByOrgCode', getMediaUrlByOrgCode = '/sys/api/getMediaUrlByOrgCode',
uploadPre = '/sys/common/upload/pre',
} }
/** /**
@ -200,3 +201,11 @@ export const uploadMyFile = (url, data) => {
export const getOrgInfo = () => { export const getOrgInfo = () => {
return defHttp.get({ url: Api.getOrgInfo }); return defHttp.get({ url: Api.getOrgInfo });
}; };
/**
* 上传前置接口
* @param params
*/
export const uploadPre = (params) => {
return defHttp.post({ url: Api.uploadPre, params }, { isTransformResponse: false });
};

88
src/components/Form/src/jeecg/components/JImageUploadtz.vue
View File

@ -1,19 +1,9 @@
<template> <template>
<div class="clearfix"> <div class="clearfix">
<a-upload-dragger <a-upload-dragger :listType="listType" accept="image/*" :multiple="multiple" :action="currentUploadUrl"
:listType="listType" :data="{ biz: bizPath, ...extraUploadData }" :headers="headers" v-model:fileList="uploadFileList"
accept="image/*" :beforeUpload="beforeUpload" :disabled="disabled" :showUploadList="false" @change="handleChange"
:multiple="multiple" @preview="handlePreview">
:action="uploadUrl"
:headers="headers"
:data="{ biz: bizPath }"
v-model:fileList="uploadFileList"
:beforeUpload="beforeUpload"
:disabled="disabled"
:showUploadList="false"
@change="handleChange"
@preview="handlePreview"
>
<div v-if="uploadVisible"> <div v-if="uploadVisible">
<div v-if="listType == 'picture-card'"> <div v-if="listType == 'picture-card'">
<div class="upload-area" style="padding: 20px;"> <div class="upload-area" style="padding: 20px;">
@ -56,19 +46,10 @@
</div> </div>
</div> </div>
</div> </div>
<a-modal <a-modal :open="previewVisible" :width="modalWidth"
:open="previewVisible" :bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }" :footer="null"
:width="modalWidth" @cancel="handleCancel">
:bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }" <img ref="previewImgRef" class="preview-img" :src="previewImage" @load="handleImageLoad" />
:footer="null"
@cancel="handleCancel"
>
<img
ref="previewImgRef"
class="preview-img"
:src="previewImage"
@load="handleImageLoad"
/>
</a-modal> </a-modal>
</div> </div>
</template> </template>
@ -80,8 +61,9 @@
import { useAttrs } from '/@/hooks/core/useAttrs'; import { useAttrs } from '/@/hooks/core/useAttrs';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/compUtils'; import { getFileAccessHttpUrl, getHeaders, getRandom } from '/@/utils/common/compUtils';
import { uploadUrl } from '/@/api/common/api'; import { uploadUrl, uploadPre } from '/@/api/common/api';
import { getToken } from '/@/utils/auth'; import { getToken } from '/@/utils/auth';
import { Upload } from 'ant-design-vue';
const { createMessage, createErrorModal } = useMessage(); const { createMessage, createErrorModal } = useMessage();
export default defineComponent({ export default defineComponent({
@ -121,12 +103,21 @@
required: false, required: false,
default: 1, default: 1,
}, },
// 是否上传至管理平台
toOpe: {
type: Boolean,
required: false,
default: false,
}
}, },
emits: ['options-change', 'change', 'update:value'], emits: ['options-change', 'change', 'update:value'],
setup(props, { emit, refs }) { setup(props, { emit, refs }) {
const emitData = ref<any[]>([]); const emitData = ref<any[]>([]);
const attrs = useAttrs(); const attrs = useAttrs();
const [state] = useRuleFormItem(props, 'value', 'change', emitData); const [state] = useRuleFormItem(props, 'value', 'change', emitData);
const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({});
//获取文件名 //获取文件名
const getFileName = (path) => { const getFileName = (path) => {
if (path.lastIndexOf('\\') >= 0) { if (path.lastIndexOf('\\') >= 0) {
@ -212,14 +203,28 @@
/** /**
* 上传前校验 * 上传前校验
*/ */
function beforeUpload(file) { async function beforeUpload(file) {
let fileType = file.type; let fileType = file.type;
console.log("🚀 ~ beforeUpload ~ fileType:", fileType)
if (fileType.indexOf('image') < 0) { if (fileType.indexOf('image') < 0) {
createMessage.info('请上传图片'); createMessage.info('请上传图片');
uploadFileList.value = [];
return false; return false;
} }
if (props.toOpe) {
let res = await uploadPre({ fileName: file.name, fileSize: file.size });
if (res.result == 500) {
createMessage.info('服务暂时不可用，请稍后重试');
return Upload.LIST_IGNORE;
} else {
// 切换上传地址和参数
currentUploadUrl.value = '/opeexup/sys/common/static/upload/export';
extraUploadData.value = { name: res.result, size: file.size };
}
} else {
// 恢复默认
currentUploadUrl.value = uploadUrl;
extraUploadData.value = {};
}
return true;
} }
/** /**
* 文件上传结果回调 * 文件上传结果回调
@ -352,7 +357,9 @@ const handleImageLoad = () => {
previewImgRef, previewImgRef,
modalWidth, modalWidth,
props, props,
removeFile removeFile,
currentUploadUrl,
extraUploadData,
}; };
}, },
}); });
@ -367,9 +374,11 @@ const handleImageLoad = () => {
margin-top: 8px; margin-top: 8px;
color: #666; color: #666;
} }
/* 确保 Modal 内容区域填满 */ /* 确保 Modal 内容区域填满 */
.imgView .ant-modal-body { .imgView .ant-modal-body {
height: 80vh; /* 限制模态框高度，避免超出屏幕 */ height: 80vh;
/* 限制模态框高度，避免超出屏幕 */
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -388,25 +397,31 @@ const handleImageLoad = () => {
.preview-img { .preview-img {
max-width: 100%; max-width: 100%;
max-height: 100%; max-height: 100%;
object-fit: contain; /* 保持比例，不拉伸 */ object-fit: contain;
/* 保持比例，不拉伸 */
} }
:deep(.ant-upload-wrapper .ant-upload-drag .ant-upload) { :deep(.ant-upload-wrapper .ant-upload-drag .ant-upload) {
padding: 0px !important; padding: 0px !important;
} }
:deep(.ant-upload-drag) { :deep(.ant-upload-drag) {
border: 0px !important; border: 0px !important;
} }
.upload-text { .upload-text {
font-size: 16px; font-size: 16px;
color: rgba(74, 69, 69, 0.85); color: rgba(74, 69, 69, 0.85);
margin-bottom: 8px; margin-bottom: 8px;
} }
.upload-icon { .upload-icon {
margin: 16px; margin: 16px;
} }
.divider { .divider {
font-size:12px;color:rgb(189, 189, 189); font-size: 12px;
color: rgb(189, 189, 189);
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item) { :deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item) {
@ -421,6 +436,7 @@ const handleImageLoad = () => {
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail) { :deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -431,6 +447,7 @@ const handleImageLoad = () => {
text-align: center; text-align: center;
flex: none; flex: none;
} }
:deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) { :deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -439,5 +456,4 @@ const handleImageLoad = () => {
transition: all 0.3s; transition: all 0.3s;
margin-top: -20px; margin-top: -20px;
} }
</style> </style>

64
src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue
View File

@ -1,19 +1,9 @@
<template> <template>
<div ref="containerRef" :class="`${prefixCls}-container`"> <div ref="containerRef" :class="`${prefixCls}-container`">
<a-upload-dragger <a-upload-dragger accept="audio/mp3" :headers="headers" :multiple="multiple" :action="currentUploadUrl"
accept="audio/mp3" :data="{ biz: bizPath, ...extraUploadData }" :fileList="fileList" :disabled="disabled" v-bind="bindProps"
:headers="headers" :beforeUpload="beforeUpload" :showUploadList="false" @remove="onRemove" @change="onFileChange"
:multiple="multiple" @preview="onFilePreview">
:action="uploadUrl"
:fileList="fileList"
:disabled="disabled"
v-bind="bindProps"
:beforeUpload="beforeUpload"
:showUploadList="false"
@remove="onRemove"
@change="onFileChange"
@preview="onFilePreview"
>
<template v-if="isImageMode"> <template v-if="isImageMode">
<div v-if="!isMaxCount"> <div v-if="!isMaxCount">
<Icon icon="ant-design:plus-outlined" /> <Icon icon="ant-design:plus-outlined" />
@ -61,7 +51,7 @@
import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue'; import { ref, reactive, computed, watch, nextTick, createApp, unref } from 'vue';
import { Icon } from '/@/components/Icon'; import { Icon } from '/@/components/Icon';
import { getToken } from '/@/utils/auth'; import { getToken } from '/@/utils/auth';
import { uploadUrl } from '/@/api/common/api'; import { uploadUrl, uploadPre } from '/@/api/common/api';
import { propTypes } from '/@/utils/propTypes'; import { propTypes } from '/@/utils/propTypes';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { createImgPreview } from '/@/components/Preview/index'; import { createImgPreview } from '/@/components/Preview/index';
@ -71,6 +61,7 @@
import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils'; import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
import UploadItemActions from './components/UploadItemActions.vue'; import UploadItemActions from './components/UploadItemActions.vue';
import { InboxOutlined } from '@ant-design/icons-vue'; import { InboxOutlined } from '@ant-design/icons-vue';
import { Upload } from 'ant-design-vue';
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const { prefixCls } = useDesign('j-upload'); const { prefixCls } = useDesign('j-upload');
@ -102,11 +93,19 @@
disabled: propTypes.bool.def(false), disabled: propTypes.bool.def(false),
// 替换前一个文件，用于超出最大数量依然允许上传 // 替换前一个文件，用于超出最大数量依然允许上传
replaceLastOne: propTypes.bool.def(false), replaceLastOne: propTypes.bool.def(false),
// 是否上传至管理平台
toOpe: {
type: Boolean,
required: false,
default: false,
}
}); });
const headers = getHeaders(); const headers = getHeaders();
const fileList = ref<any[]>([]); const fileList = ref<any[]>([]);
const uploadGoOn = ref<boolean>(true); const uploadGoOn = ref<boolean>(true);
const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({});
// refs // refs
const containerRef = ref(); const containerRef = ref();
// 是否达到了最大上传数量 // 是否达到了最大上传数量
@ -273,14 +272,31 @@
/** /**
* 上传前校验 * 上传前校验
*/ */
function beforeUpload(file) { async function beforeUpload(file) {
let fileType = file.type; let fileType = file.type;
console.log("🚀 ~ beforeUpload ~ fileType:", fileType) console.log("🚀 ~ beforeUpload ~ file:", file)
if (fileType.indexOf('audio') < 0) { if (fileType.indexOf('audio') < 0) {
createMessage.info('请上传MP3文件'); createMessage.info('请上传MP3文件');
fileList.value = []; fileList.value = [];
return false; return false;
} }
if (props.toOpe) {
let res = await uploadPre({ fileName: file.name, fileSize: file.size });
if (res.result == 500) {
createMessage.info('服务暂时不可用，请稍后重试');
return Upload.LIST_IGNORE;
} else {
// 切换上传地址和参数
currentUploadUrl.value = '/opeexup/sys/common/static/upload/export';
extraUploadData.value = { biz: props.bizPath, name: res.result, size: file.size };
console.log("🌊 ~ beforeUpload ~ extraUploadData.value:", extraUploadData.value)
}
} else {
// 恢复默认
currentUploadUrl.value = uploadUrl;
extraUploadData.value = { biz: props.bizPath };
}
return true;
} }
// 文件上传之前的操作 // 文件上传之前的操作
function onBeforeUpload(file) { function onBeforeUpload(file) {
@ -471,11 +487,14 @@
.upload-download-handler { .upload-download-handler {
right: 6px !important; right: 6px !important;
} }
/* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/ /* update-end-author:taoyan date:2022-5-24 for:VUEN-1093详情界面 图片下载按钮显示不全*/
} }
.ant-upload-text-icon { .ant-upload-text-icon {
color: @primary-color; color: @primary-color;
} }
.ant-upload-list-item { .ant-upload-list-item {
.upload-actions-container { .upload-actions-container {
position: absolute; position: absolute;
@ -523,22 +542,28 @@
} }
} }
} }
.ant-upload-wrapper .ant-upload-drag .ant-upload { .ant-upload-wrapper .ant-upload-drag .ant-upload {
padding: 0px !important; padding: 0px !important;
} }
.ant-upload-drag { .ant-upload-drag {
border: 0px !important; border: 0px !important;
} }
.upload-text { .upload-text {
font-size: 16px; font-size: 16px;
color: rgba(74, 69, 69, 0.85); color: rgba(74, 69, 69, 0.85);
margin-bottom: 8px; margin-bottom: 8px;
} }
.upload-icon { .upload-icon {
margin: 16px; margin: 16px;
} }
.divider { .divider {
font-size:12px;color:rgb(189, 189, 189); font-size: 12px;
color: rgb(189, 189, 189);
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item) { :deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item) {
@ -553,6 +578,7 @@
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
} }
:deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail) { :deep(.ant-upload-wrapper .ant-upload-list.ant-upload-list-picture-card .ant-upload-list-item .ant-upload-list-item-thumbnail) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -563,6 +589,7 @@
text-align: center; text-align: center;
flex: none; flex: none;
} }
:deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) { :deep(.ant-upload-wrapper .ant-upload-list .ant-upload-list-item .ant-upload-list-item-name) {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -579,5 +606,4 @@
background: #f1f7ff; background: #f1f7ff;
text-align: center; text-align: center;
} }
</style> </style>

40
src/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue
View File

@ -228,26 +228,26 @@ function getTableAction(record) {
label: '邀请', label: '邀请',
onClick: handleInvite.bind(null, record), onClick: handleInvite.bind(null, record),
}, },
{ // {
label: '获取身份证', // label: '获取身份证',
onClick: handleAcquireIdenCard.bind(null, record), // onClick: handleAcquireIdenCard.bind(null, record),
ifShow: () => { // ifShow: () => {
//正面hasCardZmPath和反面hasCardFmPath两个字段 员工传了且已拉取时为1 没有证件为0 拉取中是2 未获取/拉取失败都是null/undefined // //正面hasCardZmPath和反面hasCardFmPath两个字段 员工传了且已拉取时为1 没有证件为0 拉取中是2 未获取/拉取失败都是null/undefined
let result = false // let result = false
if (record.hasCardZmPath == '2' || record.hasCardFmPath == '2') { // if (record.hasCardZmPath == '2' || record.hasCardFmPath == '2') {
//有正在拉取中的不让拉 // //有正在拉取中的不让拉
return false; // return false;
} // }
if (record.hasCardZmPath == '1' && record.hasCardFmPath == '1') { // if (record.hasCardZmPath == '1' && record.hasCardFmPath == '1') {
//两个都成功了不让拉 // //两个都成功了不让拉
return false; // return false;
} // }
if (record.hasCardZmPath == null || record.hasCardZmPath == undefined || record.hasCardFmPath == null || record.hasCardFmPath == undefined) { // if (record.hasCardZmPath == null || record.hasCardZmPath == undefined || record.hasCardFmPath == null || record.hasCardFmPath == undefined) {
result = true // result = true
} // }
return result // return result
} // }
} // }
]; ];
} }

4
src/views/admin/employeesadvisoryinfo/components/NuEmployeesAdvisoryInfoForm.vue
View File

@ -128,12 +128,12 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证正面"> <a-form-item label="身份证正面">
<j-image-upload :fileMax="1" v-model:value="formData.cardZmPath" disabled></j-image-upload> <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.cardZmPath" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证反面"> <a-form-item label="身份证反面">
<j-image-upload :fileMax="1" v-model:value="formData.cardFmPath" disabled></j-image-upload> <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.cardFmPath" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>

16
src/views/admin/employeesapply/components/EmployeesApplyForm.vue
View File

@ -152,14 +152,14 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" <a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive"> id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" v-model:value="formData.idCardPositive" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" :value="opeMediaAddress + formData.idCardPositive"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" <a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative"> id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" v-model:value="formData.idCardNegative" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`":value="opeMediaAddress + formData.idCardNegative"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -171,7 +171,7 @@
<a-form-item label="健康证正面" v-bind="validateInfos.healthCertificatePositive" <a-form-item label="健康证正面" v-bind="validateInfos.healthCertificatePositive"
id="BizEmployeesInfoForm-healthCertificatePositive" name="healthCertificatePositive"> id="BizEmployeesInfoForm-healthCertificatePositive" name="healthCertificatePositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.healthCertificatePositive" disabled></j-image-upload> :value="opeMediaAddress + formData.healthCertificatePositive" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- <a-col :span="12"> <!-- <a-col :span="12">
@ -189,14 +189,14 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="银行卡正面" v-bind="validateInfos.bankPositive" <a-form-item label="银行卡正面" v-bind="validateInfos.bankPositive"
id="BizEmployeesInfoForm-bankPositive" name="bankPositive"> id="BizEmployeesInfoForm-bankPositive" name="bankPositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" v-model:value="formData.bankPositive" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" :value="opeMediaAddress + formData.bankPositive"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="银行卡反面" v-bind="validateInfos.bankNegative" <a-form-item label="银行卡反面" v-bind="validateInfos.bankNegative"
id="BizEmployeesInfoForm-bankNegative" name="bankNegative"> id="BizEmployeesInfoForm-bankNegative" name="bankNegative">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" v-model:value="formData.bankNegative" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" :value="opeMediaAddress + formData.bankNegative"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -207,7 +207,7 @@
<a-col :span="24"> <a-col :span="24">
<a-form-item label="资质证" v-bind="validateInfos.qualification" <a-form-item label="资质证" v-bind="validateInfos.qualification"
id="BizEmployeesInfoForm-qualification" name="qualification" :labelCol="labelCol3"> id="BizEmployeesInfoForm-qualification" name="qualification" :labelCol="labelCol3">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" v-model:value="formData.qualification" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" :value="opeMediaAddress + formData.qualification"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -219,7 +219,7 @@
<a-form-item label="无犯罪证明" v-bind="validateInfos.noCrimeCertificate" <a-form-item label="无犯罪证明" v-bind="validateInfos.noCrimeCertificate"
id="BizEmployeesInfoForm-noCrimeCertificate" name="noCrimeCertificate" :labelCol="labelCol3"> id="BizEmployeesInfoForm-noCrimeCertificate" name="noCrimeCertificate" :labelCol="labelCol3">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.noCrimeCertificate" disabled></j-image-upload> :value="opeMediaAddress + formData.noCrimeCertificate" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -294,11 +294,13 @@ import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../EmployeesApply.api'; import { saveOrUpdate } from '../EmployeesApply.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({ const props = defineProps({
formDisabled: { type: Boolean, default: false }, formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({}) }, formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true } formBpm: { type: Boolean, default: true }
}); });
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const formRef = ref(); const formRef = ref();
const useForm = Form.useForm; const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);

8
src/views/admin/employeesapply/components/EmployeesApplyModal.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<a-drawer :title="title" width="70vw" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }" <a-drawer :title="title" width="70vw" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }"
@close="handleCancel"> :bodyStyle="{ padding: '14px' }" @close="handleCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
@ -11,15 +11,15 @@
</a-drawer> </a-drawer>
<!-- 可邀请邀请列表 --> <!-- 可邀请邀请列表 -->
<a-drawer :title="'邀请'" width="70vw" :visible="invidedVisible" :closable="true" :footer-style="{ textAlign: 'right' }" <a-drawer :title="'邀请'" width="70vw" :visible="invidedVisible" :closable="true" :footer-style="{ textAlign: 'right' }"
@close="handleInvidedCancel"> :bodyStyle="{ padding: '14px' }" @close="handleInvidedCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleInvidedCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleInvidedCancel">关闭</a-button>
</template> </template>
<NuEmployeesAdvisoryInfoList v-if="invidedVisible" ref="invidedRef" @reload="submitCallback" /> <NuEmployeesAdvisoryInfoList v-if="invidedVisible" ref="invidedRef" @reload="submitCallback" />
</a-drawer> </a-drawer>
<!-- 员工信息变更审核 --> <!-- 员工信息变更审核 -->
<a-drawer :title="title" width="70vw" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }" <a-drawer :title="'审核'" width="70vw" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }"
@close="handleUpInfoCancel"> :bodyStyle="{ padding: '14px' }" @close="handleUpInfoCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button>
<a-button type="primary" @click="handleUpInfoOk">确认</a-button> <a-button type="primary" @click="handleUpInfoOk">确认</a-button>

44
src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue
View File

@ -1,24 +1,5 @@
<template> <template>
<div class="container2"> <div class="container2">
<a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
<a-row> <a-row>
<a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;"> <a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
<a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small" <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
@ -28,10 +9,10 @@
<span>{{ applyObj[record.d1] }}</span> <span>{{ applyObj[record.d1] }}</span>
</template> </template>
<template v-if="column.dataIndex === 'd2' && isImg(record.d1)"> <template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d2" disabled></JImageUpload> <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d2" disabled></JImageUpload>
</template> </template>
<template v-if="column.dataIndex === 'd3' && isImg(record.d1)"> <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d3" disabled></JImageUpload> <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d3" disabled></JImageUpload>
</template> </template>
<template <template
v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')"> v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
@ -57,6 +38,24 @@
</a-table> </a-table>
</a-col> </a-col>
</a-row> </a-row>
<a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</div> </div>
</template> </template>
@ -69,6 +68,7 @@ import { getModifyInfo, auditSubmit } from '../EmployeesApply.api';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { initDictOptions } from '/@/utils/dict'; import { initDictOptions } from '/@/utils/dict';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const formRef = ref(); const formRef = ref();
const AForm = Form; const AForm = Form;
const AFormItem = Form.Item; const AFormItem = Form.Item;
@ -242,7 +242,7 @@ defineExpose({
<style lang="less" scoped> <style lang="less" scoped>
.container2 { .container2 {
padding: 16px; // padding: 16px;
} }
.antd-modal-form { .antd-modal-form {

16
src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue
View File

@ -175,14 +175,14 @@
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" <a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive"> id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.idCardPositive" disabled></j-image-upload> :value="opeMediaAddress + formData.idCardPositive" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" <a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative"> id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.idCardNegative" disabled></j-image-upload> :value="opeMediaAddress + formData.idCardNegative" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -194,7 +194,7 @@
id="BizEmployeesInfoForm-healthCertificatePositive" id="BizEmployeesInfoForm-healthCertificatePositive"
name="healthCertificatePositive"> name="healthCertificatePositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.healthCertificatePositive" :value="opeMediaAddress + formData.healthCertificatePositive"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -216,14 +216,14 @@
<a-form-item label="银行卡正面" v-bind="validateInfos.bankPositive" <a-form-item label="银行卡正面" v-bind="validateInfos.bankPositive"
id="BizEmployeesInfoForm-bankPositive" name="bankPositive"> id="BizEmployeesInfoForm-bankPositive" name="bankPositive">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.bankPositive" disabled></j-image-upload> :value="opeMediaAddress + formData.bankPositive" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="银行卡反面" v-bind="validateInfos.bankNegative" <a-form-item label="银行卡反面" v-bind="validateInfos.bankNegative"
id="BizEmployeesInfoForm-bankNegative" name="bankNegative"> id="BizEmployeesInfoForm-bankNegative" name="bankNegative">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.bankNegative" disabled></j-image-upload> :value="opeMediaAddress + formData.bankNegative" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -235,7 +235,7 @@
id="BizEmployeesInfoForm-qualification" name="qualification" id="BizEmployeesInfoForm-qualification" name="qualification"
:labelCol="labelCol3"> :labelCol="labelCol3">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.qualification" disabled></j-image-upload> :value="opeMediaAddress + formData.qualification" disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -247,7 +247,7 @@
id="BizEmployeesInfoForm-noCrimeCertificate" name="noCrimeCertificate" id="BizEmployeesInfoForm-noCrimeCertificate" name="noCrimeCertificate"
:labelCol="labelCol3"> :labelCol="labelCol3">
<j-image-upload :fileMax="1" :bizPath="`employeesZzxx`" <j-image-upload :fileMax="1" :bizPath="`employeesZzxx`"
v-model:value="formData.noCrimeCertificate" :value="opeMediaAddress + formData.noCrimeCertificate"
disabled></j-image-upload> disabled></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -272,11 +272,13 @@ import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../BizEmployeesInfo.api'; import { saveOrUpdate } from '../BizEmployeesInfo.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({ const props = defineProps({
formDisabled: { type: Boolean, default: false }, formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({}) }, formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true } formBpm: { type: Boolean, default: true }
}); });
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const formRef = ref(); const formRef = ref();
const useForm = Form.useForm; const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);

7
src/views/elder/elderinfo/components/ElderInfoForm.vue
View File

@ -9,7 +9,7 @@
<SectionDivider :title="'长者信息'" /> <SectionDivider :title="'长者信息'" />
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="nuId" v-bind="validateInfos.nuId" id="ElderInfoForm-nuId" name="nuId"> <a-form-item label="NUID" v-bind="validateInfos.nuId" id="ElderInfoForm-nuId" name="nuId">
<!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元" allow-clear ></a-input> --> <!-- <a-input v-model:value="formData.nuId" placeholder="请输入护理单元" allow-clear ></a-input> -->
<span>{{ formData.nuId }}</span> <span>{{ formData.nuId }}</span>
</a-form-item> </a-form-item>
@ -110,13 +110,13 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" id="ElderInfoForm-idCardPositive" <a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" id="ElderInfoForm-idCardPositive"
name="idCardPositive"> name="idCardPositive">
<j-image-upload :fileMax="1" v-model:value="formData.idCardPositive"></j-image-upload> <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardPositive"></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" id="ElderInfoForm-idCardNegative" <a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" id="ElderInfoForm-idCardNegative"
name="idCardNegative"> name="idCardNegative">
<j-image-upload :fileMax="1" v-model:value="formData.idCardNegative"></j-image-upload> <j-image-upload :fileMax="1" :value="opeMediaAddress + formData.idCardNegative"></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -164,6 +164,7 @@ const props = defineProps({
formData: { type: Object, default: () => ({}) }, formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true } formBpm: { type: Boolean, default: true }
}); });
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const formRef = ref(); const formRef = ref();
const useForm = Form.useForm; const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);

6
src/views/elder/elderinfo/components/ElderInfoModal.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<a-drawer :title="title" width="70vw" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }" <a-drawer :title="title" width="70vw" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }"
@close="handleCancel"> :bodyStyle="{ padding: '14px' }" @close="handleCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button> <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
@ -10,7 +10,7 @@
</ElderInfoForm> </ElderInfoForm>
</a-drawer> </a-drawer>
<!-- 长者信息变更审核 --> <!-- 长者信息变更审核 -->
<a-drawer :title="title" width="70vw" :visible="elderUpInfoVisible" :closable="true" <a-drawer :title="title" width="70vw" :visible="elderUpInfoVisible" :closable="true" :bodyStyle="{ padding: '14px' }"
:footer-style="{ textAlign: 'right' }" @close="handleElderUpInfoCancel"> :footer-style="{ textAlign: 'right' }" @close="handleElderUpInfoCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleElderUpInfoCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleElderUpInfoCancel">关闭</a-button>
@ -21,7 +21,7 @@
</a-drawer> </a-drawer>
<!-- 监护人信息变更审核 --> <!-- 监护人信息变更审核 -->
<a-drawer :title="title" width="70vw" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }" <a-drawer :title="title" width="70vw" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }"
@close="handleUpInfoCancel"> :bodyStyle="{ padding: '14px' }" @close="handleUpInfoCancel">
<template #footer> <template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button> <a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button>
<a-button type="primary" @click="handleUpInfoOk">确认</a-button> <a-button type="primary" @click="handleUpInfoOk">确认</a-button>

44
src/views/elder/elderinfo/components/ElderUpInfoForm.vue
View File

@ -1,24 +1,5 @@
<template> <template>
<div class="container2"> <div class="container2">
<a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
<a-row> <a-row>
<a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;"> <a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
<a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small" <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
@ -28,10 +9,10 @@
<span>{{ applyObj[record.d1] }}</span> <span>{{ applyObj[record.d1] }}</span>
</template> </template>
<template v-if="column.dataIndex === 'd2' && isImg(record.d1)"> <template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d2" disabled></JImageUpload> <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d2" disabled></JImageUpload>
</template> </template>
<template v-if="column.dataIndex === 'd3' && isImg(record.d1)"> <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d3" disabled></JImageUpload> <JImageUpload :fileMax="1" :value="opeMediaAddress + record.d3" disabled></JImageUpload>
</template> </template>
<template <template
v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')"> v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
@ -57,6 +38,24 @@
</a-table> </a-table>
</a-col> </a-col>
</a-row> </a-row>
<a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</div> </div>
</template> </template>
@ -69,6 +68,7 @@ import { getModifyInfo, elderAudit } from '../ElderInfo.api'
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { initDictOptions } from '/@/utils/dict'; import { initDictOptions } from '/@/utils/dict';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const formRef = ref(); const formRef = ref();
const AForm = Form; const AForm = Form;
const AFormItem = Form.Item; const AFormItem = Form.Item;
@ -243,7 +243,7 @@ defineExpose({
<style lang="less" scoped> <style lang="less" scoped>
.container2 { .container2 {
padding: 16px; // padding: 16px;
} }
.antd-modal-form { .antd-modal-form {

39
src/views/elder/elderinfo/components/GuaUpInfoForm.vue
View File

@ -1,24 +1,5 @@
<template> <template>
<div class="container2"> <div class="container2">
<a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
<a-row> <a-row>
<a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;"> <a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
<a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small" <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
@ -57,6 +38,24 @@
</a-table> </a-table>
</a-col> </a-col>
</a-row> </a-row>
<a-form style="margin-top: 14px;height: 100px;" ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'">
<a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
<a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</div> </div>
</template> </template>
@ -243,7 +242,7 @@ defineExpose({
<style lang="less" scoped> <style lang="less" scoped>
.container2 { .container2 {
padding: 16px; // padding: 16px;
} }
.antd-modal-form { .antd-modal-form {

48
src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
View File

@ -116,42 +116,44 @@
<a-row style="padding: 0px 20px;"> <a-row style="padding: 0px 20px;">
<a-col :span="24" v-show="directiveMediaBtnValue == 0"> <a-col :span="24" v-show="directiveMediaBtnValue == 0">
<JImageUploadtz v-if="opeType == 'dmlook'" <JImageUploadtz v-if="opeType == 'dmlook'"
:value="!!formData.previewFile ? mediaApiAddress + formData.previewFile : defaultPrePic" maxCount="1" :value="!!formData.previewFile ? opeMediaAddress + formData.previewFile : defaultPrePic" maxCount="1"
:disabled="disabled || !isMain" />
<JImageUploadtz v-else v-model:value="formData.previewFile" maxCount="1"
:disabled="disabled || !isMain" /> :disabled="disabled || !isMain" />
<JImageUploadtz v-else v-model:value="formData.previewFile" maxCount="1" :toOpe="true"
:bizPath="formComputedData.mediaFileSavePath" :disabled="disabled || !isMain" />
</a-col> </a-col>
<a-col :span="24" v-show="directiveMediaBtnValue == 1"> <a-col :span="24" v-show="directiveMediaBtnValue == 1">
<JImageUploadtz v-if="opeType == 'dmlook'" <JImageUploadtz v-if="opeType == 'dmlook'"
:value="!!formData.previewFileSmall ? mediaApiAddress + formData.previewFileSmall : defaultPreSmallPic" :value="!!formData.previewFileSmall ? opeMediaAddress + formData.previewFileSmall : defaultPreSmallPic"
maxCount="1" :disabled="disabled || !isMain" /> maxCount="1" :disabled="disabled || !isMain" />
<JImageUploadtz v-else v-model:value="formData.previewFileSmall" maxCount="1" <JImageUploadtz v-else v-model:value="formData.previewFileSmall" maxCount="1" :toOpe="true"
:disabled="disabled || !isMain" /> :bizPath="formComputedData.mediaFileSavePath" :disabled="disabled || !isMain" />
</a-col> </a-col>
<a-col :span="24" v-show="directiveMediaBtnValue == 2"> <a-col :span="24" v-show="directiveMediaBtnValue == 2">
<JUploadMP3 v-if="opeType == 'dmlook'" :value="mediaApiAddress + formData.mp3File" maxCount="1" <JUploadMP3 v-if="opeType == 'dmlook'" :value="opeMediaAddress + formData.mp3File" maxCount="1"
:disabled="disabled || !isMain" /> :disabled="disabled || !isMain" />
<JUploadMP3 v-else v-model:value="formData.mp3File" maxCount="1" :disabled="disabled || !isMain" /> <JUploadMP3 v-else v-model:value="formData.mp3File" :toOpe="true"
:bizPath="formComputedData.mediaFileSavePath" maxCount="1" :disabled="disabled || !isMain" />
</a-col> </a-col>
<a-col :span="24" v-show="directiveMediaBtnValue == 3"> <a-col :span="24" v-show="directiveMediaBtnValue == 3">
<JUploadMP4 v-if="opeType == 'dmlook'" :value="mediaApiAddress + formData.mp4File" maxCount="1" <JUploadMP4 v-if="opeType == 'dmlook'" :value="opeMediaAddress + formData.mp4File" maxCount="1"
fileType="mp4" :disabled="disabled || !isMain" /> fileType="mp4" :disabled="disabled || !isMain" />
<JUploadMP4 v-else v-model:value="formData.mp4File" maxCount="1" fileType="mp4" <JUploadMP4 v-else v-model:value="formData.mp4File" :toOpe="true"
:bizPath="formComputedData.mediaFileSavePath" maxCount="1" fileType="mp4"
:disabled="disabled || !isMain" /> :disabled="disabled || !isMain" />
</a-col> </a-col>
<a-col :span="24" v-show="directiveMediaBtnValue == 4"> <a-col :span="24" v-show="directiveMediaBtnValue == 4">
<JImageUploadtz v-if="opeType == 'dmlook'" <JImageUploadtz v-if="opeType == 'dmlook'"
:value="!!formData.immediateFile ? mediaApiAddress + formData.immediateFile : defaultImmediatePic" :value="!!formData.immediateFile ? opeMediaAddress + formData.immediateFile : defaultImmediatePic"
maxCount="1" :disabled="disabled || !isMain" /> maxCount="1" :disabled="disabled || !isMain" />
<JImageUploadtz v-else v-model:value="formData.immediateFile" maxCount="1" <JImageUploadtz v-else v-model:value="formData.immediateFile" :toOpe="true"
:disabled="disabled || !isMain" /> :bizPath="formComputedData.mediaFileSavePath" maxCount="1" :disabled="disabled || !isMain" />
</a-col> </a-col>
<a-col :span="24" v-show="directiveMediaBtnValue == 5"> <a-col :span="24" v-show="directiveMediaBtnValue == 5">
<JImageUploadtz v-if="opeType == 'dmlook'" <JImageUploadtz v-if="opeType == 'dmlook'"
:value="!!formData.immediateFileFocus ? mediaApiAddress + formData.immediateFileFocus : defaultImmediatePic" :value="!!formData.immediateFileFocus ? opeMediaAddress + formData.immediateFileFocus : defaultImmediatePic"
maxCount="1" :disabled="disabled || !isMain" /> maxCount="1" :disabled="disabled || !isMain" />
<JImageUploadtz v-else v-model:value="formData.immediateFileFocus" maxCount="1" <JImageUploadtz v-else v-model:value="formData.immediateFileFocus" :toOpe="true"
:disabled="disabled || !isMain" /> :bizPath="formComputedData.mediaFileSavePath" maxCount="1" :disabled="disabled || !isMain" />
</a-col> </a-col>
</a-row> </a-row>
<a-row style="padding: 20px;"> <a-row style="padding: 20px;">
@ -202,6 +204,7 @@ import { QuestionCircleOutlined } from '@ant-design/icons-vue';
import { DownOutlined } from '@ant-design/icons-vue'; import { DownOutlined } from '@ant-design/icons-vue';
import { uploadUrl } from '/@/api/common/api'; import { uploadUrl } from '/@/api/common/api';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const showDescription = ref(false); const showDescription = ref(false);
// 切换悬浮容器的显示状态 // 切换悬浮容器的显示状态
@ -370,9 +373,10 @@ const typeDictCode = ref('')
const canUploadPreviewImage = computed(() => { const canUploadPreviewImage = computed(() => {
return formData.instructionTagId && return formData.instructionTagId &&
formData.categoryId && formData.categoryId &&
formData.typeId && formData.typeId
formData.directiveName && // &&
formData.cycleType; // formData.directiveName &&
// formData.cycleType;
}); });
//分类标签名称 //分类标签名称
@ -418,8 +422,11 @@ const formComputedData = computed(() => {
// 获取各个字段的字典值 // 获取各个字段的字典值
const instructionName = instructionComDictCode.value.find(d => d.value == formData.instructionTagId)?.label || ''; const instructionName = instructionComDictCode.value.find(d => d.value == formData.instructionTagId)?.label || '';
console.log("🌊 ~ instructionName:", instructionName)
const categoryName = categoryComDictCode.value.find(d => d.value == formData.categoryId)?.label || ''; const categoryName = categoryComDictCode.value.find(d => d.value == formData.categoryId)?.label || '';
console.log("🌊 ~ categoryName:", categoryName)
const typeName = typeComDictCode.value.find(d => d.value == formData.typeId)?.label || ''; const typeName = typeComDictCode.value.find(d => d.value == formData.typeId)?.label || '';
console.log("🌊 ~ typeName:", typeName)
const cycleTypeName = cycleTypeComDictCode.value.find(d => d.value == formData.cycleType)?.label || ''; const cycleTypeName = cycleTypeComDictCode.value.find(d => d.value == formData.cycleType)?.label || '';
// 处理标签 // 处理标签
@ -432,7 +439,8 @@ const formComputedData = computed(() => {
}; };
return { return {
mediaFileSavePath: `directive/${instructionName}/${categoryName}/${typeName}/${cycleTypeName}/${formData.directiveName}`, // mediaFileSavePath: `directive/${instructionName}/${categoryName}/${typeName}/${cycleTypeName}/${formData.directiveName}`,
mediaFileSavePath: `directive/${instructionName}/${categoryName}/${typeName}`,
instructionName, instructionName,
categoryName, categoryName,
typeName, typeName,