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

1、长者标签增加差异标签导出

This commit is contained in:
1378012178@qq.com 2025-08-27 15:17:53 +08:00
parent 7606dcc82d
commit 34e99ca6a0
7 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.development
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=
#微前端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将以乾坤子应用模式启动）
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

8
.env.development2 → .env.development1
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=
#微前端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将以乾坤子应用模式启动）
#VITE_GLOB_QIANKUN_MICRO_APP_NAME=jeecg-vue3

2
src/views/elder/canaddet/CanAddElderTag.data.ts
View File

@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
{
title: '说明',
align: 'center',
dataIndex: 'describe',
dataIndex: 'describ',
},
{
title: '价格(元)',

4
src/views/elder/canaddet/CanAddElderTagList.vue
View File

@ -15,7 +15,7 @@
<a-col :lg="6">
<a-form-item name="type">
<template #label><span title="标签类型">标签类型</span></template>
<j-dict-select-tag v-model:value="queryParam.type" :dictCode="`nu_elder_tag_type,type_name,id`"
<j-dict-select-tag v-model:value="queryParam.type" dictCode="elder_tag_type"
placeholder="请选择标签类型" allowClear :ignoreDisabled="true" />
</a-form-item>
</a-col>
@ -99,7 +99,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
},
},
exportConfig: {
name: "可新增标签",
name: "差异标签",
url: getExportUrl,
params: queryParam,
},

33
src/views/elder/eldertag/ElderTagList.vue
View File

@ -8,7 +8,7 @@
<a-col :lg="6">
<a-form-item name="type">
<template #label><span title="标签类型">标签类型</span></template>
<j-dict-select-tag v-model:value="queryParam.type" :dictCode="`nu_elder_tag_type,type_name,id`" placeholder="请选择标签类型"
<j-dict-select-tag v-model:value="queryParam.type" dictCode="elder_tag_type" placeholder="请选择标签类型"
allowClear :ignoreDisabled="true" />
</a-form-item>
</a-col>
@ -43,12 +43,12 @@
<template #tableTitle>
<a-button type="primary" v-auth="'eldertag:nu_elder_tag:add'" @click="handleAdd"
preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" @click="handleEditMain" preIcon="ant-design:setting-outlined"> 标签管理</a-button>
<a-button type="primary" @click="handleEditRep" preIcon="ant-design:plus-outlined"> 引用</a-button>
<!-- <a-button type="primary" @click="handleEditMain" preIcon="ant-design:setting-outlined"> 标签管理</a-button>
<a-button type="primary" @click="handleEditRep" preIcon="ant-design:plus-outlined"> 引用</a-button> -->
<a-button type="primary" class="btnPrivate" @click="handleDirectiveMainOpen" v-show="isShowETM"
preIcon="ant-design:profile-outlined">标准标签库</a-button>
<a-button type="primary" preIcon="ant-design:eye-outlined" v-show="ownOrgCode == mainOrgCode"
@click="handleCompare">差异比对</a-button>
<!-- <a-button type="primary" preIcon="ant-design:eye-outlined" v-show="ownOrgCode == mainOrgCode"
@click="handleCompare">差异比对</a-button> -->
<a-button type="primary" preIcon="ant-design:eye-outlined" style="margin-right: 10px;"
v-show="ownOrgCode == mainOrgCode" @click="handleLookNewDirectives">差异标签</a-button>
</template>
@ -63,23 +63,23 @@
<ElderTagModal ref="registerModal" @success="handleSuccess"></ElderTagModal>
<!-- 标签管理 -->
<a-drawer title="标签管理" width="80vw" :open="tagMainManagOpen" @close="onTagMainManagClose"
<!-- <a-drawer title="标签管理" width="80vw" :open="tagMainManagOpen" @close="onTagMainManagClose"
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }">
<template #footer>
<a-button type="primary" @click="onTagMainManagClose" style="margin-right: 10px;">关闭</a-button>
</template>
<ElderTagMainList ref="tagMainManagRef"> </ElderTagMainList>
</a-drawer>
</a-drawer> -->
<!-- 引用 -->
<a-drawer title="引用" width="80vw" :open="tagMainRepOpen" @close="onTagMainRepClose"
<!-- <a-drawer title="引用" width="80vw" :open="tagMainRepOpen" @close="onTagMainRepClose"
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }">
<template #footer>
<a-button type="primary" @click="onTagMainRepClose" style="margin-right: 10px;">关闭</a-button>
<a-button type="primary" @click="onTagMainRepUse" style="margin-right: 10px;">引用</a-button>
</template>
<ElderTagMainRes ref="tagMainRepRef"> </ElderTagMainRes>
</a-drawer>
</a-drawer> -->
<!-- 差异标签 -->
<a-drawer v-model:visible="newElderTagVisible" title="差异标签" width="85vw" :footer-style="{ textAlign: 'right' }"
@ -305,14 +305,13 @@ async function getElderTagMainOrgCode() {
//刷新已有指令库
async function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
await idListByDS({ dataSourceCode: 'master' }).then(res => {
existETIds.value = res.records
if (izReset) {
canAddElderTagRef.value?.searchReset()
} else {
canAddElderTagRef.value?.reload()
}
})
let res = await idListByDS({ dataSourceCode: 'master' })
existETIds.value = res.records
if (izReset) {
canAddElderTagRef.value?.searchReset()
} else {
canAddElderTagRef.value?.reload()
}
}
async function handleLookNewDirectives() {

2
src/views/elder/eldertag/components/ElderTagForm.vue
View File

@ -7,7 +7,7 @@
<a-col :span="24">
<a-form-item label="标签类型" v-bind="validateInfos.type" id="ElderTagForm-type" name="type">
<j-dict-select-tag v-model:value="formData.type"
:dictCode="`nu_elder_tag_type,type_name,id, iz_enabled = 0 `" placeholder="请选择标签类型" allowClear
dictCode="elder_tag_type" placeholder="请选择标签类型" allowClear
:disabled="!!formData.id" />
</a-form-item>
</a-col>

21
src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
View File

@ -1384,20 +1384,19 @@ function onAbnormalListClose() {
}
//刷新已有指令库
function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
idListByDS({ dataSourceCode: 'master' }).then(res => {
existDirectiveIds.value = res.records
if (izReset) {
canAddDirectiveRef.value?.searchReset()
} else {
canAddDirectiveRef.value?.reload()
}
})
async function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) {
let res = await idListByDS({ dataSourceCode: 'master' })
existDirectiveIds.value = res.records
if (izReset) {
canAddDirectiveRef.value?.searchReset()
} else {
canAddDirectiveRef.value?.reload()
}
}
function handleLookNewDirectives() {
async function handleLookNewDirectives() {
await refreshDMExistedIds(directiveMainOrgInfo.value, true)
newDirectiveVisible.value = true
refreshDMExistedIds(directiveMainOrgInfo.value, true)
}
/**
* 关闭新增指令