diff --git a/.env.development b/.env.development index b0b9e2b..c1e7f55 100644 --- a/.env.development +++ b/.env.development @@ -20,6 +20,8 @@ VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' +# 试验田机构编码 +VITE_SYTJGBM = '101' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/.env.production b/.env.production index 5742a92..dfb09f0 100644 --- a/.env.production +++ b/.env.production @@ -21,6 +21,8 @@ VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursing-unit # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= +# 试验田机构编码 +VITE_SYTJGBM = '101' # 填写后将作为乾坤子应用启动,主应用注册时AppName需保持一致(放开 VITE_GLOB_QIANKUN_MICRO_APP_NAME 参数表示jeecg-vue3将以乾坤子应用模式启动) #VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3 diff --git a/src/api/common/api.ts b/src/api/common/api.ts index d7edb44..008a9e3 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -16,6 +16,7 @@ enum Api { getTableList = '/sys/user/queryUserComponentData', getCategoryData = '/sys/category/loadAllData', getNuList = '/iot/cameraInfo/nuList', //后期调整 + getOrgInfo = '/api/common/getOrgInfo',//根据机构编码获取机构信息 } /** @@ -164,3 +165,11 @@ export const getFileblob = (url, parameter) => { export const uploadMyFile = (url, data) => { return defHttp.uploadMyFile(url, data); }; + +/** + * 根据机构编码获取机构信息 + * @param params orgCode + */ +export const getOrgInfo = (params) => { + return defHttp.get({ url: Api.getOrgInfo, params }); +}; \ No newline at end of file diff --git a/src/components/Sync/SyncComponent.vue b/src/components/Sync/SyncComponent.vue index dd0aa7e..67eed46 100644 --- a/src/components/Sync/SyncComponent.vue +++ b/src/components/Sync/SyncComponent.vue @@ -125,15 +125,15 @@
- 源数据 + 源数据 全部 已选择 未选择 -
+
@@ -145,14 +145,14 @@
- 111 +
- +
@@ -168,7 +168,7 @@ 全部添加 - 全部移除 @@ -497,7 +405,7 @@ defineExpose({ } .selected-list-container { - height: calc(100vh - 350px); + height: calc(100vh - 310px); overflow: auto; :deep(.ant-table) { @@ -786,4 +694,11 @@ defineExpose({ } } } + +// 机构选取卡片各项值的容器padding +.org-card { + :deep(.ant-descriptions-item-content) { + padding: 20px; + } +} \ No newline at end of file diff --git a/src/components/dataAsync/AsyncMainList.vue b/src/components/dataAsync/AsyncMainList.vue index a2564f2..179f348 100644 --- a/src/components/dataAsync/AsyncMainList.vue +++ b/src/components/dataAsync/AsyncMainList.vue @@ -51,6 +51,9 @@ import { asyncMaincolumns, asyncStatusColumns } from './AsyncMain.data'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AsyncMain.api'; import AsyncMainModal from './components/AsyncMainModal.vue' +const props = defineProps({ + orgCode: 'orgCode' +}); const queryParam = reactive({}); const registerModal = ref(); //注册table数据 @@ -65,6 +68,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ showActionColumn: false, beforeFetch: async (params) => { queryParam.type = 'directive' + queryParam.orgCode = props.orgCode return Object.assign(params, queryParam); }, }, diff --git a/src/views/admin/mediamanage/MediaManage.api.ts b/src/views/admin/mediamanage/MediaManage.api.ts index 87d0e2f..24285da 100644 --- a/src/views/admin/mediamanage/MediaManage.api.ts +++ b/src/views/admin/mediamanage/MediaManage.api.ts @@ -1,16 +1,17 @@ import { defHttp } from '/@/utils/http/axios'; -import { useMessage } from "/@/hooks/web/useMessage"; +import { useMessage } from '/@/hooks/web/useMessage'; const { createConfirm } = useMessage(); enum Api { list = '/mediamanage/mediaManage/list', - save='/mediamanage/mediaManage/add', - edit='/mediamanage/mediaManage/edit', + save = '/mediamanage/mediaManage/add', + edit = '/mediamanage/mediaManage/edit', deleteOne = '/mediamanage/mediaManage/delete', deleteBatch = '/mediamanage/mediaManage/deleteBatch', importExcel = '/mediamanage/mediaManage/importExcel', exportXls = '/mediamanage/mediaManage/exportXls', + getUrl = '/mediamanage/mediaManage/getUrl', } /** @@ -35,11 +36,11 @@ export const list = (params) => defHttp.get({ url: Api.list, params }); * @param params * @param handleSuccess */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); -} +}; /** * 批量删除 @@ -54,12 +55,12 @@ export const batchDelete = (params, handleSuccess) => { okText: '确认', cancelText: '取消', onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { handleSuccess(); }); - } + }, }); -} +}; /** * 保存或者更新 @@ -69,4 +70,10 @@ export const batchDelete = (params, handleSuccess) => { export const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; return defHttp.post({ url: url, params }, { isTransformResponse: false }); -} +}; + +/** + * 获取协议、域名 + * @param params + */ +export const getUrl = () => defHttp.get({ url: Api.getUrl }); diff --git a/src/views/admin/mediamanage/MediaManage.data.ts b/src/views/admin/mediamanage/MediaManage.data.ts index 0ec276b..91669ca 100644 --- a/src/views/admin/mediamanage/MediaManage.data.ts +++ b/src/views/admin/mediamanage/MediaManage.data.ts @@ -15,6 +15,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'descr' }, + { + title: '系统功能', + align: "center", + dataIndex: 'sysFunc_dictText' + }, { title: '文件类型', align: "center", diff --git a/src/views/admin/mediamanage/MediaManageList.vue b/src/views/admin/mediamanage/MediaManageList.vue index 6375ad5..ea96598 100644 --- a/src/views/admin/mediamanage/MediaManageList.vue +++ b/src/views/admin/mediamanage/MediaManageList.vue @@ -8,14 +8,21 @@ - + + + + + + + + placeholder="请选择文件类型" allowClear /> @@ -55,25 +62,45 @@ - +
diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts index 16358ac..d8f02de 100644 --- a/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts @@ -1,67 +1,72 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; +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[] = [ - { - title: '审批状态', - align: "center", - dataIndex: 'status_dictText' - }, { title: '咨询人姓名', - align: "center", - dataIndex: 'name' + align: 'center', + dataIndex: 'name', }, { title: '性别', - align: "center", - dataIndex: 'sex' + align: 'center', + dataIndex: 'sex', }, { title: '联系电话', - align: "center", - dataIndex: 'tel' + align: 'center', + dataIndex: 'tel', }, { title: '申请日期', - align: "center", - dataIndex: 'createTime' + align: 'center', + dataIndex: 'createTime', }, { title: '机构地址', - align: "center", - dataIndex: 'orgAddress' + align: 'center', + dataIndex: 'orgAddress', }, { title: '机构负责人电话', - align: "center", - dataIndex: 'orgLeaderPhone' + align: 'center', + dataIndex: 'orgLeaderPhone', }, { title: '机构房屋性质', - align: "center", - dataIndex: 'orgPropertyType' + align: 'center', + dataIndex: 'orgPropertyType', }, { title: '机构建筑面积', - align: "center", - dataIndex: 'orgBuildingArea' + align: 'center', + dataIndex: 'orgBuildingArea', + }, + { + title: '审批状态', + align: 'center', + dataIndex: 'status_dictText', + }, + { + title: '审批备注', + align: 'center', + dataIndex: 'content', }, ]; // 高级查询数据 export const superQuerySchema = { - tel: {title: '联系电话',order: 2,view: 'text', type: 'string',}, - status: {title: '状态 1审核中 2审核完成 3驳回 ',order: 3,view: 'list', type: 'string',dictCode: '',}, - createTime: {title: '创建日期',order: 5,view: 'datetime', type: 'string',}, - izEntry: {title: '机构是否入驻0否 1是(是否入驻过)',order: 7,view: 'list', type: 'string',dictCode: '',}, - name: {title: '咨询人姓名',order: 8,view: 'text', type: 'string',}, - sex: {title: '性别',order: 9,view: 'text', type: 'string',}, - orgAddress: {title: '机构地址',order: 24,view: 'text', type: 'string',}, - orgLeaderPhone: {title: '机构负责人电话',order: 27,view: 'text', type: 'string',}, - orgPropertyType: {title: '机构房屋性质',order: 29,view: 'text', type: 'string',}, - orgBuildingArea: {title: '机构建筑面积',order: 30,view: 'number', type: 'number',}, + tel: { title: '联系电话', order: 2, view: 'text', type: 'string' }, + status: { title: '状态 1审核中 2审核完成 3驳回 ', order: 3, view: 'list', type: 'string', dictCode: '' }, + createTime: { title: '创建日期', order: 5, view: 'datetime', type: 'string' }, + izEntry: { title: '机构是否入驻0否 1是(是否入驻过)', order: 7, view: 'list', type: 'string', dictCode: '' }, + name: { title: '咨询人姓名', order: 8, view: 'text', type: 'string' }, + sex: { title: '性别', order: 9, view: 'text', type: 'string' }, + orgAddress: { title: '机构地址', order: 24, view: 'text', type: 'string' }, + orgLeaderPhone: { title: '机构负责人电话', order: 27, view: 'text', type: 'string' }, + orgPropertyType: { title: '机构房屋性质', order: 29, view: 'text', type: 'string' }, + orgBuildingArea: { title: '机构建筑面积', order: 30, view: 'number', type: 'number' }, }; diff --git a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue index feebbee..67791c3 100644 --- a/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue +++ b/src/views/biz/orgapplyinfo/OrgApplyInfoList.vue @@ -187,7 +187,8 @@ function getTableAction(record) { { label: '审批', onClick: handleEdit.bind(null, record), - auth: 'orgapplyinfo:nu_org_apply_info:edit' + auth: 'orgapplyinfo:nu_org_apply_info:edit', + disabled: record.status == '0' || record.status == '2' }, ]; } diff --git a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue index 1bdaddb..f049012 100644 --- a/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue +++ b/src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue @@ -111,13 +111,13 @@ - + - + @@ -126,7 +126,7 @@ - + @@ -179,12 +179,12 @@ - + @@ -217,6 +217,7 @@ import { saveOrUpdate } from '../OrgApplyInfo.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import TencentMap from '/@/components/TencentMap/TencentMap.vue'; +import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 2c9e383..2061be8 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -69,50 +69,11 @@ export const columns: BasicColumn[] = [ } }, }, - // { - // title: '收费价格', - // align: 'center', - // dataIndex: 'tollPrice', - // width: 100, - // }, - // { - // title: '提成价格', - // align: "center", - // dataIndex: 'comPrice' - // }, - // { - // title: '医保报销', - // align: 'center', - // dataIndex: 'izReimbursement_dictText', - // width: 100, - // }, - // { - // title: '机构优惠', - // align: 'center', - // 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,49 +86,15 @@ export const columns: BasicColumn[] = [ dataIndex: 'izEnabled_dictText', width: 100, }, - { - title: '语音文件', - align: 'center', - dataIndex: 'mp3File', - }, - { - title: '视频文件', - align: 'center', - dataIndex: 'mp4File', - }, - // { - // title: '创建人', - // align: "center", - // dataIndex: 'createBy' - // }, - // { - // title: '创建日期', - // align: "center", - // sorter: true, - // dataIndex: 'createTime' - // }, - // { - // title: '更新人', - // align: "center", - // dataIndex: 'updateBy' - // }, - // { - // title: '更新日期', - // align: "center", - // sorter: true, - // dataIndex: 'updateTime' - // }, { title: '预览图片', align: 'center', - dataIndex: 'previewFile', - customRender: render.renderImage, + dataIndex: 'previewFileMedia', }, { title: '即时指令图片', align: 'center', - dataIndex: 'immediateFile', - customRender: render.renderImage, + dataIndex: 'immediateFileMedia', }, ]; diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 637bd3e..92ab6d8 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -8,22 +8,18 @@