From 1035b210dfb410d2d12cae6d587734a88d41a5d8 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Thu, 19 Jun 2025 15:09:53 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=202=E3=80=81=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E8=B5=84=E6=BA=90=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98=203?=
=?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9C=BA=E6=9E=843=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development003 | 27 +++
.env003 | 25 +++
.../components/MediaManageForm.vue | 16 +-
.../ConfigServiceDirective.data.ts | 54 -----
.../ConfigServiceDirectiveList.vue | 201 ++++++------------
.../components/ConfigServiceDirectiveForm.vue | 54 +----
.../depart/components/DepartFormModal.vue | 18 +-
src/views/system/depart/depart.data.ts | 143 +++++++++++--
8 files changed, 274 insertions(+), 264 deletions(-)
create mode 100644 .env.development003
create mode 100644 .env003
diff --git a/.env.development003 b/.env.development003
new file mode 100644
index 0000000..4734fa1
--- /dev/null
+++ b/.env.development003
@@ -0,0 +1,27 @@
+# 是否打开mock
+VITE_USE_MOCK = true
+
+# 发布路径
+VITE_PUBLIC_PATH = /
+
+
+# 跨域代理，您可以配置多个 ,请注意，没有换行符
+VITE_PROXY = [["/nursing-unit-003","http://localhost:8083/nursing-unit_003"],["/upload","http://localhost:3300/upload"]]
+
+#后台接口全路径地址(必填)
+VITE_GLOB_DOMAIN_URL=http://localhost:8083/nursing-unit_003
+
+#后台接口父地址(必填)
+VITE_GLOB_API_URL=/nursing-unit-003
+
+# 接口前缀
+VITE_GLOB_API_URL_PREFIX=
+
+#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
+VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'
+
+
+# 填写后将作为乾坤子应用启动，主应用注册时AppName需保持一致（放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动）
+#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3
+# 作为乾坤子应用启动时必填，需与qiankun主应用注册子应用时填写的 entry 保持一致
+#VITE_GLOB_QIANKUN_MICRO_APP_ENTRY=//localhost:3001/jeecg-vue3
diff --git a/.env003 b/.env003
new file mode 100644
index 0000000..97a0f54
--- /dev/null
+++ b/.env003
@@ -0,0 +1,25 @@
+# port
+VITE_PORT = 3103
+
+# 网站标题
+VITE_GLOB_APP_TITLE = 业务系统3
+
+# 简称，此变量只能是字符/下划线
+VITE_GLOB_APP_SHORT_NAME = 业务系统3
+
+# 单点登录服务端地址
+VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
+
+# 是否开启单点登录
+VITE_GLOB_APP_OPEN_SSO = false
+
+# 开启微前端模式
+VITE_GLOB_APP_OPEN_QIANKUN=true
+
+# 文件预览地址
+VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview
+
+# 运维服务器接口地址
+VITE_GLOB_INSTITUTIONS_URL=http://192.168.2.19:8080/nursing-unit/
+
+
diff --git a/src/views/admin/mediamanage/components/MediaManageForm.vue b/src/views/admin/mediamanage/components/MediaManageForm.vue
index 9ca4f2e..115e2e7 100644
--- a/src/views/admin/mediamanage/components/MediaManageForm.vue
+++ b/src/views/admin/mediamanage/components/MediaManageForm.vue
@@ -17,8 +17,8 @@
-
+
@@ -30,7 +30,7 @@
+ :disabled="formData.sysFunc == 'directive'" @change="handleFileTypeChange" />
@@ -126,6 +126,7 @@ const formData = reactive>({
id: '',
name: '',
descr: '',
+ sysFunc: '',
fileType: '',
filePath: '',
izNetUrl: 'local',
@@ -285,6 +286,15 @@ function transUrl(record) {
}
}
+/**
+ * 系统功能变更
+ */
+function sysFuncChanged() {
+ if (formData.sysFunc == 'directive') {
+ formData.izNetUrl = 'net'
+ }
+}
+
defineExpose({
add,
edit,
diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
index fb8fc86..969edcf 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
@@ -1,8 +1,4 @@
import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-import { rules } from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
@@ -92,27 +88,11 @@ export const columns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
width: 100,
},
- // {
- // title: '收费频次',
- // align: 'center',
- // dataIndex: 'chargingFrequency_dictText',
- // },
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
- // {
- // title: '排序',
- // align: "center",
- // sorter: true,
- // dataIndex: 'sort'
- // },
- // {
- // title: '服务说明',
- // align: "center",
- // dataIndex: 'serviceContent'
- // },
{
title: '服务时长（分钟）',
align: 'center',
@@ -125,50 +105,16 @@ export const columns: BasicColumn[] = [
dataIndex: 'izEnabled_dictText',
width: 100,
},
- // {
- // title: '语音文件',
- // align: 'center',
- // dataIndex: 'mp3FileMedia',
- // },
- // {
- // title: '视频文件',
- // align: 'center',
- // dataIndex: 'mp4FileMedia',
- // },
{
title: '预览图片',
align: 'center',
dataIndex: 'previewFileMedia',
- customRender: render.renderImage,
},
{
title: '即时指令图片',
align: 'center',
dataIndex: 'immediateFileMedia',
- customRender: render.renderImage,
},
- // {
- // title: '创建人',
- // align: "center",
- // dataIndex: 'createBy'
- // },
- // {
- // title: '创建日期',
- // align: "center",
- // sorter: true,
- // dataIndex: 'createTime'
- // },
- // {
- // title: '更新人',
- // align: "center",
- // dataIndex: 'updateBy'
- // },
- // {
- // title: '更新日期',
- // align: "center",
- // sorter: true,
- // dataIndex: 'updateTime'
- // },
];
// 高级查询数据
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index fce3c24..24262a8 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -5,6 +5,13 @@
+
+
+ 分类标签
+
+
+
服务类别
@@ -17,85 +24,39 @@
服务类型
+ :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 and category_id = ${queryParam.categoryId || -1} order by sort asc`"
+ placeholder="请选择服务类型" :ignoreDisabled="true" allowClear />
+
+
+
+
+ 服务指令
+
+
+
+
+
+ 体型标签
+
+
+
+
+
+ 情绪标签
+
+
+
+
+
+ 是否启用
+
-
-
- 服务指令
-
-
-
-
-
- 分类标签
-
-
-
-
-
-
-
-
- 体型标签
-
-
-
-
-
- 情绪标签
-
-
-
-
-
-
- 是否启用
-
-
-
@@ -112,63 +73,43 @@
- 配置服务类别
- 配置服务类型
- 配置体型标签
- 配置情绪标签
- 新增服务指令
-
-
-
-
+ 配置服务类别
+ 配置服务类型
+ 配置体型标签
+ 配置情绪标签
+ 新增服务指令
-
+
无文件
-
+ ![]()
-
+
无文件
-
- 播放视频
-
+ ![]()
- {{text.map((item) => item.tagName).join('、')}}
+ {{text.map((item) =>
+ item.tagName).join('、')}}
- {{text.map((item) => item.tagName).join('、')}}
+ {{text.map((item) =>
+ item.tagName).join('、')}}
-
+
+
@@ -214,15 +155,13 @@
@@ -523,7 +461,8 @@ audio::-webkit-media-controls-current-time-display,
audio::-webkit-media-controls-time-remaining-display {
display: none;
}
-.btnPrivate{
+
+.btnPrivate {
height: 34px;
margin-left: 4px;
}
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 5ea5e7d..5af37e8 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -61,13 +61,6 @@
dictCode="institutional_discount" allowClear />
-
@@ -90,11 +83,6 @@
-
@@ -115,32 +103,6 @@
placeholder="请选择是否启用" allowClear />
-
@@ -165,14 +127,12 @@
- ![]()
+ ![]()
- ![]()
+ ![]()
@@ -205,14 +165,14 @@
@@ -261,11 +221,7 @@ const showResourcePicker = (obj, param) => {
const handleResourceSelected = (selectedResource) => {
formData[changedMediaObjStr.value] = selectedResource.id
- if (selectedResource.izNetUrl == 'net') {
- formData[changedMediaObjStr.value + 'Media'] = props.sysUrlValue + selectedResource.filePath
- } else {
- formData[changedMediaObjStr.value + 'Media'] = selectedResource.filePath
- }
+ formData[changedMediaObjStr.value + 'Media'] = selectedResource.filePath
};
const formRef = ref();
const useForm = Form.useForm;
diff --git a/src/views/system/depart/components/DepartFormModal.vue b/src/views/system/depart/components/DepartFormModal.vue
index 98ee2f1..18738f1 100644
--- a/src/views/system/depart/components/DepartFormModal.vue
+++ b/src/views/system/depart/components/DepartFormModal.vue
@@ -66,27 +66,23 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
},
},
{
- field: 'orgCode',
- show: false,
+ field: 'platType',
+ show: !isChild
},
{
- field: 'orgCategory',
- componentProps: { options: categoryOptions },
+ field: 'orgCode',
+ show: false,
},
{
field: 'url',
show: !isChild,
},
{
- field: 'province',
- show: !isChild,
+ field: 'orgCategory',
+ componentProps: { options: categoryOptions },
},
{
- field: 'city',
- show: !isChild,
- },
- {
- field: 'district',
+ field: 'payableAmount',
show: !isChild,
},
]);
diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts
index 4ea2422..4d6724c 100644
--- a/src/views/system/depart/depart.data.ts
+++ b/src/views/system/depart/depart.data.ts
@@ -3,19 +3,13 @@ import { FormSchema } from '/@/components/Form';
// 部门基础表单
export function useBasicFormSchema() {
const basicFormSchema: FormSchema[] = [
- {
- field: 'departName',
- label: '机构名称',
- component: 'Input',
- componentProps: {
- placeholder: '请输入机构/部门名称',
- },
- rules: [{ required: true, message: '机构名称不能为空' }],
- },
{
field: 'parentId',
- label: '上级部门',
+ label: '上级',
component: 'TreeSelect',
+ ifShow: (v_) => {
+ return !!v_.values.parentId;
+ },
componentProps: {
treeData: [],
placeholder: '无',
@@ -23,16 +17,25 @@ export function useBasicFormSchema() {
},
},
{
- field: 'orgCode',
- label: '机构编码',
+ field: 'departName',
+ label: '名称',
component: 'Input',
componentProps: {
- placeholder: '请输入机构编码',
+ placeholder: '请输入名称',
+ },
+ rules: [{ required: true, message: '名称不能为空' }],
+ },
+ {
+ field: 'orgCode',
+ label: '编码',
+ component: 'Input',
+ componentProps: {
+ placeholder: '请输入编码',
},
},
{
field: 'orgCategory',
- label: '机构类型',
+ label: '类型',
component: 'RadioButtonGroup',
componentProps: { options: [] },
},
@@ -40,8 +43,8 @@ export function useBasicFormSchema() {
field: 'url',
label: '协议域名',
component: 'Input',
- dynamicDisabled: ({ values }) => {
- return values.orgCategory != '1';
+ ifShow: (v_) => {
+ return !v_.values.parentId;
},
componentProps: {
placeholder: '请输入协议域名',
@@ -51,20 +54,117 @@ export function useBasicFormSchema() {
field: 'province',
label: '省份',
component: 'Input',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
slot: 'province',
},
{
field: 'city',
label: '城市',
component: 'Input',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
slot: 'city',
},
{
field: 'district',
label: '区县',
component: 'Input',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
slot: 'district',
},
+ {
+ field: 'platType',
+ label: '业务平台类型',
+ defaultValue: 'ywjg',
+ component: 'JDictSelectTag',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ dictCode: 'iz_test_site',
+ },
+ rules: [
+ {
+ required: true,
+ message: '请选择平台类型',
+ },
+ ],
+ },
+ {
+ field: 'payableAmount',
+ label: '入住应缴金额',
+ component: 'InputNumber',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ rules: [
+ {
+ required: true,
+ message: '请填写护理单元长者入住应缴金额',
+ },
+ ],
+ },
+ {
+ field: 'operationStartTime',
+ label: '运营开始时间',
+ component: 'DatePicker',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ style: {
+ width: '100%',
+ },
+ },
+ },
+ {
+ field: 'operationEndTime',
+ label: '运营到期时间',
+ component: 'DatePicker',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ style: {
+ width: '100%',
+ },
+ },
+ },
+ {
+ field: 'contractStartTime',
+ label: '合同开始时间',
+ component: 'DatePicker',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ style: {
+ width: '100%',
+ },
+ },
+ },
+ {
+ field: 'contractEndTime',
+ label: '合同到期时间',
+ component: 'DatePicker',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ style: {
+ width: '100%',
+ },
+ },
+ },
{
field: 'mobile',
label: '电话',
@@ -85,6 +185,9 @@ export function useBasicFormSchema() {
field: 'address',
label: '地址',
component: 'Input',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
componentProps: {
placeholder: '请输入地址',
},
@@ -103,6 +206,14 @@ export function useBasicFormSchema() {
component: 'InputNumber',
componentProps: {},
},
+ {
+ field: 'picUrl',
+ label: '机构图片',
+ component: 'JImageUpload',
+ ifShow: (v_) => {
+ return !v_.values.parentId;
+ },
+ },
];
return { basicFormSchema };
}