Merge branch '周转率' into 测试

src/views/group/data-board/turnover-rate/index.vue

@@ -2,11 +2,12 @@
   <el-card class="box-card">
     <el-tabs v-model="activeName" type="card" @tab-change="getList">
       <el-tab-pane label="瑜伽垫" :name="'1'">
-        <el-row :gutter="10">
+        <el-row :gutter="20">
           <el-col :span="8">
             <byTable
               ref="data30"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data30"
               :config="config"
               :loading="sourceList.loading30"
@@ -41,6 +42,7 @@
             <byTable
               ref="data60"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data60"
               :config="config"
               :loading="sourceList.loading60"
@@ -75,6 +77,7 @@
             <byTable
               ref="data90"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data90"
               :config="config"
               :loading="sourceList.loading90"
@@ -108,11 +111,12 @@
         </el-row>
       </el-tab-pane>
       <el-tab-pane label="瑜伽砖" :name="'2'">
-        <el-row :gutter="10">
+        <el-row :gutter="20">
           <el-col :span="8">
             <byTable
               ref="data30"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data30"
               :config="config"
               :loading="sourceList.loading30"
@@ -147,6 +151,7 @@
             <byTable
               ref="data60"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data60"
               :config="config"
               :loading="sourceList.loading60"
@@ -181,6 +186,7 @@
             <byTable
               ref="data90"
               :hidePagination="true"
+              :borderStatus="true"
               :source="sourceList.data90"
               :config="config"
               :loading="sourceList.loading90"
@@ -220,6 +226,7 @@
 <script setup>
 import byTable from "/src/components/byTable/index";
 import { nextTick } from "vue";
+import { ElMessageBox } from "element-plus";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("1");
@@ -250,7 +257,7 @@ const config = computed(() => {
       attrs: {
         label: "周转率",
         prop: "turnoverRate",
-        width: 90,
+        width: 100,
       },
       sortable: true,
     },
@@ -281,13 +288,21 @@ const getList = () => {
 };
 getList();
 const deriveExcel = (days) => {
-  proxy.postFile("/turnoverRateBoard/exportExcel", { bomClassify: activeName.value, days: days, sortField: 1 }).then((res) => {
-    if (activeName.value == "1") {
-      proxy.downloadFile(res, "周转率-裸垫-" + days + "天.xlsx");
-    } else {
-      proxy.downloadFile(res, "周转率-裸砖-" + days + "天.xlsx");
-    }
-  });
+  ElMessageBox.confirm("你是否确认此操作", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      proxy.postFile("/turnoverRateBoard/exportExcel", { bomClassify: activeName.value, days: days, sortField: 1 }).then((res) => {
+        if (activeName.value == "1") {
+          proxy.downloadFile(res, "周转率-裸垫-" + days + "天.xlsx");
+        } else {
+          proxy.downloadFile(res, "周转率-裸砖-" + days + "天.xlsx");
+        }
+      });
+    })
+    .catch(() => {});
 };
 </script>