跟香港

src/components/aboutTable/FormMessage.vue

@@ -6,6 +6,7 @@
     :rules="props.rules"
     :inline="props.inline"
     label-position="right"
+    :disabled="props.disabled"
   >
     <el-form-item
       v-for="(item,idx) in props.formList"
@@ -63,7 +64,12 @@
       />
       <!-- 部门department -->
       <template v-else-if="item.type === 'department'">
-        <MOSTY.Department style="width: 100%;" clearable v-model="listQuery[item.prop]" />
+        <MOSTY.Department 
+          style="width: 100%;" 
+          clearable 
+          v-model="listQuery[item.prop]"
+          :placeholder="listQuery[item.prop] ? listQuery[item.prop+'mc']:''"
+        />
       </template>
 
       <!-- 上传 upload -->
@@ -165,7 +171,7 @@
 </template>
 <script setup>
 import * as MOSTY from "@/components/MyComponents/index";
-import { ref, defineProps, defineEmits, defineExpose, watch } from "vue";
+import { ref, defineProps, defineEmits, defineExpose, watch, watchEffect } from "vue";
 const props = defineProps({
   //循环的值
   formList: {
@@ -204,24 +210,18 @@ const reset = () =>{
   elform.value.resetFields()
 }
 
-watch(
+watch(() => listQuery.value,(newVal) => {
-  () => listQuery.value,
+  if(newVal) emits("update:modelValue", newVal);
-  (newVal) => {
+},{ immediate: true, deep: true });
-    emits("update:modelValue", newVal);
-  },
-  { immediate: true, deep: true }
-);
 
-watch(
+watch(() => props.modelValue,(newVal) => {
-  () => props.modelValue,
-  (newVal) => {
   // 只有在新值确实变化时才更新（避免空值覆盖）
   if (newVal && Object.keys(newVal).length > 0) {
     listQuery.value = { ...newVal };
   }
-  },
+},{ immediate: true, deep: true });
-  { immediate: true, deep: true }
+
-);
+
 
 defineExpose({ submit,reset });
 </script>

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue

@@ -81,8 +81,7 @@
 
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" v-if="row.qtZt == '01' || row.qtZt == '03' || row.qtZt == '06'"
+          <el-link size="small" v-if="row.qtZt == '01' || row.qtZt == '03' || row.qtZt == '06'" @click="openDetail(row)">送审</el-link>
-            @click="openDetail(row)">送审</el-link>
           <el-link size="small" type="success" @click="addEdit('edit', row)" v-if="row.qtZt !== '05'">编辑</el-link>
           <el-link size="small" type="primary" @click="infoList('info', row)">查看</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue

@@ -1,408 +0,0 @@
-<template>
-  <el-dialog
-    :title="titleValue"
-    width="1500px"
-    :model-value="modelValue"
-    append-to-body
-    @close="closed"
-  >
-    <div class="table_class">
-      <div style="width: 48%">
-        <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
-          <el-tab-pane
-            v-for="tab in tabs"
-            :key="tab.dm"
-            :label="tab.label"
-            :name="tab.dm"
-          >
-            <!-- 添加 v-if 条件 -->
-            <template v-if="activeTab !== '03'">
-              <el-button
-                v-for="(it, idx) in props.dic.D_GS_BQ_LB"
-                :key="idx"
-                :type="type == it.zdmc ? 'success' : ''"
-                @click="chooseListType(it.zdmc)"
-              >
-                <span style="vertical-align: middle">{{ it.zdmc }}</span>
-              </el-button>
-            </template>
-            <el-table
-              v-loading="loading"
-              ref="multipleUserRef"
-              @selection-change="handleSelectionChange"
-              :data="tableData"
-              border
-              :row-key="keyid"
-              :style="{ 'min-height': '450px' }"
-              style="width: 100%"
-            >
-              <el-table-column
-                type="selection"
-                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="bqZl" align="center" label="标签种类">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqZl"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_ZL"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column prop="bqLx" align="center" label="标签类型">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqLx"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_LX"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column prop="bqLb" align="center" label="标签类别">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqLb"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_LB"
-                  />
-                </template>
-              </el-table-column>
-            </el-table>
-            <div class="fenye">
-              <el-pagination
-                class="pagination"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="listQuery.current"
-                :page-sizes="[10, 20, 50, 100]"
-                :page-size="listQuery.size"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"
-              ></el-pagination>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-
-      <div style="width: 48%; margin-top: 32px">
-        <div class="selected-tabBox">
-          <el-table
-            :data="selectedData"
-            border
-            :row-key="keyid"
-            style="width: 100%"
-            :style="{ 'min-height': '450px' }"
-          >
-            <el-table-column prop="bqMc" align="center" label="标签名称" />
-            <el-table-column prop="bqDm" align="center" label="标签代码" />
-            <el-table-column prop="bqZl" align="center" label="标签种类">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqZl"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_ZL"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="bqLx" align="center" label="标签类型">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqLx"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_LX"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="bqLb" align="center" label="标签类别">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqLb"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_LB"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="操作">
-              <template #default="{ row }">
-                <el-button
-                  type="danger"
-                  @click="handleRemoveFromSelectedData(row)"
-                  >移除</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="fenye">
-          <el-pagination
-            class="pagination"
-            @size-change="handleSizeChangeRight"
-            @current-change="handleCurrentChangeRight"
-            :current-page="listQuery.current"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="listQuery.sizeRight"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="selectedData.length"
-          ></el-pagination>
-        </div>
-      </div>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="closed">取消</el-button>
-        <el-button type="primary" @click="onComfirm">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { defineProps, ref, onMounted, nextTick } from "vue";
-import { qcckGet } from "@/api/qcckApi.js";
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  dic: {
-    type: Object,
-    default: () => {}
-  },
-  bqDl: {
-    type: String,
-    default: "01"
-  },
-  bqLx: {
-    type: String,
-    default: "01"
-  },
-  titleValue: {
-    type: String,
-    default: "选择大类"
-  },
-  LeaderType: {
-    type: String,
-    default: ""
-  },
-  // 是否单选
-  Single: {
-    type: Boolean,
-    default: false
-  },
-  roleIds: {
-    type: Array,
-    default: []
-  }
-});
-
-const tabs = ref([]);
-const activeTab = ref("");
-const total = ref(0);
-const listQuery = ref({
-  current: 1,
-  size: 20,
-  bqZl: activeTab.value
-});
-const loading = ref(false);
-const tableData = ref([]);
-const selectedData = ref([]);
-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();
-});
-// 选择列表的大类和细类
-const chooseListType = (val) => {
-  type.value = val;
-  listQuery.current = 1;
-  getDataList();
-};
-const closed = () => {
-  emits("update:modelValue", false);
-};
-
-const reset = () => {
-  listQuery.value = { current: 1, size: 20, bqZl: activeTab.value };
-  getDataList();
-};
-
-const keyid = (row) => {
-  return row.id;
-};
-
-// 为用户分配角色
-const onComfirm = () => {
-  emits("chooseDate", selectedData.value);
-  let data = { type: props.LeaderType, userList: selectedData.value };
-  emits("chooseDateLeader", data);
-  closed();
-};
-//数据回显
-const setValues = (list) => {
-  selectedData.value = list.map((item) => {
-    // 统一id字段处理逻辑
-    if (item.bqId) {
-      return { ...item, id: item.bqId };
-    }
-
-    return item;
-  });
-
-  nextTick(() => {
-    multipleUser();
-  });
-};
-/**
- * pageSize 改变触发
- */
-const handleSizeChange = (currentSize) => {
-  listQuery.value.size = currentSize;
-  getDataList();
-};
-
-/**
- * 页码改变触发
- */
-const handleCurrentChange = (currentPage) => {
-  listQuery.value.current = currentPage;
-  getDataList();
-};
-
-// 查询标签组合列表
-const getDataList = () => {
-  listQuery.value.bqZl = activeTab.value;
-  loading.value = true;
-  //根据顶部标签切换不同的接口
-  let url =
-    activeTab.value == "01"
-      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
-      : activeTab.value == "02"
-      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
-      : "/mosty-gsxt/tbGsxtBqzh/selectPage";
-  let params = {};
-  console.log(activeTab.value, "activeTab.value");
-  if (activeTab.value === "01") {
-    params.bqLx = "01";
-  } else if (activeTab.value === "02") {
-    params.bqLx = "02";
-  } // activeTab.value 等于 "03" 时不传递参数
-  if (type.value === "标签大类") {
-    params.bqLb = "01";
-  } else if (type.value === "标签细类") {
-    params.bqLb = "02";
-  }
-  qcckGet(params, url).then((res) => {
-    // 添加 bqZl 字段
-    tableData.value = res?.records?.map((item) => ({
-      bqDm: item.bqDm,
-      bqId: item.id ? item.id : item.bqId ? item.bqId : row.bqDlId,
-      bqLb: item.bqLb,
-      bqLx: item.bqLx,
-      bqMc: item.bqMc,
-      bqZl: activeTab.value
-    }));
-    total.value = Number(res.total);
-    loading.value = false;
-    //确保在这里调用 multipleUser
-    multipleUser();
-  });
-};
-
-// 修改 multipleUser 函数
-function multipleUser() {
-  nextTick(() => {
-    if (multipleUserRef.value && tableData.value.length > 0) {
-      tableData.value.forEach((item) => {
-        if (selectedData.value.some((selected) => selected.bqId == item.bqId)) {
-          // 因为 multipleUserRef 是数组，需要确定正确的索引
-          // 如果你只有一个表格，可以使用 [0]
-          multipleUserRef.value[0]?.toggleRowSelection(item, true);
-        }
-      });
-    }
-  });
-}
-
-const handleFilter = () => {
-  listQuery.value.current = 1;
-
-  getDataList();
-};
-
-const handleTabClick = () => {
-  reset();
-};
-
-const handleAddToSelectedData = (row) => {
-  console.log(row, selectedData.value, "handleAddToSelectedData row");
-  if (selectedData.value.some((item) => item.bqId === row.bqId)) {
-    return;
-  }
-  if (props.Single && selectedData.value.length > 0) {
-    selectedData.value = [];
-  }
-  selectedData.value.push({
-    bqDm: row.bqDm,
-    bqId: row.id ? row.id : row.bqId ? row.bqId : row.bqDlId,
-    bqLb: row.bqLb,
-    bqLx: row.bqLx,
-    bqMc: row.bqMc,
-    bqZl: activeTab.value
-  });
-};
-
-const handleRemoveFromSelectedData = (row) => {
-  const index = selectedData.value.findIndex((item) => item.bqId === row.bqId);
-  if (index !== -1) {
-    selectedData.value.splice(index, 1);
-  }
-  // 取消左侧表格中对应行的选中状态
-  multipleUserRef.value.toggleRowSelection(row, false);
-};
-
-const multipleSelectionUser = ref([]);
-const handleSelectionChange = (val) => {
-  multipleSelectionUser.value = val;
-  multipleSelectionUser.value.forEach((row) => {
-    handleAddToSelectedData(row);
-  });
-};
-// 必须暴露方法父组件才能调用
-defineExpose({
-  setValues
-});
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-
-.selected-tabBox {
-  margin-top: 56px;
-}
-</style>
-
-<style>
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-:deep(.el-dialog) {
-  background: #fff !important;
-  border-radius: 8px !important;
-  /* 其他样式 */
-}
-.table_class {
-  display: flex;
-  justify-content: space-between;
-}
-</style>

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue

