所在节点改成所在站点

This commit is contained in:
Leo_Ding 2025-11-03 11:09:14 +08:00
parent eec6e9b89b
commit aaafe1afbb
10 changed files with 104 additions and 160 deletions

View File

@ -183,14 +183,6 @@ const columns = [
align: 'center', align: 'center',
width: 200, width: 200,
}, },
{
title: '所在节点',
dataIndex: 'currentNode',
key: 'currentNode',
align: 'center',
width: 120,
},
{ {
title: '档案号', title: '档案号',
dataIndex: 'fileNumber', dataIndex: 'fileNumber',

View File

@ -3,19 +3,6 @@
<template #default="{ gutter, colSpan }"> <template #default="{ gutter, colSpan }">
<a-form :model="searchFormData" layout="inline" labelAlign="left"> <a-form :model="searchFormData" layout="inline" labelAlign="left">
<a-row :gutter="[24, 24]"> <a-row :gutter="[24, 24]">
<!-- 所在区域 -->
<a-col :span="12">
<a-form-item label="所在节点" name="currentNode">
<a-tree-select v-model:value="value" show-search style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="Please select"
allow-clear tree-default-expand-all :tree-data="treeData" tree-node-filter-prop="label">
<template #title="{ value: val, label }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ label }}</template>
</template>
</a-tree-select>
</a-form-item>
</a-col>
<!-- 姓名 --> <!-- 姓名 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="姓名" name="name"> <a-form-item label="姓名" name="name">
@ -175,14 +162,6 @@ const columns = [
align: 'center', align: 'center',
width: 200, width: 200,
}, },
{
title: '所在节点',
dataIndex: 'currentNode',
key: 'currentNode',
align: 'center',
width: 120,
},
{ {
title: '档案号', title: '档案号',
dataIndex: 'fileNumber', dataIndex: 'fileNumber',

View File

@ -1,18 +1,11 @@
<template> <template>
<x-search-bar class="mb-8-2"> <x-search-bar class="mb-8-2">
<template #default="{ gutter, colSpan }"> <template #default="{ gutter, colSpan }">
<a-form :model="searchFormData" labelAlign="left"> <a-form :model="searchFormData" labelAlign="left">
<a-row :gutter="12"> <a-row :gutter="12">
<a-col :span="8"> <a-col :span="8">
<a-form-item label="所在节点" name="currentNode"> <a-form-item label="所在站点" name="stationId">
<a-tree-select v-model:value="value" show-search style="width: 100%" <ServiceStation v-model:value="searchFormData.stationId" />
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="Please select"
allow-clear tree-default-expand-all :tree-data="treeData" tree-node-filter-prop="label">
<template #title="{ value: val, label }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ label }}</template>
</template>
</a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 所在区域 --> <!-- 所在区域 -->
@ -37,7 +30,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 姓名 --> <!-- 姓名 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="姓名" name="name"> <a-form-item label="姓名" name="name">
<a-input v-model:value="searchFormData.name" placeholder="请输入姓名" /> <a-input v-model:value="searchFormData.name" placeholder="请输入姓名" />
@ -49,13 +42,13 @@
<a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" /> <a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 身份证号 --> <!-- 身份证号 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="身份证号" name="idNumber"> <a-form-item label="身份证号" name="idNumber">
<a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" /> <a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 身份证号 --> <!-- 身份证号 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="档案号" name="fileNumber"> <a-form-item label="档案号" name="fileNumber">
<a-input v-model:value="searchFormData.fileNumber" placeholder="请输入档案号" /> <a-input v-model:value="searchFormData.fileNumber" placeholder="请输入档案号" />
@ -110,11 +103,11 @@
<x-action-button @click="$refs.detailRef.handleCreate(record)"> <x-action-button @click="$refs.detailRef.handleCreate(record)">
<span>详情</span> <span>详情</span>
</x-action-button> </x-action-button>
<x-action-button @click="$refs.detailRef.handleCreate(record)"> <x-action-button @click="$refs.detailRef.handleCreate(record)">
<span>编辑</span> <span>编辑</span>
</x-action-button> </x-action-button>
</template> </template>
</template> </template>
</a-table> </a-table>
@ -138,12 +131,13 @@ import detail from '../serverList/components/detail.vue'
import { useDicsStore } from '@/store' import { useDicsStore } from '@/store'
import AreaCascader from '@/components/AreaCascader/index.vue' import AreaCascader from '@/components/AreaCascader/index.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import ServiceStation from '@/components/ServiceStation/index.vue'
defineOptions({ defineOptions({
name: 'serverList', name: 'serverList',
}) })
const totalCount = ref(0) // const totalCount = ref(0) //
const dicsStore = useDicsStore() const dicsStore = useDicsStore()
const labelOptions= ref([]) const labelOptions = ref([])
const columns = [ const columns = [
{ {
title: '序号', title: '序号',
@ -360,9 +354,9 @@ const columns = [
width: 160, width: 160,
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },

View File

@ -5,15 +5,8 @@
<a-row :gutter="[24, 24]"> <a-row :gutter="[24, 24]">
<!-- 所在区域 --> <!-- 所在区域 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="所在节点" name="currentNode"> <a-form-item label="所在站点" name="stationId">
<a-tree-select v-model:value="value" show-search style="width: 100%" <ServiceStation v-model:value="searchFormData.stationId" />
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="Please select"
allow-clear tree-default-expand-all :tree-data="treeData" tree-node-filter-prop="label">
<template #title="{ value: val, label }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ label }}</template>
</template>
</a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 所在区域 --> <!-- 所在区域 -->
@ -93,6 +86,7 @@ import EditDialog from './components/EditDialog.vue'
import { useDicsStore } from '@/store' import { useDicsStore } from '@/store'
import AreaCascader from '@/components/AreaCascader/index.vue' import AreaCascader from '@/components/AreaCascader/index.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import ServiceStation from '@/components/ServiceStation/index.vue'
defineOptions({ defineOptions({
name: 'allocation', name: 'allocation',
}) })
@ -188,9 +182,9 @@ const columns = [
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },

View File

@ -46,15 +46,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="所在节点" name="currentNode"> <a-form-item label="所在站点" name="stationId">
<a-tree-select v-model:value="value" show-search style="width: 100%" <ServiceStation v-model:value="searchFormData.stationId" />
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="Please select"
allow-clear tree-default-expand-all :tree-data="treeData" tree-node-filter-prop="label">
<template #title="{ value: val, label }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ label }}</template>
</template>
</a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -134,6 +127,7 @@ import EditDialog from './components/EditDialog.vue'
import { useDicsStore } from '@/store' import { useDicsStore } from '@/store'
import AreaCascader from '@/components/AreaCascader/index.vue' import AreaCascader from '@/components/AreaCascader/index.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import ServiceStation from '@/components/ServiceStation/index.vue'
defineOptions({ defineOptions({
name: 'allocation', name: 'allocation',
}) })
@ -213,9 +207,9 @@ const columns = [
width: 200, width: 200,
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },

View File

@ -4,8 +4,8 @@
<a-form :model="searchFormData" labelAlign="left"> <a-form :model="searchFormData" labelAlign="left">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="8" v-if="platForm !== 'yunying'"> <a-col :span="8" v-if="platForm !== 'yunying'">
<a-form-item label="所在节点" name="serviceNodeIds"> <a-form-item label="所在站点" name="stationId">
<node-tree v-model:value="searchFormData.serviceNodeIds" /> <ServiceStation v-model:value="searchFormData.stationId" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 所在区域 --> <!-- 所在区域 -->
@ -380,6 +380,7 @@ import dayjs from 'dayjs'
import {DownOutlined} from '@ant-design/icons-vue' import {DownOutlined} from '@ant-design/icons-vue'
import storage from '@/utils/storage' import storage from '@/utils/storage'
import TransferOut from './components/TransferOut.vue' import TransferOut from './components/TransferOut.vue'
import ServiceStation from '@/components/ServiceStation/index.vue'
defineOptions({ defineOptions({
name: 'serverList', name: 'serverList',
}) })
@ -574,9 +575,9 @@ const columns = [
width: 160, width: 160,
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },

View File

@ -190,9 +190,9 @@ const columns = [
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },

View File

@ -1,75 +1,68 @@
<template> <template>
<x-search-bar class="mb-8-2"> <x-search-bar class="mb-8-2">
<template #default="{ gutter, colSpan }"> <template #default="{ gutter, colSpan }">
<a-form :model="searchFormData" layout="inline" labelAlign="left"> <a-form :model="searchFormData" layout="inline" labelAlign="left">
<a-row :gutter="[24, 24]"> <a-row :gutter="[24, 24]">
<!-- 所在区域 --> <!-- 所在区域 -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="所在节点" name="currentNode"> <a-form-item label="所在站点" name="stationId">
<a-tree-select v-model:value="value" show-search style="width: 100%" <ServiceStation v-model:value="searchFormData.stationId" />
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="Please select"
allow-clear tree-default-expand-all :tree-data="treeData" tree-node-filter-prop="label">
<template #title="{ value: val, label }">
<b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
<template v-else>{{ label }}</template>
</template>
</a-tree-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 姓名 --> <!-- 姓名 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="姓名" name="name"> <a-form-item label="姓名" name="name">
<a-input v-model:value="searchFormData.name" placeholder="请输入姓名" /> <a-input v-model:value="searchFormData.name" placeholder="请输入姓名" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 身份证号 --> <!-- 身份证号 -->
<a-col :span="8"> <a-col :span="8">
<a-form-item label="身份证号" name="idNumber"> <a-form-item label="身份证号" name="idNumber">
<a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" /> <a-input v-model:value="searchFormData.idNumber" placeholder="请输入身份证号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<a-col class="align-left" :span="8"> <a-col class="align-left" :span="8">
<a-space>
<a-button @click="handleResetSearch">{{ $t('button.reset') }}</a-button>
<a-button ghost type="primary" @click="handleSearch">
{{ $t('button.search') }}
</a-button>
</a-space>
</a-col>
</a-row>
</a-form>
</template>
</x-search-bar>
<a-row :gutter="8" :wrap="false">
<a-col flex="auto">
<a-card title="电话关爱对象列表">
<template #extra>
<a-space> <a-space>
<a-button type="primary">导入</a-button> <a-button @click="handleResetSearch">{{ $t('button.reset') }}</a-button>
<a-button type="dashed">导入记录</a-button> <a-button ghost type="primary" @click="handleSearch">
<a-button type="primary">导出</a-button> {{ $t('button.search') }}
<a-button type="dashed">导出记录</a-button> </a-button>
</a-space> </a-space>
</template> </a-col>
<a-table :columns="columns" :data-source="listData" bordered="true" :loading="loading" </a-row>
:pagination="paginationState" :scroll="{ x: 'max-content' }" @change="onTableChange"> </a-form>
<template #bodyCell="{ index, column, record }"> </template>
<template v-if="column.key === 'serialNumber'"> </x-search-bar>
<span>{{ index + 1 }}</span> <a-row :gutter="8" :wrap="false">
</template> <a-col flex="auto">
<template v-if="'action' === column.key"> <a-card title="电话关爱对象列表">
<x-action-button @click="$refs.editDialogRef.handleCreate(record)"> <template #extra>
<span>编辑</span> <a-space>
</x-action-button> <a-button type="primary">导入</a-button>
</template> <a-button type="dashed">导入记录</a-button>
<a-button type="primary">导出</a-button>
<a-button type="dashed">导出记录</a-button>
</a-space>
</template>
<a-table :columns="columns" :data-source="listData" bordered="true" :loading="loading"
:pagination="paginationState" :scroll="{ x: 'max-content' }" @change="onTableChange">
<template #bodyCell="{ index, column, record }">
<template v-if="column.key === 'serialNumber'">
<span>{{ index + 1 }}</span>
</template> </template>
</a-table> <template v-if="'action' === column.key">
</a-card> <x-action-button @click="$refs.editDialogRef.handleCreate(record)">
</a-col> <span>编辑</span>
</a-row> </x-action-button>
<edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog> </template>
</template>
</a-table>
</a-card>
</a-col>
</a-row>
<edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog>
</template> </template>
<script setup> <script setup>
@ -138,7 +131,7 @@ const columns = [
align: 'center', align: 'center',
width: 120, width: 120,
}, },
// --- --- // --- ---
{ {
title: '联系方式1', title: '联系方式1',
@ -177,9 +170,9 @@ const columns = [
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },
@ -381,4 +374,4 @@ async function onOk() {
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped></style>

View File

@ -60,11 +60,8 @@
</a-col> </a-col>
<a-col v-bind="colSpan"> <a-col v-bind="colSpan">
<a-form-item label="所在节点" name="node"> <a-form-item label="所在站点" name="stationId">
<a-select v-model:value="searchFormData.node" placeholder="请选择所在节点"> <ServiceStation v-model:value="searchFormData.stationId" />
<a-select-option value="node1">节点1</a-select-option>
<a-select-option value="node2">节点2</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -249,7 +246,7 @@ import { useI18n } from 'vue-i18n'
import storage from '@/utils/storage' import storage from '@/utils/storage'
import AreaCascader from '@/components/AreaCascader/index.vue' import AreaCascader from '@/components/AreaCascader/index.vue'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import ServiceStation from '@/components/ServiceStation/index.vue'
defineOptions({ defineOptions({
name: 'menu', name: 'menu',
}) })

View File

@ -547,9 +547,9 @@ const columns = [
width: 160, width: 160,
}, },
{ {
title: '所在点', title: '所在点',
dataIndex: 'currentNode', dataIndex: 'stationName',
key: 'currentNode', key: 'stationName',
align: 'center', align: 'center',
width: 120, width: 120,
}, },