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

1、配置文件增加默认图片 

2、调整服务指令专用的上传图片、mp3/mp4组件，修改默认样式
3、调整供应商地址组件为多行文本，解决显示不全问题
This commit is contained in:
1378012178@qq.com 2026-03-25 13:42:47 +08:00
parent 6150f127ca
commit 627d4d7692
8 changed files with 250 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.env.development
View File

@ -27,3 +27,23 @@ VITE_SYTJGBM = '101'
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
# 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致
#VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//localhost:3001/jeecg-vue3
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/'
# 长者标签-标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
# 长者标签-标签焦点图片
VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片（大）默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片（小）默认图片
VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png'
# 服务指令-即时指令图标默认图片
VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png'
# 暂无证件默认图片
VITE_DEFAULT_ZANWUZHENGJIAN_PIC = 'default/zanweishangchuanzhengjian.png'
# 默认头像
VITE_DEFAULT_MORENTOUXIANG_PIC = 'default/touxiang.png'
# 暂无图片默认图片
VITE_DEFAULT_NULL_PIC = 'default/PICNULL.png'

20
.env.production
View File

@ -28,3 +28,23 @@ VITE_SYTJGBM = '101'
# VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
# 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致
# VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//qiankun.boot3.jeecg.com/jeecg-vue3
# 管理平台静态资源路径
VITE_OPE_MEDIA_ADDRESS = 'https://www.focusnu.com/media/'
# 长者标签-标签默认图片
VITE_DEFAULT_ELDER_TAG_BODY_PIC = 'directive/index/index/moren.png'
# 长者标签-标签焦点图片
VITE_DEFAULT_ELDER_TAG_EMO_PIC = 'directive/index/index/morencheck.png'
# 服务指令-服务指令图片（大）默认图片
VITE_DEFAULT_DIRECTIVE_PRE_PIC = 'default/predefault.png'
# 服务指令-服务指令图片（小）默认图片
VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC = 'default/presmalldefault.png'
# 服务指令-即时指令图标默认图片
VITE_DEFAULT_DIRECTIVE_IM_PIC = 'default/imdefault.png'
# 暂无证件默认图片
VITE_DEFAULT_ZANWUZHENGJIAN_PIC = 'default/zanweishangchuanzhengjian.png'
# 默认头像
VITE_DEFAULT_MORENTOUXIANG_PIC = 'default/touxiang.png'
# 暂无图片默认图片
VITE_DEFAULT_NULL_PIC = 'default/PICNULL.png'

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

