1、服务指令只有主指令库能维护资源字段 非主指令库只能在新增时维护服务指令描述

This commit is contained in:
1378012178@qq.com 2025-08-27 08:53:30 +08:00
parent 80d706dc05
commit 7606dcc82d
5 changed files with 37 additions and 33 deletions

View File

@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = /
# 跨域代理,您可以配置多个 ,请注意,没有换行符 # 跨域代理,您可以配置多个 ,请注意,没有换行符
VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102 VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101
#后台接口父地址(必填) #后台接口父地址(必填)
VITE_GLOB_API_URL=/nursing-unit_102 VITE_GLOB_API_URL=/nursing-unit_101
# 接口前缀 # 接口前缀
VITE_GLOB_API_URL_PREFIX= 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:8091'
# 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

View File

@ -6,19 +6,19 @@ VITE_PUBLIC_PATH = /
# 跨域代理,您可以配置多个 ,请注意,没有换行符 # 跨域代理,您可以配置多个 ,请注意,没有换行符
VITE_PROXY = [["/nursing-unit_101","http://localhost:8091/nursing-unit_101"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/nursing-unit_102","http://localhost:8092/nursing-unit_102"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://localhost:8091/nursing-unit_101 VITE_GLOB_DOMAIN_URL=http://localhost:8092/nursing-unit_102
#后台接口父地址(必填) #后台接口父地址(必填)
VITE_GLOB_API_URL=/nursing-unit_101 VITE_GLOB_API_URL=/nursing-unit_102
# 接口前缀 # 接口前缀
VITE_GLOB_API_URL_PREFIX= 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:8092'
# 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动 # 填写后将作为乾坤子应用启动主应用注册时AppName需保持一致放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

View File

@ -42,11 +42,8 @@
<a-empty v-if="!treeLoading && treeLoading" /> <a-empty v-if="!treeLoading && treeLoading" />
<a-button v-if="!treeLoading && treeData.length < 1" type="link" class="btnPrivate" @click="addInstruction" <a-button v-if="!treeLoading && treeData.length < 1" type="link" class="btnPrivate" @click="addInstruction"
v-show="mainOrgCode == ownOrgCode" preIcon="ant-design:plus-outlined">新增分类标签</a-button> v-show="mainOrgCode == ownOrgCode" preIcon="ant-design:plus-outlined">新增分类标签</a-button>
<a-menu <a-menu v-model:openKeys="openKeys" v-model:selectedKeys="selectedKeys" style="width: 100%;margin-top: 50px;"
v-model:openKeys="openKeys" mode="inline" @openChange="onOpenChange">
v-model:selectedKeys="selectedKeys"
style="width: 100%;margin-top: 50px;" mode="inline"
@openChange="onOpenChange">
<template v-for="item in treeData"> <template v-for="item in treeData">
<!-- 第一层判断是否有下级 --> <!-- 第一层判断是否有下级 -->
<a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key"> <a-sub-menu v-if="item.children && item.children.length > 0" :key="item.key">
@ -379,7 +376,8 @@
</div> </div>
<!-- 表单区域 --> <!-- 表单区域 -->
<ConfigServiceDirectiveModal ref="registerModal" @success="handleSuccess"> <ConfigServiceDirectiveModal ref="registerModal" @success="handleSuccess"
:isMain="!!mainOrgCode && !!ownOrgCode && mainOrgCode == ownOrgCode">
</ConfigServiceDirectiveModal> </ConfigServiceDirectiveModal>
</div> </div>
@ -719,11 +717,11 @@ function getDropDownAction(record) {
} }
function expandTreeNodeToLevel4(directiveData: any) { function expandTreeNodeToLevel4(directiveData: any) {
console.log("🚀 ~ expandTreeNodeToLevel4 ~ directiveData:", directiveData) console.log("🚀 ~ expandTreeNodeToLevel4 ~ directiveData:", directiveData)
selectedKeys.value = [ directiveData.instructionTagId, directiveData.categoryId, directiveData.typeId, directiveData.id ] selectedKeys.value = [directiveData.instructionTagId, directiveData.categoryId, directiveData.typeId, directiveData.id]
openKeys.value = [ directiveData.instructionTagId, directiveData.categoryId, directiveData.typeId, directiveData.id ] openKeys.value = [directiveData.instructionTagId, directiveData.categoryId, directiveData.typeId, directiveData.id]
// // // //
// expandedKeys.value = []; // expandedKeys.value = [];
// // // //

View File

@ -1,6 +1,6 @@
<template> <template>
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<div <div v-show="!isEditMedia"
style="padding-top: 14px;padding-left: 14px;padding-right: 14px; background-color: #fff;border-radius: 10px;box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);margin-bottom: 14px;"> style="padding-top: 14px;padding-left: 14px;padding-right: 14px; background-color: #fff;border-radius: 10px;box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);margin-bottom: 14px;">
<JFormContainer :disabled="disabled"> <JFormContainer :disabled="disabled">
<template #detail> <template #detail>
@ -35,7 +35,7 @@
</JFormContainer> </JFormContainer>
</div> </div>
<div style="padding: 14px;background-color: #fff;border-radius: 10px;box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);"> <div style="padding: 14px;background-color: #fff;border-radius: 10px;box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);">
<JFormContainer > <JFormContainer>
<template #detail> <template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" :colon="false" <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" :colon="false"
name="ConfigService2DirectiveForm" style="padding: 20px 0px;"> name="ConfigService2DirectiveForm" style="padding: 20px 0px;">
@ -96,7 +96,7 @@
<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled" <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled"
name="izEnabled"> name="izEnabled">
<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
placeholder="请选择是否启用"  allowClear :disabled="disabled"/> placeholder="请选择是否启用"  allowClear :disabled="disabled" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -115,19 +115,21 @@
</a-row> </a-row>
<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-model:value="formData.previewFile" maxCount="1" :disabled="disabled"/> <JImageUploadtz v-model:value="formData.previewFile" maxCount="1" :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-model:value="formData.previewFileSmall" maxCount="1" :disabled="disabled"/> <JImageUploadtz v-model:value="formData.previewFileSmall" maxCount="1"
: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-model:value="formData.mp3File" maxCount="1" :disabled="disabled"/> <JUploadMP3 v-model:value="formData.mp3File" 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-model:value="formData.mp4File" maxCount="1" fileType="mp4" :disabled="disabled"/> <JUploadMP4 v-model:value="formData.mp4File" maxCount="1" fileType="mp4"
: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-model:value="formData.immediateFile" maxCount="1" :disabled="disabled"/> <JImageUploadtz v-model:value="formData.immediateFile" maxCount="1" :disabled="disabled || !isMain" />
</a-col> </a-col>
</a-row> </a-row>
<a-row style="padding: 20px;"> <a-row style="padding: 20px;">
@ -143,7 +145,8 @@
</div> </div>
<div> <div>
<a-textarea v-model:value="formData.serviceContent" placeholder="请输入服务指令描述" :maxlength="200" <a-textarea v-model:value="formData.serviceContent" placeholder="请输入服务指令描述" :maxlength="200"
:rows="3" :autosize="{ minRows: 3 }" :showCount="true" :disabled="disabled"/> :rows="3" :autosize="{ minRows: 3 }" :showCount="true"
:disabled="disabled || (!isMain && !!formData.id)" />
</div> </div>
</div> </div>
</div> </div>
@ -175,7 +178,7 @@ import { env } from 'process';
import DirectiveRadioCom from './DirectiveRadioCom.vue' import DirectiveRadioCom from './DirectiveRadioCom.vue'
import { QuestionCircleOutlined } from '@ant-design/icons-vue'; 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 showDescription = ref(false); const showDescription = ref(false);
@ -227,6 +230,7 @@ const props = defineProps({
mainOrgCode: '', mainOrgCode: '',
mediaApiAddress: '',// mediaApiAddress: '',//
opeType: 'look', opeType: 'look',
isMain: false,//
}); });
const checkMp3 = (file) => { const checkMp3 = (file) => {
const isPDF = file.type === 'application/mp3' || file.name.endsWith('.mp3'); const isPDF = file.type === 'application/mp3' || file.name.endsWith('.mp3');
@ -274,7 +278,7 @@ const formData = reactive<Record<string, any>>({
mp4File: '', mp4File: '',
previewFile: '', previewFile: '',
immediateFile: '', immediateFile: '',
previewFileSmall:'', previewFileSmall: '',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 4 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 4 } });

View File

@ -16,10 +16,12 @@
</a-spin> </a-spin>
</j-modal> --> </j-modal> -->
<a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true" <a-drawer :title="title" width="80vw" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel" :bodyStyle="{ background: 'linear-gradient(135deg, #f1f7ff 0%, #f1f7ff 100%)' }"> :footer-style="{ textAlign: 'right' }" @close="handleCancel"
:bodyStyle="{ background: 'linear-gradient(135deg, #f1f7ff 0%, #f1f7ff 100%)' }">
<a-spin :spinning="loading"> <a-spin :spinning="loading">
<ConfigServiceDirectiveForm ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit" <ConfigServiceDirectiveForm ref="registerForm" v-if="visible" @ok="submitCallback" :formDisabled="disableSubmit"
:formBpm="false" :mainOrgCode="mainOrgCode" :mediaApiAddress="mediaApiAddress" :opeType="opeType"> :formBpm="false" :mainOrgCode="mainOrgCode" :mediaApiAddress="mediaApiAddress" :opeType="opeType"
:isMain="isMain">
</ConfigServiceDirectiveForm> </ConfigServiceDirectiveForm>
</a-spin> </a-spin>
<template #footer> <template #footer>
@ -67,6 +69,7 @@ const loading = ref(false)
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const props = defineProps({ const props = defineProps({
mediaApiAddress: '',// mediaApiAddress: '',//
isMain: false,//
}); });
const title = ref<string>(''); const title = ref<string>('');
const visible = ref<boolean>(false); const visible = ref<boolean>(false);
@ -273,5 +276,4 @@ defineExpose({
display: none !important; display: none !important;
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>