This commit is contained in:
jy
2025-06-17 20:04:43 +08:00
parent a5c65af987
commit 6dcd327ac9
26 changed files with 2723 additions and 1032 deletions

View File

@ -40,13 +40,14 @@
width="55"
:reserve-selection="true"
/>
<el-table-column prop="bqMc" align="center" label="标签名称" />
<el-table-column prop="bqDm" align="center" label="标签代码" />
<el-table-column prop="bqLb" align="center" label="标签类">
<el-table-column prop="bqZl" align="center" label="标签类">
<template #default="{ row }">
<DictTag
:value="row.bqLb"
:value="row.bqZl"
:tag="false"
:options="props.dic.D_GS_BQ_LB"
:options="props.dic.D_GS_BQ_ZL"
/>
</template>
</el-table-column>
@ -59,13 +60,12 @@
/>
</template>
</el-table-column>
<el-table-column prop="bqMc" align="center" label="标签名称" />
<el-table-column prop="bqZl" align="center" label="标签种类">
<el-table-column prop="bqLb" align="center" label="标签类别">
<template #default="{ row }">
<DictTag
:value="row.bqZl"
:value="row.bqLb"
:tag="false"
:options="props.dic.D_GS_BQ_ZL"
:options="props.dic.D_GS_BQ_LB"
/>
</template>
</el-table-column>
@ -94,13 +94,14 @@
:row-key="keyid"
style="width: 100%"
>
<el-table-column prop="bqMc" align="center" label="标签名称" />
<el-table-column prop="bqDm" align="center" label="标签代码" />
<el-table-column prop="bqLb" align="center" label="标签类">
<el-table-column prop="bqZl" align="center" label="标签类">
<template #default="{ row }">
<DictTag
:value="row.bqLb"
:value="row.bqZl"
:tag="false"
:options="props.dic.D_GS_BQ_LB"
:options="props.dic.D_GS_BQ_ZL"
/>
</template>
</el-table-column>
@ -113,13 +114,12 @@
/>
</template>
</el-table-column>
<el-table-column prop="bqMc" align="center" label="标签名称" />
<el-table-column prop="bqZl" align="center" label="标签种类">
<el-table-column prop="bqLb" align="center" label="标签类别">
<template #default="{ row }">
<DictTag
:value="row.bqZl"
:value="row.bqLb"
:tag="false"
:options="props.dic.D_GS_BQ_ZL"
:options="props.dic.D_GS_BQ_LB"
/>
</template>
</el-table-column>
@ -212,7 +212,6 @@ const multipleUserRef = ref(null);
const emits = defineEmits(["update:modelValue", "chooseDate"]);
const type = ref("标签大类");
onMounted(() => {
tabs.value = props.dic.D_GS_BQ_ZL;
activeTab.value = tabs.value?.[0]?.dm || "01";
handleFilter();
@ -245,7 +244,6 @@ const onComfirm = () => {
};
//数据回显
const setValues = (list) => {
selectedData.value = list.map((item) => {
// 统一id字段处理逻辑
if (item.bqId) {

View File

@ -160,6 +160,40 @@
</template>
</MyTable>
</template>
<template #bqInfo>
<el-divider content-position="left">标签信息</el-divider>
</template>
<!-- 人员标签模型-->
<template #bqList>
<el-button @click="open('01')">选择</el-button>
<div class="boxlist">
<MyTable
:tableData="tableDate.bqList"
:tableColumn="tableDate.tableColumn"
:tableHeight="tableDate.tableHeight"
:key="tableDate.keyCount"
:tableConfiger="tableDate.tableConfiger"
:controlsWidth="tableDate.controlsWidth"
>
<template #bqLb="{ row }">
<DictTag :value="row.bqLb" :tag="false" :options="D_GS_BQ_LB" />
</template>
<template #bqLx="{ row }">
<DictTag :value="row.bqLx" :tag="false" :options="D_GS_BQ_LX" />
</template>
<template #bqZl="{ row }">
<DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
</template>
<!-- 操作 -->
<template #controls="{ row }">
<el-link type="danger" @click="delDictItem(row.bqId)"
>删除</el-link
>
</template>
</MyTable>
</div>
</template>
<!-- 两群采集录入-->
<template #lqxxList>
<el-button @click="openDialog('01')">新增</el-button>
@ -209,6 +243,13 @@
v-model="selectionValue"
>
</selectionList>
<!-- 列表弹窗 -->
<TagSelectorDialog
v-model="choose"
ref="tagDialog"
@chooseDate="handleTagSelect"
:dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
/>
</div>
</template>
@ -221,6 +262,8 @@ import addFormPeo from "./addFormPeo.vue";
import ApprovalInfo from "./approvalInfo.vue";
import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
import * as rule from "@/utils/rules.js";
import TagSelectorDialog from "./TagSelectorDialogPeo.vue";
import {
ref,
defineExpose,
@ -244,7 +287,10 @@ const {
D_BZ_MZ,
D_BZ_XZQHDM,
D_GS_ZDR_BK_ZT,
D_GS_ZDR_CZZT
D_GS_ZDR_CZZT,
D_GS_BQ_ZL,
D_GS_BQ_LB,
D_GS_BQ_LX
} = proxy.$dict(
"D_BZ_SF",
"D_GS_ZDQT_FXDJ",
@ -254,9 +300,13 @@ const {
"D_BZ_MZ",
"D_BZ_XZQHDM",
"D_GS_ZDR_BK_ZT",
"D_GS_ZDR_CZZT"
"D_GS_ZDR_CZZT",
"D_GS_BQ_ZL",
"D_GS_BQ_LB",
"D_GS_BQ_LX"
); //获取字典数据
const dialogTitle = ref("新增信息"); //弹窗标题
const tagDialog = ref();
const roleIds = ref([]); //选择角色
const selectroleId = ref([]); //选择角色
@ -285,7 +335,9 @@ const formData = ref([
{ label: "联系人", prop: "gkMjXm", type: "input" },
{ label: "联系方式", prop: "gkMjLxfs", type: "input" },
{ label: "", prop: "xzRy", type: "slot", width: "100%" },
{ label: "", prop: "spXx", type: "slot", width: "100%" }
{ label: "", prop: "spXx", type: "slot", width: "100%" },
{ label: "", prop: "bqInfo", type: "slot", width: "100%" },
{ label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
]);
//人员信息
const pageData = reactive({
@ -317,6 +369,7 @@ const addFormDiloag = ref();
//两群信息表格,重点人标签表格
const tableDate = reactive({
lqxxList: [], //两群信息表格数据
bqList: [], //标签表格数据
tableConfiger: {
rowHieght: 30,
showSelectType: "null",
@ -336,6 +389,13 @@ const tableDate = reactive({
{ label: "联系人电话", prop: "qzLxdh" },
{ label: "群重要内容", prop: "qZynr" },
{ label: "操作", prop: "controls", showSolt: true }
],
tableColumn: [
{ label: "标签名称", prop: "bqMc" },
{ label: "标签代码", prop: "bqDm" },
{ label: "标签种类", prop: "bqZl", showSolt: true },
{ label: "标签类型", prop: "bqLx", showSolt: true },
{ label: "标签类别", prop: "bqLb", showSolt: true }
]
});
const chooseShow = ref(false); //选择弹窗
@ -362,7 +422,6 @@ const init = async (type, row) => {
await nextTick(); // 等待子组件挂载
title.value = type == "add" ? "新增" : "编辑";
if (row) getDataById(row.id);
console.log(type, row);
if (type === "edit" && row) {
addFormDiloag.value?.setFormData?.(row); // 回显布控信息
approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
@ -372,12 +431,26 @@ const init = async (type, row) => {
approvalInfoRef.value?.resetForm?.();
}
};
const handleTagSelect = (selectedTags) => {
tableDate.bqList = selectedTags.map((item) => ({
bqDm: item.bqDm || "",
bqId: item.bqId || "",
bqLb: item.bqLb || "",
bqLx: item.bqLx || "",
bqMc: item.bqMc || "",
bqZl: item.bqZl || ""
}));
listQuery.value.bqList = tableDate.bqList;
// 每个标签包含: bqDm, bqId, bqLb, bqLx, bqMc, bqZl 属性
};
// 根据id查询详情
const getDataById = (id) => {
qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
listQuery.value = res;
pageData.tableData = res.zdryList;
tableDate.lqxxList = res.lqxxList;
tableDate.bqList = res.bkdxList;
});
};
const handleAddEdit = (type, row) => {
@ -393,6 +466,14 @@ const openDialog = (type) => {
chooseType.value = type;
chooseTitle.value = "请录入两群信息";
};
// 打开弹窗
const open = (type) => {
choose.value = true;
nextTick(() => {
tagDialog.value.setValues(listQuery.value.bqList);
});
};
// 选择数据
const chooseDate = (data) => {
tableDate.lqxxList.push(data);

View File

@ -20,6 +20,21 @@
ref="elform"
:rules="rules"
>
<template #basic>
<el-divider content-position="left">基础管理</el-divider>
</template>
<template #address>
<el-divider content-position="left">地址信息</el-divider>
</template>
<template #jurisdiction>
<el-divider content-position="left">管辖信息</el-divider>
</template>
<template #status>
<el-divider content-position="left">状态信息</el-divider>
</template>
<template #bqInfo>
<el-divider content-position="left">标签信息</el-divider>
</template>
<!-- 人员标签模型-->
<template #bqList>
<el-button @click="openDialog('01')">选择</el-button>
@ -51,12 +66,13 @@
</div>
</template>
<!-- 管辖单位代码 -->
<!-- 管辖单位 -->
<template #gxSsbmdm>
<el-select
v-model="listQuery.gxSsbmdm"
placeholder="请选择管辖单位代码"
placeholder="请选择管辖单位"
style="width: 240px"
@change="handleDeptChange('gxSsbmmc', $event)"
>
<el-option
v-for="item in deptList"
@ -66,12 +82,13 @@
/>
</el-select>
</template>
<!-- 户籍派出所代码 -->
<!-- 户籍派出所 -->
<template #hjdPcsdm>
<el-select
v-model="listQuery.hjdPcsdm"
placeholder="请选择户籍派出所代码"
placeholder="请选择户籍派出所"
style="width: 240px"
@change="handleDeptChange('hjdPcsmc', $event)"
>
<el-option
v-for="item in deptList"
@ -81,12 +98,13 @@
/>
</el-select>
</template>
<!-- 诉求单位代码 -->
<!-- 诉求单位 -->
<template #sqSsbmdm>
<el-select
v-model="listQuery.sqSsbmdm"
placeholder="请选择户籍派出所代码"
placeholder="请选择户籍派出所"
style="width: 240px"
@change="handleDeptChange('sqSsbmmc', $event)"
>
<el-option
v-for="item in deptList"
@ -96,12 +114,13 @@
/>
</el-select>
</template>
<!-- 现住地派出所代码 -->
<!-- 现住地派出所 -->
<template #xzdPcsdm>
<el-select
v-model="listQuery.xzdPcsdm"
placeholder="请选择现住地派出所代码"
placeholder="请选择现住地派出所"
style="width: 240px"
@change="handleDeptChange('xzdPcsmc', $event)"
>
<el-option
v-for="item in deptList"
@ -111,12 +130,13 @@
/>
</el-select>
</template>
<!-- 责任单位代码 -->
<!-- 责任单位 -->
<template #zrSsbmdm>
<el-select
v-model="listQuery.zrSsbmdm"
placeholder="请选择责任单位代码"
placeholder="请选择责任单位"
style="width: 240px"
@change="handleDeptChange('zrSsbmmc', $event)"
>
<el-option
v-for="item in deptList"
@ -196,61 +216,58 @@ const emits = defineEmits([
const tagDialog = ref();
const dialogForm = ref(false); //弹窗
const formData = ref([
{ label: "", prop: "basic", type: "slot", width: "100%" },
{ label: "姓名", prop: "ryXm", type: "input" },
{ label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB },
{ label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
{ label: "身份证号", prop: "rySfzh", type: "input" },
{ label: "户籍地派出所名称", prop: "hjdPcsmc", type: "input" },
{ label: "联系电话", prop: "ryLxdh", type: "input" },
{ label: "出生日期", prop: "ryCsrq", type: "date" },
{ label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
{
label: "户籍地派出所代码",
prop: "hjdPcsdm",
type: "slot"
},
{ label: "管辖单位", prop: "gxSsbmmc", type: "input" },
{
label: "管辖单位代码",
prop: "gxSsbmdm",
type: "slot"
},
{ label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
{ label: "户籍地详址", prop: "hjdXz", type: "input" },
{ label: "人员出生日期", prop: "ryCsrq", type: "date" },
{ label: "人员籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
{ label: "人员联系电话", prop: "ryLxdh", type: "input" },
{ label: "人员民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
{ label: "人员性别", prop: "ryXb", type: "select", options: D_BZ_XB },
{ label: "诉求单位名称", prop: "sqSsbmmc", type: "input" },
{
label: "诉求单位代码",
prop: "sqSsbmdm",
type: "slot"
},
{ label: "现住地派出所名称", prop: "xzdPcsmc", type: "input" },
{
label: "现住地派出所代码",
prop: "xzdPcsdm",
type: "slot"
},
{ label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
{ label: "现住地详址", prop: "xzdXz", type: "input" },
{
label: "重点人处置状态",
prop: "zdrCzzt",
type: "select",
options: D_GS_ZDR_CZZT
},
{ label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
{ label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
{
label: "人员级别",
label: "级别",
prop: "zdrRyjb",
type: "select",
options: D_GS_ZDR_RYJB
},
{
label: "预警等级",
prop: "zdrYjdj",
type: "select",
options: D_GS_ZDR_YJDJ
},
{ label: "", prop: "address", type: "slot", width: "100%" },
{ label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
{ label: "户籍地详址", prop: "hjdXz", type: "input" },
{
label: "户籍地派出所",
prop: "hjdPcsdm",
type: "slot"
},
{ label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
{ label: "现住地详址", prop: "xzdXz", type: "input" },
{
label: "现住地派出所",
prop: "xzdPcsdm",
type: "slot"
},
{ label: "", prop: "jurisdiction", type: "slot", width: "100%" },
{
label: "管辖单位",
prop: "gxSsbmdm",
type: "slot"
},
{
label: "诉求单位",
prop: "sqSsbmdm",
type: "slot"
},
{
label: "责任单位",
prop: "zrSsbmdm",
type: "slot"
},
{ label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
{
label: "涉及警种",
prop: "zdrSjjz",
@ -258,24 +275,23 @@ const formData = ref([
options: D_GS_BK_SSJZ,
multiple: true
},
{
label: "重点人预警等级",
prop: "zdrYjdj",
type: "select",
options: D_GS_ZDR_YJDJ
},
{ label: "管控民警姓名", prop: "gkMjXm", type: "input" },
{ label: "管控民警警号", prop: "gkMjJh", type: "input" },
{ label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
{ label: "责任单位", prop: "zrSsbmmc", type: "input" },
{ label: "", prop: "status", type: "slot", width: "100%" },
{
label: "责任单位代码",
prop: "zrSsbmdm",
type: "slot"
label: "处置状态",
prop: "zdrCzzt",
type: "select",
options: D_GS_ZDR_CZZT
},
{ label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
{ label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
// { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
// { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
{ label: "", prop: "bqInfo", type: "slot", width: "100%" },
{ label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
]);
const listQuery = ref({}); //表单
@ -298,11 +314,11 @@ const tableDate = reactive({
}, //分页
controlsWidth: 90, //操作栏宽度
tableColumn: [
{ label: "标签代码", prop: "bqDm" },
{ label: "标签类别", prop: "bqLb", showSolt: true },
{ label: "标签类型", prop: "bqLx", showSolt: true },
{ label: "标签名称", prop: "bqMc" },
{ label: "标签种类", prop: "bqZl", showSolt: true }
{ label: "标签代码", prop: "bqDm" },
{ label: "标签种类", prop: "bqZl", showSolt: true },
{ label: "标签类型", prop: "bqLx", showSolt: true },
{ label: "标签类别", prop: "bqLb", showSolt: true }
]
});
const chooseType = ref("01"); //选择弹窗类型
@ -378,9 +394,15 @@ const openDialog = (type) => {
tagDialog.value.setValues(listQuery.value.bqList);
});
};
const handleDeptChange = (nameField, selectedValue) => {
// 找到选中的部门
const selectedDept = deptList.value.find(
(item) => item.value.toString() === selectedValue
);
// 更新名称
listQuery.value[nameField] = selectedDept ? selectedDept.label : "";
};
const handleTagSelect = (selectedTags) => {
console.log("已选标签:", selectedTags);
tableDate.bqList = selectedTags.map((item) => ({
bqDm: item.bqDm || "",
bqId: item.bqId || "",

View File

@ -52,7 +52,7 @@
<el-table-column prop="rySfzh" align="center" label="身份证号" />
<el-table-column prop="hjdXz" align="center" label="户籍地详址" />
<el-table-column prop="xzdXz" align="center" label="现居住地详址" />
<el-table-column prop="ryLxdh" align="center" label="人员联系电话" />
<el-table-column prop="ryLxdh" align="center" label="联系电话" />
<el-table-column label="人员民族">
<template #default="scope">
<span style="margin-left: 10px">{{