@@ -8,30 +8,12 @@
       </div>
     </div>
     <div class="form_cnt" >
-      <FormMessage v-model="listQuery"  :formList="formData" ref="elform" :rules="rules">
+      <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" labelWidth="100px" ref="elform" :rules="rules"></FormMessage>
-        <template #basic>
+      <div><span class="mr10">人员标签模型 : </span><el-button type="primary" @click="chooseMarksVisible = true">选择</el-button></div>
-          <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>
       <div class="boxlist">
         <MyTable
-              :tableData="tableDate.bqList"
+          :tableData="listQuery.bqList"
           :tableColumn="tableDate.tableColumn"
-              :tableHeight="tableDate.tableHeight"
           :key="tableDate.keyCount"
           :tableConfiger="tableDate.tableConfiger"
           :controlsWidth="tableDate.controlsWidth">
@@ -44,68 +26,46 @@
           <template #bqZl="{ row }">
             <DictTag :value="row.bqZl" :tag="false" :options="props.dic.D_GS_BQ_ZL" />
           </template>
-              <!-- 操作 -->
           <template #controls="{ row }">
             <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
           </template>
         </MyTable>
       </div>
-        </template>
-
-        <!-- 管辖单位 -->
-        <template #gxSsbmdm>
-          <el-select v-model="listQuery.gxSsbmdm" placeholder="请选择管辖单位" style="width: 240px" @change="handleDeptChange('gxSsbmmc', $event)" >
-            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
-          </el-select>
-        </template>
-        <!-- 户籍派出所 -->
-        <template #hjdPcsdm>
-          <el-select v-model="listQuery.hjdPcsdm" placeholder="请选择户籍派出所" style="width: 240px" @change="handleDeptChange('hjdPcsmc', $event)">
-            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
-          </el-select>
-        </template>
-        <!-- 诉求单位 -->
-        <template #sqSsbmdm>
-          <el-select v-model="listQuery.sqSsbmdm" placeholder="请选择户籍派出所" style="width: 240px" @change="handleDeptChange('sqSsbmmc', $event)" >
-            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
-          </el-select>
-        </template>
-        <!-- 现住地派出所 -->
-        <template #xzdPcsdm>
-          <el-select v-model="listQuery.xzdPcsdm" placeholder="请选择现住地派出所" style="width: 240px" @change="handleDeptChange('xzdPcsmc', $event)">
-            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
-          </el-select>
-        </template>
-        <!-- 责任单位 -->
-        <template #zrSsbmdm>
-          <el-select v-model="listQuery.zrSsbmdm" placeholder="请选择责任单位" style="width: 240px" @change="handleDeptChange('zrSsbmmc', $event)">
-            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
-          </el-select>
-        </template>
-      </FormMessage>
-      <!-- 列表弹窗 -->
-      <TagSelectorDialog v-model="chooseShow" ref="tagDialog" @chooseDate="handleTagSelect" :dic="props.dic"/>
     </div>
   </div>
