更新

src/components/ChooseList/ChooseXs/index.vue

@@ -3,7 +3,7 @@
     <div>
       <el-form :model="listQuery" class="mosty-from-wrap" :inline="true">
         <el-form-item label="标签名称">
-          <el-input placeholder="请输入标签名称" v-model="listQuery.bqMc" clearable ></el-input>
+          <el-input placeholder="请输入标签名称" v-model="listQuery.xsMc" clearable ></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="handleFilter">查询</el-button>

src/components/MyComponents/Department/index.vue

@@ -85,8 +85,6 @@ const tableData = ref([]);
 const getSysMenuTree = async () => {
   let params = { ...listQuery.value }
   if(props.isAll) params.parentid = 1;
-  console.log('初始化-----');
-  
   const res = await selectDeptPage(params);
   tableData.value = res;
   depList.value = res

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

@@ -161,7 +161,7 @@ const pageData = reactive({
      { label: "群主昵称", prop: "qzNc" },
      { label: "群主姓名", prop: "qzXm" },
      { label: "群主联系电话", prop: "qzLxdh" },
-     { label: "群重要内容", prop: "qZynr" },
+     { label: "群重要内容", prop: "qzynr" },
   ]
 });
 const disabled = ref(false)

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue

@@ -28,7 +28,7 @@ const formData = ref([
     { label: "群主昵称", prop: "qzNc", type: "input",width:'45%' },
     { label: "群主姓名", prop: "qzXm", type: "input",width:'45%' },
     { label: "群主联系电话", prop: "qzLxdh", type: "input",width:'45%' },
-    { label: "群重要内容", prop: "qZynr", type: "textarea",width:'100%' },
+    { label: "群重要内容", prop: "qzynr", type: "textarea",width:'100%' },
 ])
 const rules = reactive({
     wxqId: [{ required: true, message: "请输入微信群", trigger: "blur" }],

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

@@ -65,13 +65,12 @@
             <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li> 
           </ul>
         </template>
-
         <template #bgxx="{ row }">
           <div class="flex one_text_detail">背景资料：{{ row.qtBjzl }}</div>
           <div class="flex one_text_detail">创建单位：{{ row.xtCjbmmc }}</div>
         </template>
         <template #gkxx="{ row }">
-          <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
+          <div class="flex one_text_detail">管辖单位：{{ row.gxSsdwmc }}</div>
           <div class="flex one_text_detail">列控原因：{{ row.zdrLkyy }}</div>
           <div class="flex one_text_detail">开始时间：{{ row.zdrRkkssj }}</div>
           <div class="flex one_text_detail">截至时间：{{ row.zdrRkjssj }}</div>
@@ -125,7 +124,6 @@ const chooseUserVisible = ref(false); //审批流程
 const roleIds = ref([]); //角色id
 const editFormDiloag = ref();
 const searchBox = ref(); //搜索框
-const autoId = ref();
 const visible = ref(false);
 const visiblefp = ref(false);
 const zxsDilof = ref();

src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue

@@ -107,11 +107,10 @@ const isShow = ref(false)
 const searchConfiger = ref([
   { label: "线索名称", prop: 'xsMc', placeholder: "请输入线索名称", showType: "input" },
   { label: "内容关键字", prop: 'xsNr', placeholder: "请输入语义关键字", showType: "input" },
-  { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select" },
+  { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
-  { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select" },
+  { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
-  { label: "线索状态", prop: 'xszt', placeholder: "请选择线索状态", showType: "select" },
+  { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "date" },
-  { label: "开始时间", prop: 'zxkssj', placeholder: "请选择开始时间", showType: "date" },
+  { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "date" },
-  { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" },
   { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" },
 ]);
 

src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue

@@ -3,88 +3,33 @@
     <div class="head_box">
       <span class="title">人力情报信息搜索任务调度{{ title }} </span>
       <div>
-        <el-button
+        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
-          type="primary"
-          size="small"
-          :loading="loading"
-          @click="submit"
-          >保存</el-button
-        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage
+      <FormMessage :formList="formData" v-model="listQuery" ref="elform" :rules="rules">
-        :formList="formData"
-        v-model="listQuery"
-        ref="elform"
-        :rules="rules"
-      >
         <!-- 线索列表-->
         <template #xsList>
-          <el-button @click="openDialog()">选择</el-button>
+          <el-button @click="chooseVisiblex = true;">选择</el-button>
           <div class="boxlist">
-            <MyTable
+            <MyTable :tableData="listQuery.xsList" :tableColumn="tableDate.tableColumn"
-              :tableData="tableDate.xsList"
+              :tableHeight="tableDate.tableHeight" :key="tableDate.keyCount" :tableConfiger="tableDate.tableConfiger"
-              :tableColumn="tableDate.tableColumn"
+              :controlsWidth="tableDate.controlsWidth" @chooseData="chooseData">
-              :tableHeight="tableDate.tableHeight"
+              <template #qbLy="{ row }">
-              :key="tableDate.keyCount"
+                <DictTag :tag="false" :value="row.qbLy" :options="props.dic.D_GS_XS_LY" />
-              :tableConfiger="tableDate.tableConfiger"
-              :controlsWidth="tableDate.controlsWidth"
-              @chooseData="chooseData"
-            >
-              <template #xsLy="{ row }">
-                <DictTag :tag="false" :value="row.xsLy" :options="D_GS_XS_LY" />
-              </template>
-              <template #xsFxdj="{ row }">
-                <DictTag
-                  :tag="false"
-                  :value="row.xsFxdj"
-                  :options="D_GS_XS_FXDJ"
-                />
-              </template>
-
-              <template #xsQtlx="{ row }">
-                <DictTag
-                  :tag="false"
-                  :value="row.xsQtlx"
-                  :options="D_GS_ZDQT_LB"
-                />
-              </template>
-              <template #xsZtCz="{ row }">
-                <DictTag
-                  :tag="false"
-                  :value="row.xsZtCz"
-                  :options="D_GS_XS_CZZT"
-                />
-              </template>
-              <template #xsZt="{ row }">
-                <DictTag :tag="false" :value="row.xsZt" :options="D_GS_XS_ZT" />
               </template>
               <!-- 操作 -->
               <template #controls="{ row }">
-                <el-link size="small" type="danger" @click="delDictItem(row.id)"
+                <el-link size="small" type="danger" @click="delDictItem(row.id)">删除</el-link>
-                  >删除</el-link
+                <el-link size="small" type="warning" @click="relevancyClue(row)">解除关联</el-link>
-                >
-                <el-link size="small" type="warning" @click="relevancyClue(row)"
-                  >解除关联</el-link
-                >
               </template>
             </MyTable>
           </div>
         </template>
       </FormMessage>
       <!-- 列表弹窗 -->
-      <DialogList
+      <Xslist :Single="false" v-model="chooseVisiblex" @choosed="choosed" :roleIds="roleIdsxs"></Xslist>
-        :Single="false"
-        :roleIds="roleIds"
-        v-if="chooseShow"
-        @chooseDate="chooseDate"
-        :titleValue="chooseTitle"
-        v-model="chooseShow"
-        :bqLx="chooseType"
-        bqDl="02"
-      ></DialogList>
     </div>
   </div>
 </template>
@@ -92,185 +37,113 @@
 <script setup>
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import DialogList from "./dialogList.vue";
+import Xslist from '@/components/ChooseList/ChooseXs/index.vue'
 import MyTable from "@/components/aboutTable/MyTable.vue";
-import * as rule from "@/utils/rules.js";
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance } from "vue";
-import { selectUserDeptPage } from "@/api/user-manage";
-
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
+const roleIdsxs = ref([]); //角色id
+const chooseVisiblex = ref(false);
 const { proxy } = getCurrentInstance();
-const {
-  D_GS_RLQB_RWDD_LX,
-  D_GS_RLQB_RWDD_LY,
-  D_GS_RLQB_RWDD_YZCD,
-  D_GS_XS_FXDJ,
-  D_GS_XS_CZZT,
-  D_GS_XS_ZT,
-  D_GS_XS_LY,
-  D_GS_ZDQT_LB
-} = proxy.$dict(
-  "D_GS_RLQB_RWDD_LX",
-  "D_GS_RLQB_RWDD_LY",
-  "D_GS_RLQB_RWDD_YZCD",
-  "D_GS_XS_FXDJ",
-  "D_GS_XS_CZZT",
-  "D_GS_XS_ZT",
-  "D_GS_XS_LY",
-  "D_GS_ZDQT_LB"
-);
 const tableDate = reactive({
-  xsList: [], //表格数据
-  rykeyCount: 0,
   tableConfiger: {
     rowHieght: 61,
     showSelectType: "checkBox",
     loading: false,
-    size: "small",
     border: true
   },
+  tableHeight:300,
   total: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-  controlsWidth: 220, //操作栏宽度
+  controlsWidth: 120, //操作栏宽度
   tableColumn: [
-    { label: "线索名称", prop: "xsMc", width: "100px" },
+    { label: "线索名称", prop: "xsMc" },
-    { label: "线索编号", prop: "xsBh", width: "100px" },
+    { label: "线索编号", prop: "xsBh"},
-    { label: "线索来源", prop: "xsLy", showSolt: true, width: "100px" },
+    { label: "线索来源", prop: "qbLy", showSolt: true},
-    { label: "风险等级", prop: "xsFxdj", showSolt: true, width: "100px" },
+    { label: "开始时间", prop: "zxkssj"},
-    { label: "开始时间", prop: "startTime", width: "100px" },
+    { label: "结束时间", prop: "zxjssj"},
-    { label: "结束时间", prop: "ryXjd", width: "100px" },
+    { label: "指向地点", prop: "zxdz"},
-    { label: "指向地点", prop: "xsZxdd", width: "100px" },
+    { label: "线索内容", prop: "xsNr",showOverflowTooltip:true },
-    { label: "线索内容", prop: "xsNr", width: "100px" },
+    { label: "处置状态", prop: "czzt", showSolt: true },
-    { label: "群体类型", prop: "xsQtlx", showSolt: true, width: "100px" },
-    { label: "群体名称", prop: "xsQtmc", width: "100px" },
-    { label: "上报单位", prop: "sbDwMc", width: "100px" },
-    { label: "上报时间", prop: "sbSj", width: "100px" },
-    { label: "涉及人数", prop: "xsSjrs", width: "100px" },
-    { label: "处置状态", prop: "xsZtCz", width: "100px", showSolt: true },
-    { label: "状态", prop: "xsZt", width: "100px", showSolt: true }
   ]
 });
 const dialogForm = ref(false); //弹窗
-const chooseTitle = ref(""); //选择弹窗
+
+const rules = reactive({
+  bsDwDm: [{ required: true, message: "请选择报送单位", trigger: "change" }],
+  rwBt: [{ required: true, message: "请输入任务标题", trigger: "blur" }],
+  rwBh: [{ required: true, message: "请输入任务编号", trigger: "blur" }],
+  rwLy: [{ required: true, message: "请选择任务来源", trigger: "change" }],
+  rwSjKs: [{ required: true, message: "请选择反馈开始时间", trigger: "change" }],
+  rwSjFkjz: [{ required: true, message: "请选择反馈截止时间", trigger: "change" }],
+  rwYzcd: [{ required: true, message: "请选择严重程度", trigger: "change" }],
+  rwNr: [{ required: true, message: "请输入任务内容", trigger: "blur" }],
+});
 const formData = ref([
-  { label: "报送单位", prop: "ssbmdm", type: "department" },
+  { label: "所属单位", prop: "ssbmdm",depMc:'ssbmmc', type: "department" },
+  { label: "报送单位", prop: "bsDwDm",depMc:'bsDwMc', type: "department" },
   { label: "任务标题", prop: "rwBt", type: "input" },
-  { label: "任务来源", prop: "rwLy", type: "select", options: D_GS_RLQB_RWDD_LY },
+  { label: "任务编号", prop: "rwBh", type: "input" },
+  { label: "任务类型", prop: "rwLx", type: "select", options: props.dic.D_GS_RLQB_RWDD_LX },
+  { label: "任务来源", prop: "rwLy", type: "select", options: props.dic.D_GS_RLQB_RWDD_LY },
   { label: "反馈开始时间", prop: "rwSjKs", type: "datetime" },
   { label: "反馈截止时间", prop: "rwSjFkjz", type: "datetime" },
-  { label: "严重程度", prop: "rwYzcd", type: "select", options: D_GS_RLQB_RWDD_YZCD},
+  { label: "严重程度", prop: "rwYzcd", type: "select", options: props.dic.D_GS_RLQB_RWDD_YZCD },
   { label: "任务内容", prop: "rwNr", type: "textarea", width: "100%" },
-  { label: "线索列表", prop: "xsList", type: "slot", width: "80%" }
+  { label: "线索列表", prop: "xsList", type: "slot", width: "99%" }
 ]);
 const listQuery = ref({}); //表单
-const roleIds = ref([]); //角色id
-
-const chooseShow = ref(false); //选择弹窗
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
-const deptList = ref([]); //部门列表
-const chooseType = ref("01"); //选择弹窗类型
 
-const rules = reactive({
-  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
-});
-const editpeo = ref();
-onMounted(() => {
-  getdepartmentList();
-});
 // 初始化数据
 const init = (type, row) => {
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : "编辑";
-  if (row) getDataById(row.id);
-};
   // 根据id查询详情
-const getDataById = (id) => {
+  if (row) {
-  qcckGet({}, "/mosty-gsxt/tbGsxtRlqbRwdd/selectVoById/" + id).then((res) => {
+    qcckGet({}, "/mosty-gsxt/tbGsxtRlqbRwdd/selectVoById/" + row.id).then((res) => {
+      res.xsList = res.xsList || [];
       listQuery.value = res;
-    tableDate.xsList = listQuery.value.xsList;
     });
-};
-//解除关联
-const relevancyClue = (row) => {
-  qcckPut({ id: row.id }, "/mosty-gsxt/tbGsxtRlqbRwdd/cancelXsGl/{id}").then(
-    (res) => {
-      tableDate.xsList = tableDate.xsList.filter((item) => item.id !== row.id);
-      listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
-      proxy.$message({ type: "success", message: "解除关联成功" });
   }
-  );
 };
 
-// 获取部门列表
+//解除关联
-const getdepartmentList = () => {
+const relevancyClue = (row) => {
-  selectUserDeptPage().then((res) => {
+  
-    deptList.value = res?.records.map((item) => ({
-      label: item.deptName,
-      value: item.deptId
-    }));
-  });
 };
+
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    data.xsList = tableDate.xsList.map((item) => item.id);
+    let url = title.value == "新增" ? "/mosty-gsxt/tbGsxtRlqbRwdd/save" : "/mosty-gsxt/tbGsxtRlqbRwdd/update";
-    let url =
-      title.value == "新增"
-        ? "/mosty-gsxt/tbGsxtRlqbRwdd/save"
-        : "/mosty-gsxt/tbGsxtRlqbRwdd/update";
     let params = { ...data };
-    qcckPost(params, url)
+    loading.value = true;
-      .then((res) => {
+    params.xsList = params.xsList.map((item) => item.id);
+    qcckPost(params, url).then(() => {
+      loading.value = false;
       proxy.$message({ type: "success", message: title.value + "成功" });
       emit("updateDate");
       close();
+    }).catch(()=>{
+      loading.value = false;
     })
-      .catch(() => {});
   });
 };
 
-// 打开弹窗
+const choosed = (data) => {
-const openDialog = (type) => {
+  listQuery.value.xsList = data;
-  chooseShow.value = true;
+  roleIdsxs.value = data.map(item => item.id);
-  chooseTitle.value = "请选择线索列表";
-  roleIds.value = tableDate.xsList.map((item) => item.id);
-};
-const handleAdd = () => {
-  dialogFormVisible.value = true;
-  dialogTitle.value = "新增信息";
 };
 
-// 接收父组件传入的数据并回显
+
-const setFormData = (data) => {
-  tableDate.xsList = data.xsList ?? [];
-  listQuery.value = {
-    ...data // 假设 data 包含所有需要的字段
-  };
-  tableDate.tableData = data.bkdxList;
-  console.log(listQuery.value);
-};
-// 选择数据
-const chooseDate = (data) => {
-  console.log(data, "选择数据");
-  tableDate.xsList = data;
-  listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
-};
 // 关闭
 const close = () => {
   listQuery.value = {};
@@ -279,19 +152,17 @@ const close = () => {
 };
 // 删除
 const delDictItem = (id) => {
-  tableDate.xsList = tableDate.xsList.filter((item) => item.id !== id);
+  listQuery.value.xsList = listQuery.value.xsList.filter((item) => item.id !== id);
-  listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
 };
-defineExpose({ init, setFormData });
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+
 .boxlist {
   width: 99%;
-  height: 225px;
   margin-top: 10px;
-  overflow: hidden;
 }
 </style>

src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/dialogList.vue

@@ -1,269 +0,0 @@
-<template>
-  <el-dialog
-    :title="titleValue"
-    width="900px"
-    :model-value="modelValue"
-    append-to-body
-    @close="closed"
-  >
-    <div>
-      <el-form :model="listQuery" class="mosty-from-wrap" :inline="true">
-        <el-form-item label="线索名称">
-          <el-input
-            placeholder="请输入线索名称"
-            v-model="listQuery.xsMc"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="success" @click="handleFilter">查询</el-button>
-          <el-button type="info" @click="reset()"> 重置 </el-button>
-        </el-form-item>
-      </el-form>
-      <div
-        class="tabBox"
-        :class="props.Single ? 'tabBoxRadio' : ''"
-        style="margin-top: 0px"
-      >
-        <el-table
-          v-loading="loading"
-          ref="multipleUserRef"
-          @selection-change="handleSelectionChange"
-          :data="tableData"
-          border
-          :row-key="keyid"
-          style="width: 100%"
-          height="450"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            :reserve-selection="true"
-          />
-          <el-table-column prop="xsMc" align="center" label="线索名称" />
-          <el-table-column prop="xsBh" align="center" label="线索编号" />
-          <el-table-column prop="xsLy" align="center" label="线索来源">
-            <template #default="{ row }">
-              <DictTag :value="row.xsLy" :tag="false" :options="D_GS_XS_LY" />
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="xsFxdj" align="center" label="风险等级">
-            <template #default="{ row }">
-              <DictTag
-                :value="row.xsFxdj"
-                :tag="false"
-                :options="D_GS_XS_FXDJ"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column prop="startTime" align="center" label="开始时间" />
-          <el-table-column prop="endTime" align="center" label="结束时间" />
-          <el-table-column prop="xsZxdd" align="center" label="指向地点" />
-          <el-table-column prop="xsNr" align="center" label="线索内容" />
-          <el-table-column prop="xsQtlx" align="center" label="群体类型">
-            <template #default="{ row }">
-              <DictTag
-                :value="row.xsQtlx"
-                :tag="false"
-                :options="D_GS_ZDQT_LB"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column prop="xsQtmc" align="center" label="群体名称" />
-          <el-table-column prop="sbDwMc" align="center" label="上报单位" />
-          <el-table-column prop="sbSj" align="center" label="上报时间" />
-          <el-table-column prop="xsSjrs" align="center" label="涉及人数" />
-          <el-table-column prop="xsZtCz" align="center" label="处置状态">
-            <template #default="{ row }">
-              <DictTag
-                :value="row.xsZtCz"
-                :tag="false"
-                :options="D_GS_XS_CZZT"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column prop="xsZt" align="center" label="状态">
-            <template #default="{ row }">
-              <DictTag :value="row.xsZt" :tag="false" :options="D_GS_XS_ZT" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="fenye" :style="{ top: tableHeight + 'px' }">
-        <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>
-    </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, getCurrentInstance } from "vue";
-import { qcckGet } from "@/api/qcckApi.js";
-const { proxy } = getCurrentInstance();
-const { D_GS_XS_LY, D_GS_XS_FXDJ, D_GS_ZDQT_LB, D_GS_XS_CZZT, D_GS_XS_ZT } =
-  proxy.$dict(
-    "D_GS_XS_LY",
-    "D_GS_XS_FXDJ",
-    "D_GS_ZDQT_LB",
-    "D_GS_XS_CZZT",
-    "D_GS_XS_ZT"
-  ); //获取字典数据
-
-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: true
-  },
-  roleIds: {
-    type: Array,
-    default: []
-  }
-});
-const total = ref(0);
-const listQuery = ref({
-  current: 1,
-  size: 20
-});
-const loading = ref(false);
-const tableData = ref([]);
-const emits = defineEmits(["update:modelValue", "chooseDate"]);
-onMounted(() => {
-  handleFilter();
-});
-const closed = () => {
-  emits("update:modelValue", false);
-};
-const reset = () => {
-  listQuery.value = { current: 1, size: 20 };
-  getDataList();
-};
-
-const keyid = (row) => {
-  return row.id;
-};
-// 为用户分配角色
-const onComfirm = () => {
-  const userList = multipleSelectionUser.value;
-  let list = [];
-  let listId = [];
-  userList.forEach((val) => {
-    if (listId.indexOf(val.id) == -1) {
-      list.push(val);
-      listId.push(val.id);
-    }
-  });
-  emits("chooseDate", list);
-  let data = { type: props.LeaderType, userList: userList };
-  emits("chooseDateLeader", data);
-  closed();
-};
-/**
- * pageSize 改变触发
- */
-const handleSizeChange = (currentSize) => {
-  listQuery.value.size = currentSize;
-  getDataList();
-};
-
-/**
- * 页码改变触发
- */
-const handleCurrentChange = (currentPage) => {
-  listQuery.value.current = currentPage;
-  getDataList();
-};
-
-// 查询线索列表
-const getDataList = () => {
-  const data = listQuery.value;
-  loading.value = true;
-  qcckGet(data, "/mosty-gsxt/tbGsxtXs/selectPage").then((res) => {
-    tableData.value = res?.records;
-    total.value = Number(res.total);
-    loading.value = false;
-    multipleUser();
-  });
-};
-
-//列表回显
-function multipleUser() {
-  tableData.value.forEach((item) => {
-    if (props.roleIds.some((id) => id == item.id)) {
-      multipleUserRef.value.toggleRowSelection(item, true);
-    }
-  });
-}
-
-const handleFilter = () => {
-  listQuery.value.current = 1;
-  getDataList();
-};
-
-const multipleUserRef = ref(null);
-const multipleSelectionUser = ref([]);
-const handleSelectionChange = (val) => {
-  if (props.Single) {
-    if (val.length > 1) {
-      let del_row = val.shift();
-      multipleUserRef.value.toggleRowSelection(del_row, false);
-    }
-    multipleSelectionUser.value = val;
-  } else {
-    multipleSelectionUser.value = val;
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-</style>
-<style>
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-</style>

src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index.vue

@@ -3,116 +3,85 @@
     <div class="titleBox">
       <PageTitle title="人力情报信息搜索任务调度">
         <el-button type="primary" @click="addEdit('add', '')">
-          <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
-        <el-button type="danger" @click="addEdit('add', '')">
-          <el-icon style="vertical-align: middle"><Dete /></el-icon>
-          <span style="vertical-align: middle">批量删除</span>
-        </el-button>
-        <el-button type="primary">
-          <span style="vertical-align: middle">导出</span>
-        </el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
-        :searchArr="searchConfiger"
-        @submit="onSearch"
-        :key="pageData.keyCount"
-      >
         <!-- 所属单位 -->
         <template #ssbmdm>
-          <el-select
+          <el-select v-model="listQuery.ssbmdm" placeholder="请选择所属单位" style="width: 240px">
-            v-model="listQuery.ssbmdm"
+            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()" />
-            placeholder="请选择所属单位"
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
           </el-select>
         </template>
       </Search>
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :tableData="pageData.tableData"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
-        :tableColumn="pageData.tableColumn"
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount"
-        :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
-      >
         <template #rwLy="{ row }">
-          <DictTag
+          <DictTag :tag="false" :value="row.rwLy" :options="D_GS_RLQB_RWDD_LY" />
-            :tag="false"
-            :value="row.rwLy"
-            :options="D_GS_RLQB_RWDD_LY"
-          />
         </template>
         <template #rwYzcd="{ row }">
-          <DictTag
+          <DictTag :tag="false" :value="row.rwYzcd" :options="D_GS_RLQB_RWDD_YZCD" />
-            :tag="false"
-            :value="row.rwYzcd"
-            :options="D_GS_RLQB_RWDD_YZCD"
-          />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" type="success" @click="addEdit('edit', row)"
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
-            >编辑</el-link
-          >
-          <el-link size="small" type="primary" @click="addEdit('info', row)"
-            >详情</el-link
-          >
           <!-- 下发将消息推送至临安码 消息中心 -->
-          <el-link size="small" type="primary" @click="addEdit('info', row)"
+          <el-link size="small" type="primary" @click="addEdit('xf', row)">下发</el-link>
-            >下发</el-link
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
-          >
-          <el-link size="small" type="danger" @click="deleteRow(row)"
-            >删除</el-link
-          >
         </template>
       </MyTable>
-      <Pages
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        @changeNo="changeNo"
-        @changeSize="changeSize"
-        :tableHeight="pageData.tableHeight"
-        :pageConfiger="{
         ...pageData.pageConfiger,
         total: pageData.total
-        }"
+      }"></Pages>
-      ></Pages>
     </div>
     <!-- 新增编辑 -->
-    <DetailForm ref="detailDiloag" @updateDate="getList()" />
+    <DetailForm ref="detailDiloag" v-if="showAdd" :dic="{ D_GS_RLQB_RWDD_LX,D_GS_RLQB_RWDD_LY, D_GS_RLQB_RWDD_YZCD, D_GS_XS_FXDJ, D_GS_XS_CZZT, D_GS_XS_ZT, D_GS_XS_LY, D_GS_ZDQT_LB}" @updateDate="getList" />
   </div>
 </template>
 
 <script setup>
+import { ElMessage } from "element-plus";
 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 DetailForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-import { selectUserDeptPage } from "@/api/user-manage";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_RLQB_RWDD_LY, D_GS_RLQB_RWDD_YZCD, D_GS_RLQB_RWDD_ZT } =
+const { 
-  proxy.$dict("D_GS_RLQB_RWDD_LY", "D_GS_RLQB_RWDD_YZCD", "D_GS_RLQB_RWDD_ZT"); //获取字典数据
+  D_GS_RLQB_RWDD_LY, 
+  D_GS_RLQB_RWDD_YZCD, 
+  D_GS_XS_FXDJ,
+  D_GS_XS_CZZT,
+  D_GS_XS_ZT,
+  D_GS_XS_LY,
+  D_GS_ZDQT_LB,
+  D_GS_RLQB_RWDD_LX
+} =proxy.$dict(
+  "D_GS_RLQB_RWDD_LY", 
+  "D_GS_RLQB_RWDD_YZCD", 
+  "D_GS_XS_FXDJ",
+  "D_GS_XS_CZZT",
+  "D_GS_XS_ZT",
+  "D_GS_XS_LY",
+  "D_GS_ZDQT_LB",
+  "D_GS_RLQB_RWDD_LX"
+); //获取字典数据
 
+const showAdd = ref(false)
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-const deptList = ref([]); //部门列表
-
 const searchConfiger = ref([
   {
     label: "所属单位",
@@ -145,15 +114,14 @@ const searchConfiger = ref([
     placeholder: "请选择严重程度",
     showType: "select",
     options: D_GS_RLQB_RWDD_YZCD
-  },
+  }
 ]);
-
 const pageData = reactive({
   tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox",
+    showSelectType: "null",
     loading: false
   },
   total: 0,
@@ -161,38 +129,22 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 150,
   tableColumn: [
     { label: "任务标题", prop: "rwBt" },
     { label: "任务内容", prop: "rwNr", width: 200 },
     { label: "任务来源", prop: "rwLy", showSolt: true },
     { label: "严重程度", prop: "rwYzcd", showSolt: true },
-    { label: "下发状态", prop: "xfzt" },
+    { label: "下发状态", prop: "xfzt" }
   ]
 });
-
 const queryFrom = ref({});
 
 onMounted(() => {
   getList();
   tabHeightFn();
-  getdepartmentList();
 });
-// 获取部门列表
+
-const getdepartmentList = () => {
-  selectUserDeptPage().then((res) => {
-    deptList.value = res?.records.map((item) => ({
-      label: item.deptName,
-      value: item.deptId
-    }));
-  });
-};
-//选择类型
-const handleType = (val) => {
-  pageData.keyCount++;
-  pageData.pageConfiger.pageCurrent = 1;
-  getList();
-};
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
@@ -210,12 +162,10 @@ const changeSize = (val) => {
 };
 
 // 获取列表
-const getList = (val) => {
+const getList = () => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  let url = "/mosty-gsxt/tbGsxtRlqbRwdd/selectPage";
+  qcckGet(data, "/mosty-gsxt/tbGsxtRlqbRwdd/selectPage").then((res) => {
-  qcckGet(data, url)
-    .then((res) => {
       pageData.tableData = res.records || [];
       pageData.total = res.total;
       pageData.tableConfiger.loading = false;
@@ -225,11 +175,23 @@ const getList = (val) => {
     });
 };
 
-// 详情
+//删除操作
-const addEdit = (type, row) => {
+const deleteRow = (id) => {
-  detailDiloag.value.init(type, row);
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckGet({}, "/mosty-gsxt/tbGsxtRlqbRwdd/cancelXsGl" + id).then((res) => {
+      ElMessage.success("删除成功");
+      getList();
+    });
+  });
 };
 
+// 详情
+const addEdit = (type, row) => {
+  showAdd.value = true;
+  nextTick(()=>{
+    detailDiloag.value.init(type, row);
+  })
+};
 
 // 表格高度计算
 const tabHeightFn = () => {

src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue

@@ -99,8 +99,8 @@ const obj = reactive({
 const searchConfiger = ref([
   { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
   { label: "线索内容", prop: "xsNr", placeholder: "请输入",  showType: "input"},
-  { label: "开始时间", prop: 'zxkssj', placeholder: "请选择开始时间", showType: "date" },
+  { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "datetime" },
-  { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" },
+  { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "datetime" },
 ])
 // 每个列表对应的值
 const list = ref([