更新页面

src/components/DictTag/index.vue

@@ -7,6 +7,7 @@
           :key="item.value"
           :index="index"
           :class="item.elTagType"
+          @click="handleItem(item)"
           >{{ item.label || item.zdmc }}</span>
         <el-tag
           v-else
@@ -14,6 +15,7 @@
           :key="item.value + ''"
           :index="index"
           :type="item.elTagType === 'primary' ? '' : item.elTagType"
+          @click="handleItem(item)"
           :class="item.elTagType"
           >{{ item.label || item.zdmc }}</el-tag
         >
@@ -23,7 +25,7 @@
 </template>
 
 <script setup>
-import { computed } from "vue";
+import { computed,defineEmits } from "vue";
 
 const props = defineProps({
   // 数据
@@ -35,6 +37,8 @@ const props = defineProps({
   value: [Number, String, Array]
 });
 
+const emit = defineEmits(['clickTag'])
+
 const values = computed(() => {
   if (props.value !== null && typeof props.value !== "undefined") {
     return Array.isArray(props.value) ? props.value : [String(props.value)];
@@ -42,6 +46,11 @@ const values = computed(() => {
     return [];
   }
 });
+
+// 处理数据
+const handleItem  = (item) =>{
+  emit('clickTag',item)
+}
 </script>
 
 <style scoped>

src/components/MyComponents/Upload/index.vue

@@ -186,8 +186,6 @@ const headers = ref({
 
 onMounted(() => {
   if (props.modelValue) {
-    console.log(props.modelValue,'==========props.modelValue');
-    console.log(fileList.value,'====键');
     fileList.value = props.modelValue.map((el) => {
       return {
         url: `/mosty-api/mosty-base/minio/image/download/` + el
@@ -202,9 +200,9 @@ const handlerSuccess = (res, file) => {
   fileList.value.push(file);
   props.modelValue.push(res.data);
   emits("handleChange", props.modelValue);
-  // emits("update:modelValue", props.modelValue);
+  emits("update:modelValue", props.modelValue);
 };
-const handlePreview = (file) => {};
+
 const handleExceed = (files, fileList) => {
   ElMessage.warning(`限制，只能上传${props.limit}个文件或图片`);
 };
@@ -245,7 +243,7 @@ const handleRemove = (file) => {
   fileList.value.splice(index, 1);
   props.modelValue.splice(index, 1);
   emits("handleChange", props.modelValue);
-  // emits("update:modelValue", props.modelValue);
+  emits("update:modelValue", props.modelValue);
 };
 </script>
 

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue

@@ -22,7 +22,7 @@
         <template #scfj>
           <div style="width: 100%;padding-left: 50px;">
             <div>上传附件:<span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span> </div>
-            <div><MOSTY.Upload :showBtn="true" :limit="10" v-model="listQuery.tps" /> </div>
+            <div><MOSTY.Upload :showBtn="true" :limit="10" v-model="fjdz" /> </div>
           </div>
         </template>
       </FormMessage>
@@ -52,7 +52,7 @@
       </MyTable>
     </div>
     <!-- 人员 -->
-    <AddPeo ref="showAdd" :dic="props.dic" :title="peoTitle" @change="getPeo"></AddPeo>
+    <AddPeo ref="showAdd" :dic="props.dic" @change="getPeo"></AddPeo>
   </div>
 </template>
 
@@ -85,12 +85,13 @@ const formData = ref([
   { label: "所属专题", prop: "sszt", type: "select",options:props.dic.D_BZ_SSZT},
   { prop: "gapline", type: "slot",width:'100%' },
   { prop: "scfj", type: "slot",width:'100%'},
-  { label: "线索内容", prop: "xs_nr", type: "textarea",width:'100%'},
+  { label: "线索内容", prop: "xsNr", type: "textarea",width:'100%'},
   { label: "群体类型", prop: "qtlx", type: "select",options:props.dic.D_GS_XS_QTLX },
   { label: "群体名称", prop: "qtmc", type: "input"},
   { label: "涉及人数", prop: "sjrs", type: "inputNumber"},
-  { label: "线索报送单位", prop: "xsbsdwdm", type: "department"},
+  { label: "线索报送单位", prop: "ssbmdm", type: "department"},
 ]);
+const fjdz = ref()
 const listQuery = ref({}); //表单
 const loading = ref(false);
 const elform = ref();
@@ -118,19 +119,22 @@ onMounted(()=>{
   tabHeightFn()
 })
 
+
 // 初始化数据
 const init = (type, row) => {
+  fjdz.value = []
   tabHeightFn()
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
   // 初始化表单数据，并根据详情页设置禁用状态
-  // if (row) getDataById(row.id);
+  if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/" + id).then((res) => {
+  qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => {
-  //   listQuery.value = res;
+    listQuery.value = res;
-  // });
+    pageForm.tableData = res.ryList || [];
+  });
 };
 
 // 打开弹窗
@@ -148,6 +152,7 @@ const submit = () => {
   elform.value.submit((data) => {
     let url = title.value == "新增"  ? "/mosty-gsxt/qbcj/add" : "/mosty-gsxt/qbcj/update";
     let params = { ...data ,ryList:pageForm.tableData};
+    params.fjdz = fjdz.value.length > 0 ? fjdz.value.join(','):'';
     loading.value = true;
     qcckPost(params, url).then((res) => {
       loading.value = false;
@@ -162,6 +167,7 @@ const submit = () => {
 
 // 关闭
 const close = () => {
+  fjdz.value = []
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addPeo.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="showDialog" :destroy-on-close="true" :title="props.title" @close="close" :close-on-click-modal="false">
+  <el-dialog v-model="showDialog" :destroy-on-close="true" :title="title+'人员'" @close="close" :close-on-click-modal="false">
     <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
         <template #bqList>
             <div class="marks pointer" @click="chooseMarksVisible = true">
@@ -29,10 +29,6 @@ const props = defineProps({
         type:Object,
         default:{}
     },
-    title:{
-        type:String,
-        default:'新增人员'
-    }
 })
 const chooseMarksVisible = ref(false)
 const roleIds = ref([])
@@ -45,7 +41,7 @@ const formData = ref([
     { label: "性别", prop: "xb", type: "select",options:props.dic.D_BZ_XB ,width:'48%'},
     { label: "身份证号", prop: "sfzh", type: "input" ,width:'48%'},
     { label: "户籍地", prop: "hjdz", type: "input",width:'48%' },
-    { label: "户籍地派出所", prop: "hjdpcs", type: "department" ,width:'48%'},
+    { label: "户籍地派出所", prop: "hjdpcsdm", type: "department" ,width:'48%'},
     { label: "标签", prop: "bqList", type: "slot",width:'100%' },
     { label: "是否挑头人", prop: "sfttr", type: "select",options:props.dic.D_BZ_SF ,width:'48%'},
     { label: "是否响应人", prop: "sfxyr", type: "select" ,options:props.dic.D_BZ_SF,width:'48%' },
@@ -59,10 +55,11 @@ const rules = reactive({
     sfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
     hjd: [{ required: true, message: "请输入户籍地", trigger: "blur" }],
 })
+const title = ref('')
 
 const init = (type,row) =>{
+    title.value = type == 'add' ? '新增' :'编辑';
     showDialog.value = true;
-    elform.value.reset();
     if(row) listQuery.value = {...row};
 }
 

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue

@@ -6,7 +6,7 @@
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">导出</span>
         </el-button>
-        <el-button type="primary" @click="addEdit('add', '')">
+        <el-button type="primary" @click="addEdit('add', null)">
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
@@ -30,22 +30,53 @@
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
-        <template #xlLx="row">
+        <template #xlLx="{row}">
           <DictTag :tag="false" :value="row.xlLx" :options="D_GS_XS_LX" />
         </template>
-        <template #qbLy="row">
+        <template #qbLy="{row}">
           <DictTag :tag="false" :value="row.qbLy" :options="D_GS_XS_LY" />
         </template>
-        <template #shzt="row">
+        <template #czzt="{row}">
-          <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" />
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template>
+        <template #shzt="{row}">
+          <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" @clickTag="clickTag" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</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>
+
+          <el-popover placement="left" :visible="row.visible" :width="400" trigger="click">
+            <template #reference>
+              <el-link size="small" type="primary" @click.stop="handleSh(row)">审核</el-link>
+            </template>
+
+            <div class="flex mb10 align-center">
+              <div class="w70 label-pop">审核状态 :</div>
+              <div style="flex:1">
+                <el-radio-group v-model="chooseRow.shzt" @change="rules.bhyy = false">
+                  <el-radio v-for="obj in D_BZ_XSSHZT" :key="obj.value" :label="obj.value" >{{ obj.zdmc }}</el-radio>
+                </el-radio-group>
+              </div>
+            </div>
+            <div class="flex" v-if=" chooseRow.shzt == '01'">
+              <div class="w70 label-pop">驳回原因 :</div>
+              <div style="flex:1">
+                <MOSTY.Other filterable style="width: 100%;" v-model="chooseRow.bhyy" type="textarea" rows="3" clearable placeholder="请输入审核原因"/>
+                <div class="f12" style="color: red;" v-if="rules.bhyy">请输入驳回原因</div>
+              </div>
+            </div>
+
+            <div class="mt10 flex just-center">
+              <el-button size="small" @click.stop="cancel(row)">取消</el-button>
+              <el-button size="small" type="primary" @click.stop="handleSumbit(row)">确定</el-button>
+            </div>
+          </el-popover>
+
+          <el-link size="small" type="danger" @click="delDictItem(row.id)">删除</el-link>
           <!-- 续报 == 编辑 -->
-          <el-link size="small" type="warning" @click="transferClue(row)">续报</el-link> 
+          <el-link size="small" type="warning" @click="addEdit('edit', row)">续报</el-link> 
         </template>
       </MyTable>
       <Pages
@@ -64,6 +95,7 @@
 </template>
 
 <script setup>
+import * as MOSTY from "@/components/MyComponents/index";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -71,8 +103,9 @@ import Search from "@/components/aboutTable/Search.vue";
 import AddForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { fa } from "element-plus/es/locale.mjs";
 const { proxy } = getCurrentInstance();
-const {D_GS_XS_LY, D_BZ_SSZT,D_BZ_SF,D_GS_XS_LX ,D_GS_XS_QTLX,D_BZ_XB,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_LY","D_BZ_SSZT","D_BZ_SF","D_GS_XS_LX","D_GS_XS_QTLX","D_BZ_XB","D_BZ_XSSHZT"); //获取字典数据
+const {D_GS_XS_CZZT,D_GS_XS_LY, D_BZ_SSZT,D_BZ_SF,D_GS_XS_LX ,D_GS_XS_QTLX,D_BZ_XB,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_CZZT","D_GS_XS_LY","D_BZ_SSZT","D_BZ_SF","D_GS_XS_LX","D_GS_XS_QTLX","D_BZ_XB","D_BZ_XSSHZT"); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const isShow = ref(false)
@@ -86,7 +119,12 @@ const searchConfiger = ref([
   { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" },
   { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" },
 ]);
-
+const elForm = ref()
+const chooseRow = ref({})
+const rules = reactive({
+  bhyy:false,
+  shzt: false,
+})
 const pageData = reactive({
   tableData: [],
   keyCount: 0,
@@ -110,7 +148,7 @@ const pageData = reactive({
     { label: "结束时间", prop: "zxjssj" },
     { label: "指向地点", prop: "zxdz" },
     { label: "线索内容", prop: "xsNr"},
-    { label: "处置状态", prop: "czzt"},
+    { label: "处置状态", prop: "czzt",showSolt: true},
     { label: "附件", prop: "fjdz", showSolt: true },
     { label: "审核状态", prop: "shzt", showSolt: true },
   ]
@@ -123,6 +161,27 @@ onMounted(() => {
   tabHeightFn();
 });
 
+const handleSh = (val) =>{
+  chooseRow.value = {id:val.id,shzt:'01'}
+  val.visible = !val.visible;
+}
+const cancel = (row) =>{
+  row.visible = false;
+  rules.bhyy = false;
+  chooseRow.value = {}
+}
+const handleSumbit = (row) =>{
+  rules.bhyy = !chooseRow.value.bhyy ? true :false;
+  if(chooseRow.value.shzt == '01' && rules.bhyy) return false;
+  let data = { ...chooseRow.value }
+  qcckPost(data,'/mosty-gsxt/qbcj/updateByXssh').then(res=>{
+    row.visible = false;
+    proxy.$message({ type: "success",  message: "审核成功" });
+    getList();
+  })
+}
+
+
 // 搜索
 const onSearch = (val) =>{
   queryFrom.value = {...val}
@@ -150,6 +209,16 @@ const getList = () =>{
   }).catch(()=>{ pageData.tableConfiger.loading = false; })
 }
 
+// 删除
+const delDictItem = (id) =>{
+  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+    qcckPost({},'/mosty-gsxt/qbcj/delete/'+id).then(()=>{
+      proxy.$message({ type: "success",  message: "删除成功" });
+      getList();
+    })
+  }).catch(() => {});
+}
+
 // 详情
 const addEdit = (type, row) => {
   isShow.value = true;
@@ -158,6 +227,10 @@ const addEdit = (type, row) => {
   },500)
 };
 
+const clickTag = (val) =>{
+  console.log(val,'======00');
+}
+
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
@@ -167,6 +240,18 @@ const tabHeightFn = () => {
 };
 </script>
 
+<style lang="scss" scoped>
+.label-pop{
+  position: relative;
+  &::before{
+    position: absolute;
+    content: '*';
+    top: 0;
+    left: -7px;
+    color: red;
+  }
+}
+</style>
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;