新增两个统计

.env.development

@@ -2,9 +2,9 @@
 # VUE_APP_BASE_URL = 'http://192.168.50.205:9999'
 # VUE_APP_BASE_URL = 'http://172.16.6.217:9999'
 # 测试环境外网
- VUE_APP_BASE_URL = 'http://121.36.17.6:9098'
+#  VUE_APP_BASE_URL = 'http://121.36.17.6:9098'
 # 正式环境外网
-# VUE_APP_BASE_URL = 'http://121.36.17.6:9099'
+VUE_APP_BASE_URL = 'http://121.36.17.6:9099'
 
 # 图片地址
 VUE_APP_BASE_IMG_URL = ""

src/api/dataStatistics/index.ts

@@ -48,3 +48,12 @@ export function getCityList(data: any) {
     data
   });
 }
+
+// 数据统计 —— 获取详情列表数据
+export function getDetailList(data: any) {
+  return request({
+    url: "/admin/in/selectListByDept",
+    method: "post",
+    data
+  });
+}

src/components/export2xlsx/index.ts

@@ -3,7 +3,7 @@ import { writeFile, utils } from "xlsx";
 
 export const exportExcel = (fileData: any[], headerName: any[], headerProp: string[], fileName: string) => {
   // console.log(fileData, headerName, headerProp, fileName);
-  const merges: any = {};
+  const repeatingData: any = {};
   const name: string[][] = [[], [], []];
   const data = fileData.map((obj) => {
     return headerProp.map((prop) => obj[prop]);
@@ -14,14 +14,14 @@ export const exportExcel = (fileData: any[], headerName: any[], headerProp: stri
   name[0].forEach((item, index) => {
     const itemIndex = name[0].findIndex((ite) => ite === item);
     if (itemIndex !== index) {
-      merges[item] = { s: { r: 0, c: itemIndex }, e: { r: 0, c: index } };
+      repeatingData[item] = { s: { r: 0, c: itemIndex }, e: { r: 0, c: index } };
     }
   });
   const cols = data.map((item) => item[0]);
   cols.forEach((item, index) => {
     const itemIndex = cols.findIndex((ite) => ite === item);
     if (itemIndex !== index) {
-      merges[item] = { s: { r: itemIndex + 3, c: 0 }, e: { r: index + 3, c: 0 } };
+      repeatingData[item] = { s: { r: itemIndex + 3, c: 0 }, e: { r: index + 3, c: 0 } };
     }
   });
   data.unshift(...name);
@@ -35,15 +35,15 @@ export const exportExcel = (fileData: any[], headerName: any[], headerProp: stri
     horizontal: "center",
     vertical: "center"
   };
-  const test: Range[] = [];
-  Object.keys(merges).forEach((item) => {
-    test.push(merges[item]);
+  const merges: Range[] = [];
+  Object.keys(repeatingData).forEach((item) => {
+    merges.push(repeatingData[item]);
   });
   ws["!merges"] = [
     { s: { r: 0, c: 0 }, e: { r: 2, c: 0 } },
     { s: { r: 0, c: 1 }, e: { r: 2, c: 1 } },
     { s: { r: 3, c: 0 }, e: { r: 3, c: 1 } },
-    ...test
+    ...merges
   ];
   utils.book_append_sheet(wb, ws, fileName);
   writeFile(wb, `${fileName}.xlsx`);

src/views/dataStatistics/floodDroughtPrecaution/index.vue

@@ -0,0 +1,233 @@
+<!-- 防汛抗旱明细统计表 -->
+<template>
+  <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.gameDeptId" multiple clearable @change="getSupplies">
+              <el-option v-for="item in cityList" :key="item.deptId" :label="item.name" :value="item.deptId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
+          <el-form-item label="储备仓库">
+            <el-select
+              multiple
+              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-select v-model="searchList.dmUpcode1List" clearable multiple>
+              <el-option v-for="item in suppliesList" :key="item.id" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物资名称">
+            <el-input v-model="searchList.dmUpname2" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="btn_center">
+        <el-button :icon="Search" type="primary" @click="getList">查询</el-button>
+        <el-button :icon="RefreshRight" @click="clearSearch">清空</el-button>
+      </el-row>
+    </el-form>
+
+    <el-table :data="tableData" stripe border :span-method="arraySpanMethod" v-loading="tableLoading">
+      <!-- <el-table :data="tableData" stripe border> -->
+      <el-table-column type="index" label="序号" header-align="center" align="center" />
+      <el-table-column prop="gameName" label="省份" header-align="center" align="center" />
+      <el-table-column prop="warehouseName" label="储备仓库" header-align="center" align="center" width="120" />
+      <el-table-column prop="materials1" label="物资大类" header-align="center" align="center" />
+      <el-table-column prop="materials2" label="物资类别" header-align="center" align="center" />
+      <el-table-column prop="materials3" label="物资名称" header-align="center" align="center" />
+      <el-table-column prop="materials4" label="物资单位" header-align="center" align="center" />
+      <el-table-column prop="specs" label="规格" header-align="center" align="center" />
+      <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
+      <el-table-column prop="inboundTime" label="入库时间" header-align="center" align="center" />
+      <el-table-column prop="unitPrice" label="单价(元)" header-align="center" align="center" />
+      <el-table-column prop="totalPrice" label="总价(万元)" header-align="center" align="center">
+        <template #default="{ row }">
+          {{ row.totalPrice ?? row.warehouseTotalPrice }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+    </el-table>
+  </basic-container>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+
+import { useGetters } from "@/hooks/storeHooks";
+import { Search, RefreshRight } from "@element-plus/icons-vue";
+import { getDetailList, getCityList, getSysTreeDict } from "@/api/dataStatistics/index";
+
+const tableData: any = ref([]);
+const tableLoading = ref(false);
+const searchList: any = ref({
+  gameDeptId: [],
+  warehouseDeptId: [],
+  dmUpcode1List: [],
+  dmUpname2: ""
+});
+const mergeObj: any = ref({});
+const cityList: any = ref([]);
+const warehouseList: any = ref([]);
+const suppliesList: any = ref([]);
+
+const { userInfo } = useGetters(["userInfo"]);
+
+if (userInfo.value.deptType === "1") {
+  // 获取省份列表
+  getCityList({ deptType: 2 }).then((res: any) => {
+    if (res.code === 0) {
+      cityList.value = res.data;
+      searchList.value.gameDeptId = [cityList.value[0].deptId];
+      getSupplies(searchList.value.gameDeptId);
+    }
+  });
+} else {
+  // 获取储备仓库
+  getCityList({ parentIdList: [userInfo.value.deptId] }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+      searchList.value.warehouseDeptId = [warehouseList.value[0].deptId];
+    }
+  });
+}
+
+// 根据省份列表获取储备仓库
+const getSupplies = (value: string) => {
+  getCityList({ parentIdList: value }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+    }
+  });
+};
+
+// 获取物资类别
+getSysTreeDict({ type: 1, difference: 2, parentCodeList: ["100", "200"] }).then((res: any) => {
+  if (res.code === 0) {
+    suppliesList.value = res.data;
+  }
+});
+
+const clearSearch = () => {
+  searchList.value = {
+    gameDeptId: [],
+    warehouseDeptId: [],
+    dmUpcode1List: [],
+    dmUpname2: ""
+  };
+  getList();
+};
+
+// 获取表格数据
+const getList = () => {
+  const data = {
+    dmUpcode0List: ["100", "200"],
+    ...searchList.value
+  };
+  tableLoading.value = true;
+  getDetailList(data).then((res: any) => {
+    if (res.code === 0) {
+      tableData.value = res.data.filter((item: any) => {
+        if (item.gameName === null && item.totalPrice === null) {
+          item.unitPrice = "总价值";
+          return item;
+        } else if (item.totalPrice === null) {
+          item.unitPrice = "合计";
+          return item;
+        } else {
+          return item;
+        }
+      });
+      getSpanArr(tableData.value);
+    }
+  });
+};
+
+getList();
+
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
+  const firstHidden = [2, 3, 4, 5, 6, 7, 8, 9];
+  const secondHidden = [4, 5, 6, 7, 8, 9];
+  if (rowIndex === 0) {
+    if (columnIndex === 1) {
+      return [1, 9];
+    } else if (firstHidden.includes(columnIndex)) {
+      return [0, 0];
+    }
+  } else if (row.unitPrice === "合计") {
+    if (columnIndex === 3) {
+      return [1, 7];
+    } else if (secondHidden.includes(columnIndex)) {
+      return [0, 0];
+    }
+  }
+  const mergeCol = ["gameName", "warehouseName", "materials1", "materials2"];
+  // 判断列的属性
+  if (mergeCol.indexOf(column.property) !== -1) {
+    // 判断其值是不是为0
+    if (mergeObj.value[column.property][rowIndex]) {
+      return [mergeObj.value[column.property][rowIndex], 1];
+    } else {
+      // 如果为0则为需要合并的行
+      return [0, 0];
+    }
+  }
+};
+
+// getSpanArr方法
+const getSpanArr = (data: any) => {
+  const mergeCol = ["gameName", "warehouseName", "materials1", "materials2"];
+  mergeCol.forEach((key: any) => {
+    let count = 0; // 用来记录需要合并行的起始位置
+    mergeObj.value[key] = []; // 记录每一列的合并信息
+    data.forEach((item: any, index: number) => {
+      // index == 0表示数据为第一行，直接 push 一个 1
+      if (index === 0) {
+        mergeObj.value[key].push(1);
+      } else {
+        // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
+        if (item[key] === data[index - 1][key]) {
+          mergeObj.value[key][count] += 1;
+          mergeObj.value[key].push(0);
+        } else {
+          // 如果当前行和上一行其值不相等
+          count = index; // 记录当前位置
+          mergeObj.value[key].push(1); // 重新push 一个 1
+        }
+      }
+    });
+  });
+  tableLoading.value = false;
+};
+</script>

src/views/dataStatistics/reliefMaterialsDetailed/index.vue

@@ -0,0 +1,232 @@
+<!-- 救灾物资明细统计表 -->
+<template>
+  <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.gameDeptId" multiple clearable @change="getSupplies">
+              <el-option v-for="item in cityList" :key="item.deptId" :label="item.name" :value="item.deptId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
+          <el-form-item label="储备仓库">
+            <el-select
+              multiple
+              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-select v-model="searchList.dmUpcode1List" clearable multiple>
+              <el-option v-for="item in suppliesList" :key="item.id" :label="item.name" :value="item.code" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物资名称">
+            <el-input v-model="searchList.dmUpname2" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="btn_center">
+        <el-button :icon="Search" type="primary" @click="getList">查询</el-button>
+        <el-button :icon="RefreshRight" @click="clearSearch">清空</el-button>
+      </el-row>
+    </el-form>
+
+    <el-table :data="tableData" stripe border :span-method="arraySpanMethod" v-loading="tableLoading">
+      <!-- <el-table :data="tableData" stripe border> -->
+      <el-table-column type="index" label="序号" header-align="center" align="center" />
+      <el-table-column prop="gameName" label="省份" header-align="center" align="center" />
+      <el-table-column prop="warehouseName" label="储备仓库" header-align="center" align="center" width="120" />
+      <el-table-column prop="materials1" label="物资大类" header-align="center" align="center" />
+      <el-table-column prop="materials2" label="物资类别" header-align="center" align="center" />
+      <el-table-column prop="materials3" label="物资名称" header-align="center" align="center" />
+      <el-table-column prop="materials4" label="物资单位" header-align="center" align="center" />
+      <el-table-column prop="specs" label="规格" header-align="center" align="center" />
+      <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
+      <el-table-column prop="inboundTime" label="入库时间" header-align="center" align="center" />
+      <el-table-column prop="unitPrice" label="单价(元)" header-align="center" align="center" />
+      <el-table-column prop="totalPrice" label="总价(万元)" header-align="center" align="center">
+        <template #default="{ row }">
+          {{ row.totalPrice ?? row.warehouseTotalPrice }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
+    </el-table>
+  </basic-container>
+</template>
+
+<script setup lang="ts">
+import { ref } from "vue";
+
+import { useGetters } from "@/hooks/storeHooks";
+import { Search, RefreshRight } from "@element-plus/icons-vue";
+import { getDetailList, getCityList, getSysTreeDict } from "@/api/dataStatistics/index";
+
+const tableData: any = ref([]);
+const tableLoading = ref(false);
+const searchList: any = ref({
+  gameDeptId: [],
+  warehouseDeptId: [],
+  dmUpcode1List: [],
+  dmUpname2: ""
+});
+const mergeObj: any = ref({});
+const cityList: any = ref([]);
+const warehouseList: any = ref([]);
+const suppliesList: any = ref([]);
+
+const { userInfo } = useGetters(["userInfo"]);
+
+if (userInfo.value.deptType === "1") {
+  // 获取省份列表
+  getCityList({ deptType: 2 }).then((res: any) => {
+    if (res.code === 0) {
+      cityList.value = res.data;
+      searchList.value.gameDeptId = [cityList.value[0].deptId];
+      getSupplies(searchList.value.gameDeptId);
+      getList();
+    }
+  });
+} else {
+  // 获取储备仓库
+  getCityList({ parentIdList: [userInfo.value.deptId] }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+      searchList.value.warehouseDeptId = [warehouseList.value[0].deptId];
+    }
+  });
+}
+
+// 根据省份列表获取储备仓库
+const getSupplies = (value: string) => {
+  getCityList({ parentIdList: value }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+    }
+  });
+};
+
+// 获取物资类别
+getSysTreeDict({ type: 1, difference: 2, parentCodeList: ["300"] }).then((res: any) => {
+  if (res.code === 0) {
+    suppliesList.value = res.data;
+  }
+});
+
+const clearSearch = () => {
+  searchList.value = {
+    gameDeptId: [],
+    warehouseDeptId: [],
+    dmUpcode1List: [],
+    dmUpname2: ""
+  };
+  getList();
+};
+
+// 获取表格数据
+const getList = () => {
+  const data = {
+    dmUpcode0List: ["300"],
+    ...searchList.value
+  };
+  tableLoading.value = true;
+  getDetailList(data).then((res: any) => {
+    if (res.code === 0) {
+      tableData.value = res.data.filter((item: any) => {
+        if (item.gameName === null && item.totalPrice === null) {
+          item.unitPrice = "总价值";
+          return item;
+        } else if (item.totalPrice === null) {
+          item.unitPrice = "合计";
+          return item;
+        } else {
+          return item;
+        }
+      });
+      getSpanArr(tableData.value);
+    }
+  });
+};
+
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
+  const firstHidden = [2, 3, 4, 5, 6, 7, 8, 9];
+  const secondHidden = [4, 5, 6, 7, 8, 9];
+  if (rowIndex === 0) {
+    if (columnIndex === 1) {
+      return [1, 9];
+    } else if (firstHidden.includes(columnIndex)) {
+      return [0, 0];
+    }
+  } else if (row.unitPrice === "合计") {
+    if (columnIndex === 3) {
+      return [1, 7];
+    } else if (secondHidden.includes(columnIndex)) {
+      return [0, 0];
+    }
+  }
+  const mergeCol = ["gameName", "warehouseName", "materials1", "materials2"];
+  // 判断列的属性
+  if (mergeCol.indexOf(column.property) !== -1) {
+    // 判断其值是不是为0
+    if (mergeObj.value[column.property][rowIndex]) {
+      return [mergeObj.value[column.property][rowIndex], 1];
+    } else {
+      // 如果为0则为需要合并的行
+      return [0, 0];
+    }
+  }
+};
+
+// getSpanArr方法
+const getSpanArr = (data: any) => {
+  const mergeCol = ["gameName", "warehouseName", "materials1", "materials2"];
+  mergeCol.forEach((key: any) => {
+    let count = 0; // 用来记录需要合并行的起始位置
+    mergeObj.value[key] = []; // 记录每一列的合并信息
+    data.forEach((item: any, index: number) => {
+      // index == 0表示数据为第一行，直接 push 一个 1
+      if (index === 0) {
+        mergeObj.value[key].push(1);
+      } else {
+        // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
+        if (item[key] === data[index - 1][key]) {
+          mergeObj.value[key][count] += 1;
+          mergeObj.value[key].push(0);
+        } else {
+          // 如果当前行和上一行其值不相等
+          count = index; // 记录当前位置
+          mergeObj.value[key].push(1); // 重新push 一个 1
+        }
+      }
+    });
+  });
+  tableLoading.value = false;
+};
+</script>