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

1、服务指令-服务指令树：调整启用/停用分类标签、服务类别、服务指令的提示语 

2、服务指令-将列表的操作列更多里面的操作按钮都直接显示在最外层，去掉更多，修改启用、停用提示语
3、员工管理-员工信息：对“重置密码”操作的提示语进行修改
4、员工管理-员工信息：服务指令-服务指令列表页的搜索条件宽度调整
5、员工管理-审核管理：检索字段名调整
This commit is contained in:
1378012178@qq.com 2026-03-25 11:02:30 +08:00
parent d5b13bb469
commit e22bb7bbf5
4 changed files with 74 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/admin/employeesapply/EmployeesApplyList.vue
View File

@ -7,20 +7,20 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="name">
<template #label><span title="姓名">姓名</span></template>
<JInput v-model:value="queryParam.name" placeholder="请输入姓名" />
<template #label><span title="员工姓名">员工姓名</span></template>
<JInput v-model:value="queryParam.name" placeholder="请输入员工姓名" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="tel">
<template #label><span title="电话">电话</span></template>
<JInput v-model:value="queryParam.tel" placeholder="请输入电话" />
<template #label><span title="联系电话">联系电话</span></template>
<JInput v-model:value="queryParam.tel" placeholder="请输入联系电话" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status">
<template #label><span title="审核状态">审核状态</span></template>
<a-select v-model:value="queryParam.status" placeholder="请选择审核状态" style="width: 200px" :disabled="false">
<a-select v-model:value="queryParam.status" placeholder="请选择审核状态" :disabled="false">
<a-select-option value="1">待审核</a-select-option>
<a-select-option value="2">审核通过</a-select-option>
<a-select-option value="3">审核驳回</a-select-option>
@ -122,7 +122,7 @@ const labelCol = reactive({
xs: 24,
sm: 4,
xl: 6,
xxl: 4
xxl: 6
});
const wrapperCol = reactive({
xs: 24,
@ -188,7 +188,7 @@ function getTableAction(record) {
{
label: '员工入驻审核',
onClick: handleEdit.bind(null, record),
ifShow: record.status == '1' && (record.modifyStatus == null || record.modifyStatus == undefined || record.modifyStatus == '') && record.izHistory == 'N'
ifShow: record.status == '1' && (record.modifyStatus == null || record.modifyStatus == undefined || record.modifyStatus == '') && record.izHistory == 'N'
},
{
label: '信息变更审核',

3
src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
View File

@ -299,7 +299,8 @@ async function handleCzmm(record) {
createConfirm({
iconType: 'warning',
title: '密码重置操作确认',
content: '确认重置用户【' + record.name + '】的密码为"123456"？<br/>操作后已登录设备将被强制下线，旧密码即刻失效。请及时通知该员工。',
// content: '确认重置用户【' + record.name + '】的密码为"123456"？<br/>操作后已登录设备将被强制下线，旧密码即刻失效。请及时通知该员工。',
content: '确认将员工【' + record.name + '】的密码重置为初始密码：123456吗？',
okText: '确认',
cancelText: '取消',
onOk: async () => {

2
src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
View File

@ -16,7 +16,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<string>('1400px');
const width = ref<string>('1600px');
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

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

@ -11,9 +11,9 @@
<JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
</a-form-item>
</a-col>
<a-col :lg="8" >
<a-col :lg="8">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6" >
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
@ -256,9 +256,10 @@
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined"
@click="onImportXls">导入</j-upload-button>
<a-button type="primary" @click="directiveSyncCodeMangeFunc" v-show="!!ownOrgCode"
preIcon="ant-design:setting-outlined">镜像码管理</a-button>
<a-button type="primary" @click="handleDirectiveMainOpen" preIcon="ant-design:profile-outlined">
@ -388,7 +389,7 @@
<a-row style="width: 100%;">
<a-col :span="3" style="display: flex; align-items: center;">
<span style="font-weight: bold;font-size: 16px;">镜像码：<span style="color: #1890FF;">{{ syncCode
}}</span></span>
}}</span></span>
</a-col>
<a-col :span="3" style="display: flex; align-items: center; justify-content: flex-end;">
<a-button @click="copySyncCodeFunc()" type="primary" style="margin-right: 8px;">复制</a-button>
@ -514,7 +515,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
pageSizeOptions: ['15', '50', '70', '100'],
},
actionColumn: {
width: 120,
width: 160,
fixed: 'right',
},
beforeFetch: async (params) => {
@ -586,6 +587,32 @@ function getTableAction(record) {
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '编辑',
onClick: editDirective.bind(null, { key: record.id }),
},
// {
// label: '编辑资源',
// onClick: editMedia.bind(null, { key: record.id }),
// },
{
label: '启用',
// onClick: usingDirective.bind(null, { key: record.id }),
ifShow: record.izEnabled == 'N',
popConfirm: {
title: '是否启用指令',
confirm: usingDirective.bind(null, { key: record.id }),
},
},
{
label: '停用',
// onClick: stopDirective.bind(null, { key: record.id }),
ifShow: record.izEnabled == 'Y',
popConfirm: {
title: '是否停用指令',
confirm: stopDirective.bind(null, { key: record.id }),
},
},
];
}
@ -594,24 +621,32 @@ function getTableAction(record) {
*/
function getDropDownAction(record) {
return [
{
label: '编辑指令',
onClick: editDirective.bind(null, { key: record.id }),
},
// {
// label: '编辑资源',
// onClick: editMedia.bind(null, { key: record.id }),
// label: '编辑指令',
// onClick: editDirective.bind(null, { key: record.id }),
// },
// // {
// // label: '编辑资源',
// // onClick: editMedia.bind(null, { key: record.id }),
// // },
// {
// label: '启用指令',
// // onClick: usingDirective.bind(null, { key: record.id }),
// ifShow: record.izEnabled == 'N',
// popConfirm: {
// title: '是否启用指令',
// confirm: usingDirective.bind(null, record),
// },
// },
// {
// label: '停用指令',
// // onClick: stopDirective.bind(null, { key: record.id }),
// ifShow: record.izEnabled == 'Y',
// popConfirm: {
// title: '是否停用指令',
// confirm: stopDirective.bind(null, record),
// },
// },
{
label: '启用指令',
onClick: usingDirective.bind(null, { key: record.id }),
ifShow: record.izEnabled == 'N'
},
{
label: '停用指令',
onClick: stopDirective.bind(null, { key: record.id }),
ifShow: record.izEnabled == 'Y'
},
]
}
@ -830,7 +865,7 @@ function usingInstruction(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时启用分类标签“' + data.title + '”下所有服务类别、服务类型、服务指令！' + '是否确认启用分类标签“' + data.title + '”!',
content: '此操作将启用“' + data.title + '”分类标签下所有服务类别、服务类型、服务指令，' + '确认要执行此操作吗？',
okText: '启用',
cancelText: '取消',
onOk: () => {
@ -846,7 +881,7 @@ function stopInstruction(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时停用分类标签“' + data.title + '”下所有服务类别、服务类型、服务指令！' + '是否确认停用分类标签“' + data.title + '”!',
content: '此操作将停用“' + data.title + '”分类标签下所有服务类别、服务类型、服务指令，' + '确认要执行此操作吗？',
okText: '停用',
cancelText: '取消',
onOk: () => {
@ -871,7 +906,7 @@ function usingCategory(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时启用服务类别“' + data.title + '”下所有服务类型、服务指令！' + '是否确认启用服务类别“' + data.title + '”!',
content: '此操作将启用“' + data.title + '”服务类别下所有服务类型、服务指令，' + '确认要执行此操作吗？',
okText: '启用',
cancelText: '取消',
onOk: () => {
@ -886,7 +921,7 @@ function stopCategory(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时停用服务类别“' + data.title + '”下所有服务类型、服务指令！' + '是否确认停用服务类别“' + data.title + '”!',
content: '此操作将停用“' + data.title + '”服务类别下所有服务类型、服务指令，' + '确认要执行此操作吗？',
okText: '停用',
cancelText: '取消',
onOk: () => {
@ -911,7 +946,7 @@ function usingType(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时启用服务类型“' + data.title + '”下所有服务指令！' + '是否确认启用服务类型“' + data.title + '”!',
content: '此操作将启用“' + data.title + '”服务类型下所有服务指令，' + '确认要执行此操作吗？',
okText: '启用',
cancelText: '取消',
onOk: () => {
@ -925,7 +960,7 @@ function stopType(data) {
createConfirm({
iconType: 'warning',
title: '操作确认',
content: '此操作会同时停用服务类型“' + data.title + '”下所有服务指令！' + '是否确认停用服务类型“' + data.title + '”!',
content: '此操作将停用“' + data.title + '”服务类型下所有服务指令，' + '确认要执行此操作吗？',
okText: '停用',
cancelText: '取消',
onOk: () => {
@ -1295,8 +1330,6 @@ audio::-webkit-media-controls-time-remaining-display {
:where(.css-dev-only-do-not-override-9m98ij) .ant-image-preview-operations-operation {
display: none !important;
}
</style>
<style>
.ant-image-preview-body .ant-image-preview-operations {