+  <ChooseMarks v-model="chooseMarksVisible" @choosed="choosed" :roleIds="roleIds" />
 </template>
 
 <script setup>
+import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import TagSelectorDialog from "./TagSelectorDialog.vue";
+import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick, watch } from "vue";
-import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
-import { selectUserDeptPage } from "@/api/user-manage";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
 const { proxy } = getCurrentInstance();
-const tagDialog = ref();
+const roleIds = ref([])
-
+const chooseMarksVisible = ref(false)
 const dialogForm = ref(false); //弹窗
-const formData = ref([
+const pcsList = ref([])
-  { label: "", prop: "basic", type: "slot", width: "100%" },
+const rules = reactive({
+  ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+  rySfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
+  ryLxdh: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+  ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+  ryMz: [{ required: true, message: "请选择民族", trigger: "change" }],
+  ryCsrq: [{ required: true, message: "请选择出生日期", trigger: "change" }],
+  ryJg: [{ required: true, message: "请选择籍贯", trigger: "change" }],
+  zdrRyjb: [{ required: true, message: "请选择人员级别", trigger: "change" }],
+  zdrYjdj: [{ required: true, message: "请选择预警等级", trigger: "change" }],
+});
+const listQuery = ref({}); //表单
+const formData = ref([])
+watch(()=>props.dic,val=> {
+  formData.value = [
   { label: "姓名", prop: "ryXm", type: "input" },
   { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB },
   { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ },
@@ -113,50 +73,36 @@ const formData = ref([
   { label: "联系电话", prop: "ryLxdh", type: "input" },
   { label: "出生日期", prop: "ryCsrq", type: "date" },
   { label: "籍贯", prop: "ryJg", type: "select", options: props.dic.D_BZ_XZQHDM },
-  { label: "级别", prop: "zdrRyjb", type: "select", options: props.dic.D_GS_ZDR_RYJB },
+  { label: "人员级别", prop: "zdrRyjb", type: "select", options: props.dic.D_GS_ZDR_RYJB },
   { label: "预警等级", prop: "zdrYjdj", type: "select", options: props.dic.D_GS_ZDR_YJDJ },
-  { label: "", prop: "address", type: "slot", width: "100%" },
   { label: "户籍地区划", prop: "hjdQh", type: "select", options: props.dic.D_BZ_XZQHDM },
   { label: "户籍地详址", prop: "hjdXz", type: "input" },
-  { label: "户籍地派出所", prop: "hjdPcsdm", type: "slot" },
+  { label: "户籍地派出所", prop: "hjdPcsdm", type: "select",options:pcsList },
   { label: "现住地区划", prop: "xzdQh", type: "select", options: props.dic.D_BZ_XZQHDM },
   { label: "现住地详址", prop: "xzdXz", type: "input" },
-  { label: "现住地派出所", prop: "xzdPcsdm", type: "slot"  },
+  { label: "现住地派出所", prop: "xzdPcsdm", type: "select",options:pcsList  },
-  { label: "", prop: "jurisdiction", type: "slot", width: "100%" },
+  { label: "管辖单位", prop: "gxSsbmdm", type: "department"  },
-  { label: "管辖单位", prop: "gxSsbmdm", type: "slot"  },
+  { label: "诉求单位", prop: "sqSsbmdm", type: "department" },
-  { label: "诉求单位", prop: "sqSsbmdm", type: "slot" },
+  { label: "责任单位", prop: "zrSsbmdm", type: "department" },
-  { label: "责任单位", prop: "zrSsbmdm", type: "slot" },
   { label: "所属警种", prop: "zdrSsjz", type: "select", options: props.dic.D_GS_BK_SSJZ },
   { label: "涉及警种", prop: "zdrSjjz", type: "select", options: props.dic.D_GS_BK_SSJZ, multiple: true },
   { label: "管控民警姓名", prop: "gkMjXm", type: "input" },
   { label: "管控民警警号", prop: "gkMjJh", type: "input" },
   { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
-  { label: "", prop: "status", type: "slot", width: "100%" },
   { label: "处置状态", prop: "zdrCzzt", type: "select", options: props.dic.D_GS_ZDR_CZZT },
   { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
   { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
-  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
+]
-  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
+},{immediate:true,deep:true})
-]);
+
-const listQuery = ref({}); //表单
-const deptList = ref([]); //部门列表
-const chooseShow = ref(false); //选择弹窗
 const tableDate = reactive({
-  bqList: [], //表格数据
-  keyCount: 0,
-  rykeyCount: 0,
   tableConfiger: {
     rowHieght: 61,
     showSelectType: "null",
     loading: false
   },
-  total: 0,
-  tableHeight: 225,
-  pageConfiger: {
-    pageSize: 20,
-    pageCurrent: 1
-  }, //分页
   controlsWidth: 90, //操作栏宽度
+  keyCount:0,
   tableColumn: [
     { label: "标签名称", prop: "bqMc" },
     { label: "标签代码", prop: "bqDm" },
@@ -168,16 +114,27 @@ const tableDate = reactive({
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
-const rules = reactive({
+const showInfo = ref(false)
-  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
+const disabled = ref(false)
-});
+
 onMounted(() => {
-  getdepartmentList();
+  chooseDep()
 });
+
+const chooseDep = () =>{
+  qcckPost({orgLevel:40}, "/mosty-base/deptFeign/queryListByDept").then((res) => {
+    pcsList.value = res.map(item => {
+      return { zdmc:item.orgName, dm:item.orgCode, value:item.orgCode }
+    });
+  });
+}
+
 // 初始化数据
 const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
+  title.value = type == "add" ? "新增" : type == "detail" ? "详情" : "编辑";
+  disabled.value = type == "detail" ? true : false
+  setTimeout(()=>{ showInfo.value = true; },5)
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
@@ -188,81 +145,56 @@ const getDataById = (id) => {
     tableDate.bqList = res.bqList;
   });
 };
-// 获取部门列表
+
-const getdepartmentList = () => {
+// 选择标签
-  selectUserDeptPage().then((res) => {
+const choosed = (val) => {
-    deptList.value = res?.records.map((item) => ({
+  console.log(val);
-      label: item.deptName,
+  
-      value: item.deptId
+    listQuery.value.bqList = val.map(v=>{
-    }));
+      return { bqZl:v.bqLb , bqId:v.id, bqLx:v.bqLx, bqLb:v.bqLb, bqMc:v.bqMc, bqDm:v.bqDm }
     });
-};
+    roleIds.value = val.map(v=>v.id)
+}
+
+// 删除
+const delDictItem = (bqId) =>{
+  listQuery.value.bqList = listQuery.value.bqList.filter(v=> v.bqId != bqId);
+  tableDate.keyCount++
+}
+
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
     data.zdrSjjz = data.zdrSjjz.join(",");
     let url = title.value == "新增" ? "/mosty-gsxt/tbGsxtZdry/save" : "/mosty-gsxt/tbGsxtZdry/update";
     let params = { ...data };
-    qcckPost(params, url).then((res) => {
+    if(params.hjdPcsdm) {
+      let obj = pcsList.value.find(v=>v.dm == params.hjdPcsdm)
+      params.hjdPcsmc = obj ? obj.zdmc : ''
+    }
+    if(params.xzdPcsdm) {
+      let obj1 = pcsList.value.map(v=>v.dm == params.xzdPcsdm)
+      params.xzdPcsmc = obj1 ? obj1.zdmc : ''
+    }
+    loading.value = true;
+    qcckPost(params, url).then(() => {
+      loading.value = false;
       proxy.$message({ type: "success", message: title.value + "成功" });
-      emit("onSearch");
+      emit("updateDate");
       close();
-    }).catch(() => {});
+    }).catch(() => {loading.value = false;});
-  });
-};
-// 打开弹窗
-const openDialog = (type) => {
-  chooseShow.value = true;
-  nextTick(() => {
-    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) => {
-  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 属性
-};
 
-// 接收父组件传入的数据并回显
-const setFormData = (data) => {
-  tableDate.bqList = data.bqList ?? [];
-  listQuery.value = {
-    ...data // 假设 data 包含所有需要的字段
-  };
-};
 // 关闭
 const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
 };
-// 删除
+
-const delDictItem = (bqId) => {
+defineExpose({ init });
-  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
-  listQuery.value.bqList = tableDate.bqList;
-};
-// 2. 暴露获取数据的方法
-const getFormData = () => {
-  // 可以在这里添加验证逻辑
-  return {
-    formData: listQuery.value
-  };
-};
-defineExpose({ init, setFormData });
 </script>
 
 <style lang="scss" scoped>
@@ -276,7 +208,6 @@ defineExpose({ init, setFormData });
 
 .boxlist {
   width: 99%;
-  height: 225px;
   margin-top: 10px;
   overflow: hidden;
 }

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue

@@ -70,7 +70,7 @@
         <template #gxdw="{ row }">
           <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
           <div class="flex">人员级别：<DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB"/> </div>
-          <div class="flex one_text_detail">管控原因：{{ zdrLkyy }}</div>
+          <div class="flex one_text_detail">管控原因：{{ row.zdrLkyy }}</div>
           <div class="flex">管控状态：<DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" /></div>
         </template>
         <template #zdrCzzt="{ row }">
@@ -84,7 +84,7 @@
         <template #controls="{ row }">
           <!-- 送审后数据到审批中 -->
            <el-link size="small" type="success" >送审</el-link>
-          <el-link size="small" type="success" @click="addEdit('edit', row)" >编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('edit', row)" >编辑</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
         </template>
       </MyTable>
@@ -99,7 +99,7 @@
       ></Pages>
     </div>
     <!-- 详情 -->
-    <AddForm ref="addFormDiloag" v-if="show" :dic="{D_GS_ZDR_RYJB,D_BZ_XB,D_BZ_MZ,D_BZ_XZQHDM,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_BQ_ZL,D_GS_BQ_LB,D_GS_BQ_LX,D_GS_ZDR_YJDJ,D_GS_BK_SSJZ}"/>
+    <AddForm ref="addFormDiloag" @updateDate="getList" :dic="{D_GS_ZDR_RYJB,D_BZ_XB,D_BZ_MZ,D_BZ_XZQHDM,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_BQ_ZL,D_GS_BQ_LB,D_GS_BQ_LX,D_GS_ZDR_YJDJ,D_GS_BK_SSJZ}"/>
     <!-- 选择用户 -->
     <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds"/>
     <!-- 转线索 -->
@@ -179,7 +179,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 150,
   tableColumn: [
     { label: "重点人员信息", prop: "ryxx", showSolt: true,width:300,showOverflowTooltip:true },
     { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },

src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue

@@ -1,15 +1,303 @@
 <template>
-  <div>审核人重点人审批 : </div>
+  <div>
-  <div>操作栏：先审批（选择审核部门）提交：</div>
+    <div class="titleBox">
-  <div>提交审批后才能审核</div>
+      <PageTitle title="重点人审批">
+        <el-popover placement="bottom" :visible="visible" :width="400" trigger="click">
+          <template #reference>
+            <el-button type="primary" @click="(visible = !visible), (visiblefp = false)" size="small">布控申请</el-button>
+          </template>
+          <div class="flex just-center">
+            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)" >{{ it.zdmc }}</el-button>
+          </div>
+        </el-popover>
+
+        <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
+          <template #reference>
+            <el-button size="small" type="primary" @click="(visiblefp = !visiblefp), (visible = false)" >指定分配</el-button>
+          </template>
+          <div>
+            <el-input readonly v-model="obj.fpmc" @click="chooseUserVisible = true" placeholder="请选择民警"></el-input>
+            <div class="flex just-center mt10">
+              <el-button @click="(visiblefp = false), (obj = {})" size="small">取消</el-button>
+              <el-button type="primary" @click="handlefp" size="small">分配</el-button>
+            </div>
+          </div>
+        </el-popover>
+        <el-button size="small" type="primary" @click="handleZxs">转线索</el-button>
+        <el-button size="small" type="primary" @click="handleMove">移交管控</el-button>
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable
+        :tableData="pageData.tableData"
+        :tableColumn="pageData.tableColumn"
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount"
+        :tableConfiger="pageData.tableConfiger"
+        :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData"
+      >
+        <template #ryxx="{ row }">
+          <div class="flex">
+            <img src="" alt="" style="width: 80px;height: 90px;" />
+            <ul class="tl ml10" style="flex:1 0 0">
+              <li class="one_text_detail">姓名：{{ row.ryXm }}</li>
+              <li class="flex one_text_detail">性别：<DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" /></li>
+              <li class="flex one_text_detail">籍贯：<DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM"/></li>
+              <li class="one_text_detail">身份证：{{ row.rySfzh }}</li>
+              <li class="one_text_detail">出生日期：{{ row.ryCsrq }}</li>
+              <li class="flex one_text_detail">民族：<DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" /></li>
+            </ul>
+          </div>
+          <div class="ww100 one_text_detail">
+            <el-button :key="index" type="primary" size="small" v-for="(item, index) in row.bqList">{{ item.bqMc }}</el-button>
+          </div>
+        </template>
+        <template #jzxx="{ row }">
+          <div class="flex one_text_detail">户籍地区划：<DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" /></div>
+          <div class="flex one_text_detail">户籍派出所：{{ row.hjdPcsmc }}</div>
+          <div class="flex one_text_detail">户籍地详址：{{ row.hjdXz }}</div>
+        </template>
+        <template #gxdw="{ row }">
+          <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
+          <div class="flex">人员级别：<DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB"/> </div>
+          <div class="flex one_text_detail">管控原因：{{ row.zdrLkyy }}</div>
+          <div class="flex">管控状态：<DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" /></div>
+        </template>
+        <template #zdrCzzt="{ row }">
+          <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
+        </template>
+        <template #xtSjzt="{ row }">
+          <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
         </template>
 
-<script>
+        <!-- 操作 -->
-export default {
+        <template #controls="{ row }">
+          <!-- 送审后数据到审批中 -->
+           <el-link size="small" type="success" >审核</el-link>
+           <el-link size="small" type="success" >审批</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)" >详情</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages
+        @changeNo="changeNo"
+        @changeSize="changeSize"
+        :tableHeight="pageData.tableHeight"
+        :pageConfiger="{
+          ...pageData.pageConfiger,
+          total: pageData.total
+        }"
+      ></Pages>
+    </div>
+    <!-- 详情 -->
+    <AddForm ref="addFormDiloag" @updateDate="getList" :dic="{D_GS_ZDR_RYJB,D_BZ_XB,D_BZ_MZ,D_BZ_XZQHDM,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_BQ_ZL,D_GS_BQ_LB,D_GS_BQ_LX,D_GS_ZDR_YJDJ,D_GS_BK_SSJZ}"/>
+    <!-- 选择用户 -->
+    <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds"/>
+    <!-- 转线索 -->
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{D_BZ_SF,D_BZ_XB,D_GS_XS_LY,D_BZ_SSZT,D_GS_XS_LX,D_GS_XS_QTLX }"></ZxsForm>
+  </div>
+</template>
 
-}
+<script setup>
+import { ElMessage } from "element-plus";
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
+import ZxsForm from "../mpvPeo/components/zxsForm.vue";
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import AddForm from "../mpvPeo/components/addForm.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+const { proxy } = getCurrentInstance();
+const { D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
+const obj = ref({});
+const showzxs = ref(false);
+const zxsDilof = ref();
+const show = ref(false);
+const addFormDiloag = ref();
+const searchBox = ref(); //搜索框
+const chooseUserVisible = ref(false); //审批流程
+const ids = ref([]);
+const choosList = ref([]);
+const visible = ref(false);
+const visiblefp = ref(false);
+const searchConfiger = ref([
+  {
+    label: "姓名",
+    prop: "ryXm",
+    placeholder: "请输入姓名",
+    showType: "input"
+  },
+  {
+    label: "身份证",
+    prop: "rySfzh",
+    placeholder: "请输入身份证",
+    showType: "input"
+  },
+  {
+    label: "户籍地",
+    prop: "hjdXz",
+    placeholder: "请输入户籍地",
+    showType: "input"
+  },
+  {
+    label: "人员级别",
+    prop: "zdrRyjb",
+    placeholder: "请输入人员级别",
+    showType: "select",
+    options: D_GS_ZDR_RYJB
+  },
+  {
+    label: "人员级别",
+    prop: "zdrRyjb",
+    placeholder: "请输入人员级别",
+    showType: "select",
+    options: D_GS_ZDR_RYJB
+  },
+]);
+const queryFrom = ref({});
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 200,
+  tableColumn: [
+    { label: "重点人员信息", prop: "ryxx", showSolt: true,width:300,showOverflowTooltip:true },
+    { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
+    { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
+    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
+    { label: "状态", prop: "xtSjzt", showSolt: true }
+  ]
+});
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageNum = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+};
+
+
+const chooseData = (data) => {
+  ids.value = Array.isArray(data) ? data.map((item) => item.id) : [];
+  choosList.value = Array.isArray(data) ? data : [];
+};
+// 选择申请数据数据
+const handleApplication = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点人");
+  qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdry/addBksq").then(() => {
+    ElMessage.success("申请成功");
+    visible.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("布控申请失败");
+  });
+};
+
+const handleUserSelected = (val) => {
+  obj.value.fpmc = val[0].userName;
+  obj.value.fpid = val[0].id;
+};
+
+// 处理分配
+const handlefp = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点人");
+  qcckPost({ ids: ids.value, uid: obj.value.fpid },"/mosty-gsxt/tbGsxtZdry/addGkmj").then(() => {
+    ElMessage.success("分配成功");
+    visible.value = false;
+    visiblefp.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("分配失败");
+  });
+};
+
+// 移交管控
+const handleMove = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要移交管控的重点群体");
+  proxy.$confirm("是否确定移交？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdry/addSfyj").then(() => {
+      ElMessage.success("移交管控成功");
+      getList();
+    }).catch(() => {
+      ElMessage.error("移交管控失败");
+    });
+  });
+};
+
+// 转线索
+const handleZxs = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要转线索的重点群体");
+  showzxs.value = true;
+  nextTick(() => {
+    zxsDilof.value.init(choosList.value);
+  });
+};
+
+
+//新增编辑
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(()=>{
+    addFormDiloag.value.init(type, row);
+  })
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
 </script>
 
 <style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
 
 </style>