添加明细表

src/views/dataStatistics/components/detailedTable1.vue

@@ -273,8 +273,7 @@ const clearSearch = () => {
 const getList = () => {
   const data = {
     dmUpcode0List: props.payload,
-    ...searchList.value,
-    isMaintenance: true
+    ...searchList.value
   };
   tableLoading.value = true;
   getDetailList(data).then((res: any) => {

src/views/dataStatistics/warning/detail.vue

@@ -2,44 +2,6 @@
   <basic-container>
     <el-form class="whole_form">
       <el-row :gutter="20">
-        <el-col :span="6" v-if="userInfo.deptType === '1'">
-          <el-form-item label="省份">
-            <el-select v-model="searchList.provinceSiteIdList" filterable clearable multiple>
-              <el-option v-for="item in provinceList" :key="item.id" :label="item.name" :value="item.code" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="userInfo.deptType === '1'">
-          <el-form-item label="储备仓库">
-            <el-select
-              multiple
-              filterable
-              clearable
-              v-model="searchList.warehouseDeptId"
-              :disabled="!searchList.gameDeptId"
-              :placeholder="!searchList.gameDeptId ? '请先选择垂管局' : '请选择储备仓库'"
-            >
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.deptId"
-                :label="item.abbreviationName"
-                :value="item.deptId"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="userInfo.deptType === '2'">
-          <el-form-item label="储备仓库">
-            <el-select v-model="searchList.warehouseDeptId" multiple clearable placeholder="请选择储备仓库">
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.deptId"
-                :label="item.abbreviationName"
-                :value="item.deptId"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="物资名称">
             <el-input v-model="searchList.dmUpname2" clearable />
@@ -240,28 +202,30 @@ const { Storage_state } = useDict("Storage_state");
 const tableData: any = ref([]);
 const tableLoading = ref(false);
 const searchList: any = ref({
-  gameDeptId: [],
-  warehouseDeptId: [],
-  dmUpname2: "",
-  provinceSiteIdList: []
+  dmUpname2: ""
 });
 const mergeObj: any = ref({});
 const cityList: any = ref([]);
 const warehouseList: any = ref([]);
 const suppliesList: any = ref([]);
 const provinceList: any = ref([]);
-
+import { getQuery } from "@/hooks/detailQuery/index";
 const { userInfo } = useGetters(["userInfo"]);
-const props = defineProps({
-  payload: {
-    type: Array,
-    default: () => []
-  },
-  fileName: {
-    type: String,
-    default: ""
-  }
-});
+const props = getQuery("/dataStatistics/WarningDetail");
+// const props = defineProps({
+//   payload: {
+//     type: Array,
+//     default: () => []
+//   },
+//   fileName: {
+//     type: String,
+//     default: ""
+//   },
+//   deptId: {
+//     type: String,
+//     default: ""
+//   }
+// });
 
 if (userInfo.value.deptType === "1") {
   // 获取垂管局列表
@@ -277,7 +241,7 @@ if (userInfo.value.deptType === "1") {
   // 获取储备仓库
   let postData = {
     parentIdList: [userInfo.value.deptId],
-    warehouseType: props.fileName.substr(0, 2) == "救灾" ? 200 : 100
+    warehouseType: props.dmUpcode0List
   };
   getCityList(postData).then((res: any) => {
     if (res.code === 0) {
@@ -293,7 +257,7 @@ if (userInfo.value.deptType === "1") {
 const getSupplies = (value: string) => {
   let postData = {
     parentIdList: value,
-    warehouseType: props.fileName.substr(0, 2) == "救灾" ? 200 : 100
+    warehouseType: props.dmUpcode0List
   };
   getCityList(postData).then((res: any) => {
     if (res.code === 0) {
@@ -302,34 +266,21 @@ const getSupplies = (value: string) => {
   });
 };
 
-// 获取物资类别
-getSysTreeDict({ type: 1, difference: 2, parentCodeList: props.payload }).then((res: any) => {
-  if (res.code === 0) {
-    suppliesList.value = res.data;
-  }
-});
-// 获取省份
-getSysTreeDict({ type: 2, difference: 1 }).then((res: any) => {
-  if (res.code === 0) {
-    provinceList.value = res.data;
-  }
-});
-
 const clearSearch = () => {
   searchList.value = {
-    gameDeptId: [],
-    warehouseDeptId: [],
-    dmUpname2: "",
-    provinceSiteIdList: []
+    dmUpname2: ""
   };
   getList();
 };
 
 // 获取表格数据
 const getList = () => {
+  console.log(props.deptId, "props.deptId");
   const data = {
-    dmUpcode0List: props.payload,
-    ...searchList.value
+    dmUpcode0List: props.dmUpcode0List,
+    ...searchList.value,
+    isDetails: true,
+    deptId: props.deptId
   };
   tableLoading.value = true;
   getDetaWarninglList(data).then((res: any) => {
@@ -341,17 +292,24 @@ const getList = () => {
 };
 
 const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
-  if (columnIndex === 1) {
-    if (rowIndex % 2 === 0) {
-      return {
-        rowspan: 2,
-        colspan: 1
-      };
+  if (columnIndex === 1 || columnIndex === 2) {
+    const currentValue = row[column.property];
+    const preRow = tableData.value[rowIndex - 1];
+    const preValue = preRow ? preRow[column.property] : null;
+    if (currentValue === preValue) {
+      return { rowspan: 0, colspan: 0 };
     } else {
-      return {
-        rowspan: 0,
-        colspan: 0
-      };
+      let rowspan = 1;
+      for (let i = rowIndex + 1; i < tableData.value.length; i++) {
+        const nextRow = tableData.value[i];
+        const nextValue = nextRow[column.property];
+        if (nextValue === currentValue) {
+          rowspan++;
+        } else {
+          break;
+        }
+      }
+      return { rowspan, colspan: 1 };
     }
   }
 };

src/views/dataStatistics/warning/detailedTable.vue

@@ -40,16 +40,16 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="物资名称">
             <el-input v-model="searchList.dmUpname2" clearable />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6" class="btn_center">
           <el-button :icon="Search" type="primary" @click="getList">查询</el-button>
           <el-button :icon="RefreshRight" @click="clearSearch">清空</el-button>
           <!-- <el-button type="primary" :disable="!tableLoading" :icon="Download" @click="downloadExcel">导出</el-button> -->
-          <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('tj:export')">导出</el-button>
+          <!-- <el-button type="primary" :icon="Download" @click="exportTemplate" v-if="hasBtn('tj:export')">导出</el-button> -->
         </el-col>
         <!-- <el-col :span="6" class="btn_center">
           <el-button class="color1" @click="handlerColor('success', '1')">超期</el-button>
@@ -241,7 +241,6 @@ const tableLoading = ref(false);
 const searchList: any = ref({
   gameDeptId: [],
   warehouseDeptId: [],
-  dmUpname2: "",
   provinceSiteIdList: []
 });
 const mergeObj: any = ref({});
@@ -318,7 +317,6 @@ const clearSearch = () => {
   searchList.value = {
     gameDeptId: [],
     warehouseDeptId: [],
-    dmUpname2: "",
     provinceSiteIdList: []
   };
   getList();
@@ -328,7 +326,8 @@ const clearSearch = () => {
 const getList = () => {
   const data = {
     dmUpcode0List: props.payload,
-    ...searchList.value
+    ...searchList.value,
+    isMaintenance: true
   };
   tableLoading.value = true;
   getDetaWarninglList(data).then((res: any) => {
@@ -341,16 +340,23 @@ const getList = () => {
 
 const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
   if (columnIndex === 1) {
-    if (rowIndex % 2 === 0) {
-      return {
-        rowspan: 2,
-        colspan: 1
-      };
+    const currentValue = row[column.property];
+    const preRow = tableData.value[rowIndex - 1];
+    const preValue = preRow ? preRow[column.property] : null;
+    if (currentValue === preValue) {
+      return { rowspan: 0, colspan: 0 };
     } else {
-      return {
-        rowspan: 0,
-        colspan: 0
-      };
+      let rowspan = 1;
+      for (let i = rowIndex + 1; i < tableData.value.length; i++) {
+        const nextRow = tableData.value[i];
+        const nextValue = nextRow[column.property];
+        if (nextValue === currentValue) {
+          rowspan++;
+        } else {
+          break;
+        }
+      }
+      return { rowspan, colspan: 1 };
     }
   }
 };
@@ -483,7 +489,8 @@ const exportTemplate = async () => {
   }
 };
 const openDetail = (row: any, type: any) => {
-  setQuery("/dataStatistics/WarningDetail", { id: row.maintenanceId, type: type });
+  console.log(row.deptId);
+  setQuery("/dataStatistics/WarningDetail", { deptId: row.deptId, type: type, dmUpcode0List: props.payload });
 };
 
 const cellStyle = () => {