@ -7,14 +7,15 @@
<div v-if="uploadVisible">
<div v-if="listType == 'picture-card'">
<div class="upload-area" style="padding: 20px;">
<p class="upload-text">点击或者拖拽上传</p>
<p class="upload-text"><span v-show="false">点击或者拖拽上传</span></p>
<p class="upload-hint">
<div class="upload-icon">
<img src="../../../../../assets/upload/picture.png" style="width: 40px; height: 40px;" />
<img :src="opeMediaAddress + defaultPrePic" style="width: 150px; " />
</div>
<span class="divider">文件大小不超过10MB</span>
<span class="divider">|</span>
<a-tooltip placement="top">
<span class="divider" v-show="false">文件大小不超过10MB</span>
<span class="divider" v-show="false">|</span>
<span class="divider">未上传</span>
<!-- <a-tooltip placement="top">
<template #title>
请上传相应格式类型的文件
</template>
@ -22,7 +23,7 @@
<QuestionCircleOutlined style="margin-right: 0px;" />
格式说明
</span>
</a-tooltip>
</a-tooltip> -->
</p>
</div>
</div>
@ -115,12 +116,13 @@ export default defineComponent({
},
emits: ['options-change', 'change', 'update:value'],
setup(props, { emit, refs }) {
const opeMediaAddress = ref<string>('');
const emitData = ref<any[]>([]);
const attrs = useAttrs();
const [state] = useRuleFormItem(props, 'value', 'change', emitData);
const currentUploadUrl = ref(uploadUrl);
const extraUploadData = ref<Record<string, any>>({});
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const defaultPrePic = import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC
//获取文件名
const getFileName = (path) => {
@ -330,8 +332,8 @@ export default defineComponent({
};
onMounted(async () => {
const res = await getMediaUrlByOrgCode({ orgCode: '' });
opeMediaAddress.value = res.mediaUrl;
// const res = await getMediaUrlByOrgCode({ orgCode: '' });
// opeMediaAddress.value = res.mediaUrl;
});
return {
@ -357,6 +359,7 @@ export default defineComponent({
currentUploadUrl,
extraUploadData,
opeMediaAddress,
defaultPrePic,
};
},
});

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

@ -16,9 +16,10 @@
<div class="upload-icon">
<img src="../../../../../../assets/upload/mp3.png" style="width: 40px; height: 40px;" />
</div>
<span class="divider">文件大小不超过10MB</span>
<span class="divider">|</span>
<a-tooltip placement="top">
<span class="divider" v-show="false">文件大小不超过10MB</span>
<span class="divider" v-show="false">|</span>
<span class="divider">未上传</span>
<!-- <a-tooltip placement="top">
<template #title>
请上传相应格式类型的文件
</template>
@ -26,7 +27,7 @@
<QuestionCircleOutlined style="margin-right: 0px;" />
格式说明
</span>
</a-tooltip>
</a-tooltip> -->
</p>
</div>
</a-upload-dragger>

11
src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue
View File

@ -11,14 +11,15 @@
</div>
</template>
<div class="upload-area" style="padding: 20px;" v-if="fileList.length <= 0" :disabled="buttonDisabled">
<p class="upload-text">点击或者拖拽上传</p>
<p class="upload-text" v-show="false">点击或者拖拽上传</p>
<p class="upload-hint">
<div class="upload-icon">
<img src="../../../../../../assets/upload/mp4.png" style="width: 40px; height: 40px;" />
</div>
<span class="divider">文件大小不超过10MB</span>
<span class="divider">|</span>
<a-tooltip placement="top">
<span class="divider" v-show="false">文件大小不超过10MB</span>
<span class="divider" v-show="false">|</span>
<span class="divider">未上传</span>
<!-- <a-tooltip placement="top">
<template #title>
请上传相应格式类型的文件
</template>
@ -26,7 +27,7 @@
<QuestionCircleOutlined style="margin-right: 0px;" />
格式说明
</span>
</a-tooltip>
</a-tooltip> -->
</p>
</div>
</a-upload-dragger>

3
src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue
View File

@ -19,7 +19,8 @@
</a-col>
<a-col :span="24">
<a-form-item label="供应商地址" v-bind="validateInfos.suppliersAddress" id="NuBizSuppliersApplyForm-suppliersAddress" name="suppliersAddress">
<a-input v-model:value="formData.suppliersAddress" placeholder="请输入供应商地址" ></a-input>
<a-textarea :autosize="{ minRows: 1 }" maxlength="50" v-model:value="formData.suppliersAddress"
placeholder="请输入供应商地址"></a-textarea>
</a-form-item>
</a-col>
<a-col :span="24">

343
src/views/admin/bizSuppliers/components/NuBizSuppliersInfoForm.vue
View File

@ -2,48 +2,59 @@
<a-spin :spinning="confirmLoading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuBizSuppliersInfoForm">
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="NuBizSuppliersInfoForm">
<a-row>
<a-col :span="24">
<a-form-item label="供应商名称" v-bind="validateInfos.suppliersName" id="NuBizSuppliersInfoForm-suppliersName" name="suppliersName">
<a-input v-model:value="formData.suppliersName" placeholder="请输入供应商名称" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="供应商性质" v-bind="validateInfos.suppliersNature" id="NuBizSuppliersInfoForm-suppliersNature" name="suppliersNature">
<j-dict-select-tag v-model:value="formData.suppliersNature" dictCode="suppliers_nature" placeholder="请选择供应商性质" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="供应商地址" v-bind="validateInfos.suppliersAddress" id="NuBizSuppliersInfoForm-suppliersAddress" name="suppliersAddress">
<a-input v-model:value="formData.suppliersAddress" placeholder="请输入供应商地址" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="负责人" v-bind="validateInfos.personInCharge" id="NuBizSuppliersInfoForm-personInCharge" name="personInCharge">
<a-input v-model:value="formData.personInCharge" placeholder="请输入负责人" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="联系电话" v-bind="validateInfos.contactNumber" id="NuBizSuppliersInfoForm-contactNumber" name="contactNumber">
<a-input v-model:value="formData.contactNumber" placeholder="请输入联系电话" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="开户行" v-bind="validateInfos.openingBank" id="NuBizSuppliersInfoForm-openingBank" name="openingBank">
<a-input v-model:value="formData.openingBank" placeholder="请输入开户行" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="开户行账号" v-bind="validateInfos.openingBankNo" id="NuBizSuppliersInfoForm-openingBankNo" name="openingBankNo">
<a-input v-model:value="formData.openingBankNo" placeholder="请输入开户行账号" ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="营业执照" v-bind="validateInfos.imgPath" id="NuBizSuppliersInfoForm-imgPath" name="imgPath">
<j-image-upload :fileMax="1" v-model:value="formData.imgPath" ></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="供应商名称" v-bind="validateInfos.suppliersName" id="NuBizSuppliersInfoForm-suppliersName"
name="suppliersName">
<a-input v-model:value="formData.suppliersName" placeholder="请输入供应商名称"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="供应商性质" v-bind="validateInfos.suppliersNature"
id="NuBizSuppliersInfoForm-suppliersNature" name="suppliersNature">
<j-dict-select-tag v-model:value="formData.suppliersNature" dictCode="suppliers_nature"
placeholder="请选择供应商性质" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="供应商地址" v-bind="validateInfos.suppliersAddress"
id="NuBizSuppliersInfoForm-suppliersAddress" name="suppliersAddress">
<a-textarea :autosize="{ minRows: 1 }" maxlength="50" v-model:value="formData.suppliersAddress"
placeholder="请输入供应商地址"></a-textarea>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="负责人" v-bind="validateInfos.personInCharge" id="NuBizSuppliersInfoForm-personInCharge"
name="personInCharge">
<a-input v-model:value="formData.personInCharge" placeholder="请输入负责人"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="联系电话" v-bind="validateInfos.contactNumber" id="NuBizSuppliersInfoForm-contactNumber"
name="contactNumber">
<a-input v-model:value="formData.contactNumber" placeholder="请输入联系电话"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="开户行" v-bind="validateInfos.openingBank" id="NuBizSuppliersInfoForm-openingBank"
name="openingBank">
<a-input v-model:value="formData.openingBank" placeholder="请输入开户行"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="开户行账号" v-bind="validateInfos.openingBankNo" id="NuBizSuppliersInfoForm-openingBankNo"
name="openingBankNo">
<a-input v-model:value="formData.openingBankNo" placeholder="请输入开户行账号"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="营业执照" v-bind="validateInfos.imgPath" id="NuBizSuppliersInfoForm-imgPath"
name="imgPath">
<j-image-upload :fileMax="1" v-model:value="formData.imgPath"></j-image-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
@ -52,139 +63,139 @@
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../NuBizSuppliersInfo.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
suppliersName: '',
suppliersNature: '',
suppliersAddress: '',
personInCharge: '',
contactNumber: '',
supplyState: '',
openingBank: '',
openingBankNo: '',
imgPath: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//表单验证
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../NuBizSuppliersInfo.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
suppliersName: '',
suppliersNature: '',
suppliersAddress: '',
personInCharge: '',
contactNumber: '',
supplyState: '',
openingBank: '',
openingBankNo: '',
imgPath: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//表单验证
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
// 表单禁用
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
// 表单禁用
const disabled = computed(() => {
if (props.formBpm === true) {
if (props.formData.disabled === false) {
return false;
} else {
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if (record.hasOwnProperty(key)) {
tmpData[key] = record[key]
}
})
//赋值
Object.assign(formData, tmpData);
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
return Promise.reject(errorFields);
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
tmpData[key] = record[key]
}
})
//赋值
Object.assign(formData, tmpData);
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//时间格式化
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//循环数据
for (let data in model) {
//如果该数据是数组并且是字符串类型
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//如果是字符串类型的需要变成以逗号分割的字符串
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//时间格式化
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//循环数据
for (let data in model) {
//如果该数据是数组并且是字符串类型
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//如果是字符串类型的需要变成以逗号分割的字符串
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
}
defineExpose({
add,
edit,
submitForm,
});
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
padding: 14px;
}
.antd-modal-form {
padding: 14px;
}
</style>

14
src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
View File

@ -87,14 +87,15 @@
<a-col :span="12">
<a-form-item label="默认指令图标" v-bind="validateInfos.immediateFile" id="ElderTagForm-immediateFile"
name="immediateFile">
<JImageUpload :fileMax="1" :value="opeMediaAddress + formData.immediateFile">
<JImageUpload :fileMax="1"
:value="opeMediaAddress + (!!formData.immediateFile ? formData.immediateFile : defaultPreSmallPic)">
</JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="焦点指令图标" v-bind="validateInfos.immediateFileFocus" id="ElderTagForm-immediateFileFocus"
name="immediateFileFocus">
<JImageUpload :fileMax="1" :value="opeMediaAddress + formData.immediateFileFocus">
<a-form-item label="焦点指令图标" v-bind="validateInfos.immediateFileFocus"
id="ElderTagForm-immediateFileFocus" name="immediateFileFocus">
<JImageUpload :fileMax="1" :value="opeMediaAddress + (!!formData.immediateFileFocus ? formData.immediateFileFocus : defaultPreSmallPic)">
</JImageUpload>
</a-form-item>
</a-col>
@ -124,7 +125,7 @@
</a-row>
<a-row style="padding: 0px 20px;">
<a-col :span="24" v-show="directiveMediaBtnValue == 0">
<JImageUploadtz :value="!!formData.previewFile ? formData.previewFile : defaultPrePic" disabled />
<JImageUploadtz :value="formData.previewFile" disabled />
</a-col>
<!-- <a-col :span="24" v-show="directiveMediaBtnValue == 1">
<JImageUploadtz :value="!!formData.previewFileSmall ? formData.previewFileSmall : defaultPreSmallPic"
@ -189,12 +190,13 @@ import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.v
const showDescription = ref(false);
const props = defineProps({
opeMediaAddress: null
// opeMediaAddress: null
});
// 切换悬浮容器的显示状态
const toggleDescription = () => {
showDescription.value = !showDescription.value;
};
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const defaultPrePic = import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC
const defaultPreSmallPic = import.meta.env.VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC
const defaultImmediatePic = import.meta.env.VITE_DEFAULT_DIRECTIVE_IM_PIC