From 51082cbb62be0df2bf90a5f49983ff6a98781c78 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 13 Nov 2024 20:52:16 +0800
Subject: [PATCH] 三道防线+三级防控

---
 src/views/supplies/components/box/dataContent.vue |  132 +++++++++++++++++++++++++------------------
 1 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/src/views/supplies/components/box/dataContent.vue b/src/views/supplies/components/box/dataContent.vue
index 805e5cc..f88b53f 100644
--- a/src/views/supplies/components/box/dataContent.vue
+++ b/src/views/supplies/components/box/dataContent.vue
@@ -17,23 +17,21 @@
 
         <div class="page_box">
           <div>
-            <el-table empty-text="" v-if="formInline.ownership == 1" :data="tableData" style="width: 100%"
-              :header-cell-style="headerCellStyle" :cell-style="tableCellStyle">
-              <el-table-column fixed prop="name" label="物资名称" />
-              <el-table-column fixed prop="personInCha" label="负责人" />
-              <el-table-column fixed prop="personInChaPhone" label="负责人电话" />
-              <el-table-column fixed prop="stoLoc" label="物资地址" />
-              <el-table-column prop="numUnit" label="数量" width="100" />
+            <el-table empty-text="" v-if="formInline.ownership == 1" :data="tableData">
+              <el-table-column prop="name" label="物资名称" />
+              <el-table-column prop="personInCha" label="负责人" width="150" />
+              <el-table-column prop="personInChaPhone" label="负责人电话" width="250" />
+              <el-table-column prop="stoLoc" label="物资地址" />
+              <el-table-column prop="numUnit" label="数量" width="150" />
             </el-table>
 
-            <el-table empty-text="" v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
-              :cell-style="tableCellStyle">
-              <el-table-column fixed prop="firmName" label="企业名称" />
-              <el-table-column fixed prop="name" label="物资名称" />
-              <el-table-column fixed prop="personInCha" label="负责人" />
-              <el-table-column fixed prop="personInChaPhone" label="负责人电话" />
-              <el-table-column fixed prop="stoLoc" label="物资地址" />
-              <el-table-column prop="numUnit" label="数量" width="100" />
+            <el-table empty-text="" v-else :data="tableData">
+              <!-- <el-table-column prop="firmName" label="企业名称" /> -->
+              <el-table-column prop="name" label="物资名称" />
+              <!-- <el-table-column prop="personInCha" label="负责人" /> -->
+              <!-- <el-table-column prop="personInChaPhone" label="负责人电话" /> -->
+              <el-table-column prop="stoLoc" label="物资地址" />
+              <el-table-column prop="num" label="数量" />
             </el-table>
           </div>
         </div>
@@ -44,7 +42,7 @@
 
 <script setup>
 import publicContent from "./publicContent.vue";
-import { getList } from "@/api/emergencySupplies/emergencySupplies";
+import { getList, getCompanyList } from "@/api/emergencySupplies/emergencySupplies";
 import { getPage } from '@/api/indParkInfo'
 import { reactive, ref, onMounted } from "vue";
 import { ElScrollbar } from 'element-plus';
@@ -70,13 +68,24 @@
   getCompanyPages()
 });
 
+// const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+//   if (columnIndex === 0) {
+//     if (rowIndex % 2 === 0) {
+//       return {
+//         rowspan: 2,
+//         colspan: 1
+//       }
+//     } else {
+//       return {
+//         rowspan: 0,
+//         colspan: 0
+//       }
+//     }
+//   }
+// }
+
 const scrollbarRef = ref(null);
 
-const inputSlider = (number) => {
-  if (scrollbarRef.value) {
-    scrollbarRef.value.setScrollTop(number);
-  }
-}
 
 // 搜索条件
 const formInline = reactive({
@@ -108,47 +117,48 @@
   if (item.id == 1) {
     formInline.firmId = ''
     formInline.ownership = 1
+    getLists(formInline);
   } else {
     formInline.firmId = item.id
     formInline.ownership = 2
+    getComLists(formInline)
   }
-  getLists(formInline);
 }
 
 // 表格样式
-const tableCellStyle = ({ row, column }) => {
-  return { background: "#152851", color: "#fff" };
-};
+// const tableCellStyle = ({ row, column }) => {
+//   return { background: "#152851", color: "#fff" };
+// };
 
 // 表格表头样式
-const headerCellStyle = ({ }) => {
-  return {
-    background: "#152851",
-    color: "#fff",
-  };
-};
+// const headerCellStyle = ({ }) => {
+//   return {
+//     background: "#152851",
+//     color: "#fff",
+//   };
+// };
 
 // 分页树改变
-const handleSizeChange = (val) => {
-  pages.pageSize = val;
-  getLists(formInline);
-}
+// const handleSizeChange = (val) => {
+//   pages.pageSize = val;
+//   getLists(formInline);
+// }
 
 // 分页改变
-const handleCurrentChange = (val) => {
-  pages.page = val;
-  getLists(formInline);
-}
+// const handleCurrentChange = (val) => {
+//   pages.page = val;
+//   getLists(formInline);
+// }
 
 // 重置条件
-const clearBtn = () => {
-  formInline.name = ''
-  formInline.ownership = ''
-  pages.page = 1
-  pages.pageSize = 1000
-  pages.total = 0
-  getLists(formInline);
-}
+// const clearBtn = () => {
+//   formInline.name = ''
+//   formInline.ownership = ''
+//   pages.page = 1
+//   pages.pageSize = 1000
+//   pages.total = 0
+//   getLists(formInline);
+// }
 
 // 查询分页数据
 function getLists(param = {}) {
@@ -158,14 +168,26 @@
   getList(param)
     .then((res) => {
       const data = res.data.data;
-      data.records.forEach((element) => {
-        if (element.ownership == -1) {
-          element.ownership = "园区";
-        } else {
-          element.ownership = "企业";
-        }
-      });
       tableData.value = data.records;
+      pages.total = data.total;
+      loading.value = false;
+    })
+    .catch((err) => {
+      loading.value = false;
+      console.log(err);
+    });
+}
+
+
+// 查询分页数据
+function getComLists(param = {}) {
+  param.current = pages.page;
+  param.size = pages.pageSize;
+  loading.value = true;
+  getCompanyList(param)
+    .then((res) => {
+      const data = res.data.data;
+      tableData.value = data.dataList;
       pages.total = data.total;
       loading.value = false;
     })
@@ -233,7 +255,7 @@
 .page_box .el-table {
   width: 100%;
   height: 680px;
-  background-color: rgba(117, 116, 116, 0.3);
+  // background-color: rgba(117, 116, 116, 0.3);
 }
 
 .active {

--
Gitblit v1.9.3