Merge branch 'sxw-skeleton' of http://101.36.160.140:21044/emergency-report/report-vue into sxw-skeleton

src/api/keshihua/detail.ts

@@ -0,0 +1,30 @@
+import request from "@/api";
+// const api = "/api"
+const api = "/admin"
+// 物资储备情况
+export function getMaterial(data: any) {
+  return request({
+    url: api + "/vis/get-material-situation?name=" + data.name,
+    method: "get"
+  });
+}
+// 出入库记录
+// export function getRecords(data: any) {
+//   return request({
+//     url: api + "/vis/entry_exit_records?type=" + data.type + "&name=" + data.name,
+//     method: "get"
+//   });
+// }
+export function getRecords(data: any) {
+  return request({
+    url: api + "/vis/entry_exit_records?type=" + data.type,
+    method: "get"
+  });
+}
+// 损耗记录
+export function getLossRecord(data: any) {
+  return request({
+    url: api + "/vis/getLossRecord?name=" + data.name,
+    method: "get"
+  });
+}

src/api/keshihua/index.ts

@@ -1,7 +1,32 @@
 import request from "@/api";
+/* 地图库点信息*/
 export function GetKuiDian() {
-    return request({
-      url: "/admin/vis/getMapPoint",
-      method: "get"
-    });
-  }
+  return request({
+    url: "/api/vis/getMapPoint",
+    method: "get"
+  });
+}
+/* 应急物资分类*/
+// 物资入库情况
+export function getInventoryReceiptStatus() {
+  return request({
+    url: "/api/vis/getInventoryReceiptStatus",
+    method: "get"
+  });
+}
+// 物资出库情况
+export function getInventoryDispatchStatus() {
+  return request({
+    url: "/api/vis/getInventoryDispatchStatus",
+    method: "get"
+  });
+}
+/* 物资可用统计*/
+
+/* 物资调用情况*/
+
+/* 出入库统计*/
+
+/* 物资使用情况排名*/
+
+/* 物资损耗统计*/

src/views/DataVisualization/detailPage/components/crkjl.vue

@@ -2,25 +2,25 @@
 <template>
   <div class="box">
     <div class="list" v-for="(item, index) in tableData" :key="index">
-      <div :class="'list_left list_left_' + index"></div>
+      <div :class="'list_left list_left_' + item.parentID"></div>
       <div :class="'list_right list_right_' + index">
         <div class="crkjl">
-          {{ item.type }}
+          {{ item.type == "1" ? "入库" : "出库" }}
         </div>
         <div class="crksf">
-          {{ item.province }}
+          {{ item.shengName }}
         </div>
         <div class="list_card card_top">
-          <div class="card_left">{{ item.name }}</div>
-          <div class="card_right">{{ item.number }}</div>
+          <div class="card_left" :title="item.materialName">{{ item.materialName }}</div>
+          <div class="card_right">{{ item.quantity }}</div>
         </div>
         <div class="list_card card_line">
           <div class="card_left"></div>
           <div class="card_right"></div>
         </div>
         <div class="list_card card_bottom">
-          <div class="card_left">{{ item.data }}</div>
-          <div class="card_right">{{ item.state }}</div>
+          <div class="card_left">{{ item.specs }}</div>
+          <div class="card_right">{{ item.boundTime }}</div>
         </div>
       </div>
     </div>
@@ -29,117 +29,41 @@
 
 <script setup lang="ts">
 import { defineProps, onMounted, ref, reactive, toRefs, defineExpose } from "vue";
+import { getRecords } from "@/api/keshihua/detail";
+import { useRoute } from "vue-router";
 
+let route = useRoute();
 const props = defineProps({ msg: String });
 const data = reactive({
-  tableData: [{}],
-  tableDataCopy: [
-    {
-      name: "被服",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "床具",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "用具",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "帐篷",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "救生器材",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "抢险物料",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "出库",
-      province: "天津市"
-    },
-    {
-      name: "供水器具",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "入库",
-      province: "天津市"
-    },
-    {
-      name: "排水设备",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "入库",
-      province: "天津市"
-    },
-    {
-      name: "抢险机具",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "入库",
-      province: "天津市"
-    },
-    {
-      name: "防洪铅丝网",
-      number: "12个",
-      data: "4*5",
-      state: "2023-1-8",
-      type: "入库",
-      province: "天津市"
-    }
-  ],
-  selectType: "全部",
+  tableData: [],
+  selectType: "0",
   selectValue: ""
 });
-let { tableData, selectType, selectValue, tableDataCopy } = toRefs(data);
+let { tableData, selectType, selectValue } = toRefs(data);
 
+const getList = () => {
+  const data = reactive({
+    // type: selectType.value,
+    // name: route.query.name ? route.query.name : ""
+    type: ""
+  });
+  getRecords(data).then((res: any) => {
+    if (res) {
+      tableData.value = res;
+    }
+  });
+};
 const selectHandleCh = (val: any) => {
-  console.log(val, "val");
-  if (val == "出库记录") {
-    tableData.value = tableDataCopy.value.filter((item) => {
-      return item.type == "出库";
-    });
-  } else if (val == "入库记录") {
-    tableData.value = tableDataCopy.value.filter((item) => {
-      return item.type == "入库";
-    });
-  } else {
-    tableData.value = { ...tableDataCopy.value };
-  }
+  selectType.value = val;
+  getList();
 };
-tableData.value = { ...tableDataCopy.value };
 
 defineExpose({
-  selectHandleCh,
+  selectHandleCh
+});
+onMounted(() => {
+  getList();
 });
-onMounted(() => {});
 </script>
 
 <style scoped>
@@ -222,23 +146,28 @@ onMounted(() => {});
 .card_top .card_right {
   line-height: 200%;
 }
+.card_top .card_left {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 
 .list .list_left {
   width: 16%;
 }
-.list .list_left_0 {
+.list .list_left_9 {
   background: url("@/assets/emergencyImg/crk_bedclothes.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_1 {
+.list .list_left_10 {
   background: url("@/assets/emergencyImg/crk_bedding.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_2 {
+.list .list_left_11 {
   background: url("@/assets/emergencyImg/crk_appliance.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_3 {
+.list .list_left_12 {
   background: url("@/assets/emergencyImg/crk_tents.png") no-repeat;
   background-size: 100% 100%;
 }
@@ -246,11 +175,11 @@ onMounted(() => {});
   background: url("@/assets/emergencyImg/crk_lifesaving.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_5 {
+.list .list_left_6 {
   background: url("@/assets/emergencyImg/crk_material.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_6 {
+.list .list_left_8 {
   background: url("@/assets/emergencyImg/crk_water.png") no-repeat;
   background-size: 100% 100%;
 }
@@ -258,15 +187,16 @@ onMounted(() => {});
   background: url("@/assets/emergencyImg/crk_drainage.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_8 {
+.list .list_left_5 {
   background: url("@/assets/emergencyImg/crk_rescue.png") no-repeat;
   background-size: 100% 100%;
 }
-.list .list_left_9 {
+/* 防洪铅丝网 */
+.list .list_left_0 {
   background: url("@/assets/emergencyImg/crk_net.png") no-repeat;
   background-size: 100% 100%;
 }
-.list_right_0 .card_line .card_left,
+/* .list_right_0 .card_line .card_left,
 .list_right_1 .card_line .card_left,
 .list_right_2 .card_line .card_left,
 .list_right_3 .card_line .card_left {
@@ -297,5 +227,5 @@ onMounted(() => {});
 }
 .list_right_9 .card_line .card_right {
   width: 74%;
-}
+} */
 </style>

src/views/DataVisualization/detailPage/components/shjl.vue

@@ -62,77 +62,32 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, onMounted, ref } from "vue";
-
-const props = defineProps({ msg: String });
-const tableData = [
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  },
-  {
-    date: "2023-8-7",
-    name: "编织袋",
-    type: "报废",
-    number: "1000",
-    state: "个",
-    price: "1"
-  }
-];
-
-onMounted(() => {});
+import { reactive, toRefs, defineProps, onMounted, ref } from "vue";
+import { useRoute } from "vue-router";
+import { getLossRecord } from "@/api/keshihua/detail";
+
+let route = useRoute();
+const data = reactive({
+  tableData: [],
+  selectType: "",
+  selectValue: ""
+});
+let { tableData, selectType, selectValue } = toRefs(data);
+
+const getList = () => {
+  const data = reactive({
+    // name: route.query.name ? route.query.name : ""
+    name: ""
+  });
+  getLossRecord(data).then((res: any) => {
+    if (res) {
+      tableData.value = res;
+    }
+  });
+};
+onMounted(() => {
+  getList();
+});
 </script>
 
 <style scoped>
@@ -256,10 +211,10 @@ onMounted(() => {});
 :deep(.el-table__body tr.current-row > td.el-table__cell) {
   background-color: transparent !important;
 }
-:deep(.el-table__header){
+:deep(.el-table__header) {
   width: auto !important;
 }
-:deep(.el-table__body){
+:deep(.el-table__body) {
   width: auto !important;
 }
 </style>

src/views/DataVisualization/detailPage/components/wzcbqk.vue

@@ -1,7 +1,7 @@
-<!-- 物资储备情况 -->
+<!-- 物资储备统计 -->
 <template>
   <div class="box">
-    <div class="title">{{ props.msg }}</div>
+    <div class="title">{{ title }}</div>
     <div class="table">
       <el-table
         :highlight-current-row="false"
@@ -16,28 +16,28 @@
           align="center"
           style="background: transparent; border: none"
           fixed
-          prop="name"
+          prop="materialNameZn"
           label="物资名称"
         />
         <el-table-column
           header-align="center"
           align="center"
           style="background: transparent; border: none"
-          prop="data"
+          prop="specs"
           label="规格"
         />
         <el-table-column
           header-align="center"
           align="center"
           style="background: transparent; border: none"
-          prop="number"
+          prop="quantityAll"
           label="数量+单位"
         />
         <el-table-column
           header-align="center"
           align="center"
           style="background: transparent; border: none"
-          prop="state"
+          prop="totalPriceAll"
           label="价值"
         />
       </el-table>
@@ -46,49 +46,61 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, onMounted, ref } from "vue";
+import { reactive, toRefs, defineProps, onMounted, ref } from "vue";
+import { getMaterial } from "@/api/keshihua/detail";
+import { useRoute } from "vue-router";
 
+let route = useRoute();
 const props = defineProps({ msg: String });
-const tableData = [
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  },
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  },
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  },
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  },
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  },
-  {
-    name: "单帐篷",
-    data: "1.2*2.1",
-    number: "500项",
-    state: "1万"
-  }
-];
-
-onMounted(() => {});
+const data = reactive({
+  tableData: [],
+  title: ""
+});
+const titleList: any[] = reactive([]);
+const formData = reactive({});
+let { tableData, title } = toRefs(data);
+
+const getList = () => {
+  const data = reactive({
+    // name: route.query.name ? route.query.name : ""
+    name: ""
+  });
+  getMaterial(data).then((res: any) => {
+    if (res) {
+      Object.keys(res).forEach((key: string) => {
+        titleList.push(key);
+      });
+      if (props.msg == "first") {
+        titleList.forEach((item, index) => {
+          if (index == 0) {
+            title.value = titleList[0];
+          }
+        });
+        tableData.value = res[title.value];
+      }
+      if (props.msg == "second") {
+        titleList.forEach((item, index) => {
+          if (index == 1) {
+            title.value = titleList[1];
+          }
+        });
+        tableData.value = res[title.value];
+      }
+      if (props.msg == "third") {
+        titleList.forEach((item, index) => {
+          if (index == 2) {
+            title.value = titleList[2];
+          }
+        });
+        tableData.value = res[title.value];
+      }
+    }
+  });
+};
+
+onMounted(() => {
+  getList();
+});
 </script>
 
 <style scoped>

src/views/DataVisualization/detailPage/index.vue

@@ -7,13 +7,13 @@
       <div class="left">
         <div class="left-title">物资储备统计</div>
         <div class="left-card">
-          <Wzcbqk msg="帐篷"></Wzcbqk>
+          <Wzcbqk msg="first"></Wzcbqk>
         </div>
         <div class="left-card">
-          <Wzcbqk msg="被服"></Wzcbqk>
+          <Wzcbqk msg="second"></Wzcbqk>
         </div>
         <div class="left-card">
-          <Wzcbqk msg="用具"></Wzcbqk>
+          <Wzcbqk msg="third"></Wzcbqk>
         </div>
       </div>
       <div class="center">
@@ -32,13 +32,10 @@
         <div class="center_title">
           <Wzcb></Wzcb>
         </div>
-        <div class="center_content">
-          <!-- <Shjl></Shjl> -->
-        </div>
+        <div class="center_content"></div>
       </div>
       <div class="right">
         <div class="right-title">出入库记录</div>
-
         <div class="select">
           <el-select
             :teleported="false"
@@ -50,9 +47,9 @@
             v-model="selectValue"
             @change="selectHandle"
           >
-            <el-option value="全部" label="全部" />
-            <el-option value="出库记录" label="出库记录" />
-            <el-option value="入库记录" label="入库记录" />
+            <el-option value="0" label="全部" />
+            <el-option value="2" label="出库记录" />
+            <el-option value="1" label="入库记录" />
           </el-select>
         </div>
         <div class="right_crk">
@@ -70,7 +67,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import Header from '@/views/DataVisualization/home/components/header.vue';
+import Header from "@/views/DataVisualization/home/components/header.vue";
 import Wzcbqk from "@/views/DataVisualization/detailPage/components/wzcbqk.vue";
 import Crkjl from "@/views/DataVisualization/detailPage/components/crkjl.vue";
 import Wzcb from "@/views/DataVisualization/detailPage/components/wzcb.vue";
@@ -78,7 +75,7 @@ import Shjl from "@/views/DataVisualization/detailPage/components/shjl.vue";
 import { reactive, toRefs, ref } from "vue";
 
 const data = reactive({
-  selectValue: ""
+  selectValue: "0"
 });
 let { selectValue } = toRefs(data);
 let crkjl = ref();
@@ -129,7 +126,6 @@ const selectHandle = (val: any) => {
   /* background: rgba(255, 192, 203, 0.168); */
   background: url("@/assets/img/bg.jpg") no-repeat;
   background-size: 100% 100%;
-
 }
 .container .content .center .title {
   width: 100%;
@@ -274,7 +270,7 @@ const selectHandle = (val: any) => {
 .el-select-dropdown__item:hover,
 .el-select-dropdown__item.hover {
   color: #fff;
-  background: #409eff;
+  background: #40a0ff99;
 }
 :deep(.el-popper.is-light) {
   background: #307cbf;
@@ -300,4 +296,8 @@ const selectHandle = (val: any) => {
 :deep(.el-select__placeholder) {
   color: #ffffffd7;
 }
+:deep(.el-select-dropdown__item.is-selected) {
+  color: var(--el-color-primary);
+  /* background: #40a0ff99; */
+}
 </style>

src/views/DataVisualization/home/components/crktj.vue

@@ -1,270 +0,0 @@
-<!-- 物资入库情况 -->
-
-<template>
-    <div class="box">
-        <div ref="wzqk" class="charts">
-        </div>
-        <div class="title">出入库统计</div>
-        <el-select v-model="selcetData" :teleported="false" popper-class="popperClass" class="select" size="small" placeholder="请选择"
-            style="width: 150px ; height: 21px;">
-            <!-- <el-option value="1" label="全部" />
-            <el-option value="2" label="入库采购" />
-            <el-option value="3" label="多发，增发入库" />
-            <el-option value="4" label="调用后返还" />
-            <el-option value="5" label="未调用实际在库" />
-            <el-option value="6" label="移库入库" />
-            <el-option value="7" label="维修完成入库" /> -->
-            <el-option value="1" label="出库" />
-            <el-option value="2" label="入库" />
-
-      
-        </el-select>
-    </div>
-
-</template>
-
-<script setup lang="ts">
-import * as echarts from "echarts";
-import { onMounted, ref } from "vue";
-const wzqk = ref(null);
-const myColor = ['#eb2100', '#eb3600', '#d0570e', '#d0a00e', '#34da62', '#00e9db', '#00c0e9', '#0096f3', '#33CCFF', '#33FFCC'];
-const Ydata = ['抢险物料','救生器材','抢险机具','排水设备','供水器具'];
-const Xdata = [10, 13, 25, 29, 38, 47, 56, 68, 76, 82];
-let selcetData =ref('1');
-onMounted(() => {
-    let myChart = echarts.init(wzqk.value)
-    let option = {
-        //你的代码
-        backgroundColor: '',
-        grid: {
-            left: '21%',
-            top: '38%',
-            right: '10%',
-            width:'70%',
-            height:'60%',
-            bottom: '8%',
-            containLabel: true
-        },
-        dataZoom: [
-            {
-                yAxisIndex: 0, //这里是从X轴的0刻度开始
-                show: false, //是否显示滑动条，不影响使用
-                type: "slider", // 这个 dataZoom 组件是 slider 型 dataZoom 组件
-                startValue: 0, // 从头开始。
-                endValue: 4, // 一次性展示5个。。
-            }
-        ],
-        xAxis: [{
-            show: false,
-        }],
-        yAxis: [{
-            axisTick: 'none',
-            axisLine: 'none',
-            offset: '12',
-            axisLabel: {
-                textStyle: {
-                    color: '#ffffff',
-                    fontSize: '12',
-                }
-            },
-            data: Ydata,
-        },
-        {
-            axisTick: 'none',
-            axisLine: 'none',
-            axisLabel: {
-                textStyle: {
-                    color: '#ffffff',
-                    fontSize: '12',
-                }
-            },
-            //y
-            data: ['5', '4', '3', '2', '1']
-        },
-        // {
-        //     name: '滚动TOP 10',
-        //     nameGap: '50',
-        //     nameTextStyle: {
-        //         color: '#ffffff',
-        //         fontSize: '16',
-        //     },
-        //     axisLine: {
-        //         lineStyle: {
-        //             color: 'rgba(0,0,0,0)'
-        //         }
-        //     },
-        //     data: [],
-        // }
-    ],
-        series: [{
-            name: '条',
-            type: 'bar',
-            yAxisIndex: 0,
-            data: Xdata,
-            label: {
-                normal: {
-                    show: true,
-                    position: 'right',
-                    textStyle: {
-                        color: '#ffffff',
-                        fontSize: '16',
-                    }
-                }
-            },
-            barWidth: 12,
-            itemStyle: {
-                normal: {
-                    color: function (params) {
-                        var num = myColor.length;
-                        return myColor[params.dataIndex % num]
-                    },
-                }
-            },
-            z: 2
-        }, {
-            name: '白框',
-            type: 'bar',
-            yAxisIndex: 1,
-            barGap: '-100%',
-            data: [99, 99.5, 99.5, 99.5, 99.5],
-            barWidth: 20,
-            itemStyle: {
-                normal: {
-                    color: 'transparent',
-                    barBorderRadius: 5,
-                }
-            },
-            z: 1
-        }, 
-        // {
-        //     name: '外框',
-        //     type: 'bar',
-        //     yAxisIndex: 2,
-        //     barGap: '-100%',
-        //     data: [100, 100, 100, 100, 100],
-        //     barWidth: 24,
-        //     itemStyle: {
-        //         normal: {
-        //             color: function (params) {
-        //                 var num = myColor.length;
-        //                 return myColor[params.dataIndex % num]
-        //             },
-        //             barBorderRadius: 5,
-        //         }
-        //     },
-        //     z: 0
-        // },
-            // {
-            //     name: '外圆',
-            //     type: 'scatter',
-            //     hoverAnimation: false,
-            //     data: [0, 0, 0, 0, 0],
-            //     yAxisIndex: 2,
-            //     symbolSize: 35,
-            //     itemStyle: {
-            //         normal: {
-            //             color: function(params) {
-            //                 var num = myColor.length;
-            //                 return myColor[params.dataIndex % num]
-            //             },
-            //             opacity: 1,
-            //         }
-            //     },
-            //     z: 2
-            // }
-        ]
-    };
-    myChart.setOption(option)
-    window.addEventListener("resize", () => {
-    myChart.resize();
-  });
-})
-</script>
-
-<style scoped>
-.box {
-    width: 100%;
-    height: 100%;
-    position: relative;
-}
-
-.box .charts {
-    width: 100%;
-    height: 100%;
-    /* background: pink; */
-
-
-}
-
-
-.title {
-    font-size: 20px;
-    color: red;
-    position: absolute;
-    left: 14%;
-    top: 6%;
-    font-weight: 700;
-    background: linear-gradient(to bottom, #ffffff, rgb(29, 233, 234));
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-
-}
-:deep(.select .el-select-dropdown) {
-    background: rgba(132, 159, 228, 0.2) !important;
-
-}
-
-:deep(.select .el-select-dropdown .el-select-dropdown__item) {
-    /* background: rgba(12,21,44,0.2); */
-}
-
-.el-select-dropdown__item.selected,
-.el-select-dropdown__item:hover,
-.el-select-dropdown__item.hover {
-    color: #fff;
-    background: #409EFF;
-}
-
-.select {
-    position: absolute;
-    left: 14%;
-    top: 20%;
-    /* height: 10%; */
-}
-
-:deep(.el-popper.is-light) {
-    background: #307cbf;
-    border: 1px solid #273f70;
-}
-
-:deep(.el-select-dropdown__item.hover) {
-    background: transparent;
-    border: none;
-    color: #04FAA0;
-}
-
-
-:deep(.el-select-dropdown__item) {
-    background: transparent;
-    border: none;
-    color: #fff;
-}
-
-:deep(.el-popper.is-light .el-popper__arrow::before) {
-    border: 1px solid #4778d9;
-    background: #4778d9;
-    right: 0;
-}
-
-:deep(.el-select__wrapper) {
-    /* position: absolute; */
-    /* width: 50%; */
-    /* height: 4%; */
-    /* left: 20%;
-    top:; */
-    background: transparent !important;
-    border: rgba(255, 255, 255, 0.2) 1px solid !important;
-    box-shadow: none;
-
-}
-</style>

src/views/DataVisualization/home/components/wzcrktj.vue

@@ -0,0 +1,408 @@
+<!-- 物资入库情况 -->
+
+<template>
+    <div class="box">
+        <div ref="wzqk" class="charts">
+        </div>
+        <div class="title">物资出入库统计</div>
+        <el-select @change="GetData" v-model="selcetData" :teleported="false" popper-class="popperClass" class="select"
+            size="small" placeholder="请选择" style="width: 150px ; height: 21px;">
+            <!-- <el-option value="1" label="全部" />
+            <el-option value="2" label="入库采购" />
+            <el-option value="3" label="多发，增发入库" />
+            <el-option value="4" label="调用后返还" />
+            <el-option value="5" label="未调用实际在库" />
+            <el-option value="6" label="移库入库" />
+            <el-option value="7" label="维修完成入库" /> -->
+            <el-option value="1" label="出库" />
+            <el-option value="2" label="入库" />
+
+
+        </el-select>
+    </div>
+
+</template>
+
+<script setup lang="ts">
+import { getInventoryReceiptStatus, getInventoryDispatchStatus } from '@/api/keshihua/index'
+import * as echarts from "echarts";
+import { onMounted, ref } from "vue";
+const wzqk = ref(null);
+const myColor = ['#eb2100', '#eb3600', '#d0570e', '#d0a00e', '#34da62', '#00e9db', '#00c0e9', '#0096f3', '#33CCFF', '#33FFCC'];
+let Ydata = [];
+let Xdata = [];
+let selcetData = ref('1');
+async function GetData(e) {
+    //入库
+    if (e == 2) {
+        try {
+            const res = await getInventoryReceiptStatus();
+            console.log(res, '入库的数据');
+            // Xdata = [];
+            // Ydata = [];
+            res.forEach(item => {
+                Ydata.push(item.materialType)
+                Xdata.push(item.totalPrice)
+            })
+            let myChart = echarts.init(wzqk.value)
+                let option = {
+                    //你的代码
+                    backgroundColor: '',
+                    grid: {
+                        left: '21%',
+                        top: '38%',
+                        right: '10%',
+                        width: '70%',
+                        height: '60%',
+                        bottom: '8%',
+                        containLabel: true
+                    },
+                    dataZoom: [
+                        {
+                            yAxisIndex: 0, //这里是从X轴的0刻度开始
+                            show: false, //是否显示滑动条，不影响使用
+                            type: "slider", // 这个 dataZoom 组件是 slider 型 dataZoom 组件
+                            startValue: 0, // 从头开始。
+                            endValue: 4, // 一次性展示5个。。
+                        }
+                    ],
+                    xAxis: [{
+                        show: false,
+                    }],
+                    yAxis: [{
+                        axisTick: 'none',
+                        axisLine: 'none',
+                        offset: '12',
+                        axisLabel: {
+                            textStyle: {
+                                color: '#ffffff',
+                                fontSize: '12',
+                            }
+                        },
+                        data: Ydata,
+                    },
+                    {
+                        axisTick: 'none',
+                        axisLine: 'none',
+                        axisLabel: {
+                            textStyle: {
+                                color: '#ffffff',
+                                fontSize: '12',
+                            }
+                        },
+                        //y
+                        data: ['5', '4', '3', '2', '1']
+                    },
+                        // {
+                        //     name: '滚动TOP 10',
+                        //     nameGap: '50',
+                        //     nameTextStyle: {
+                        //         color: '#ffffff',
+                        //         fontSize: '16',
+                        //     },
+                        //     axisLine: {
+                        //         lineStyle: {
+                        //             color: 'rgba(0,0,0,0)'
+                        //         }
+                        //     },
+                        //     data: [],
+                        // }
+                    ],
+                    series: [{
+                        name: '条',
+                        type: 'bar',
+                        yAxisIndex: 0,
+                        data: Xdata,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: 'right',
+                                textStyle: {
+                                    color: '#ffffff',
+                                    fontSize: '16',
+                                }
+                            }
+                        },
+                        barWidth: 12,
+                        itemStyle: {
+                            normal: {
+                                color: function (params) {
+                                    var num = myColor.length;
+                                    return myColor[params.dataIndex % num]
+                                },
+                            }
+                        },
+                        z: 2
+                    }, {
+                        name: '白框',
+                        type: 'bar',
+                        yAxisIndex: 1,
+                        barGap: '-100%',
+                        data: [99, 99.5, 99.5, 99.5, 99.5],
+                        barWidth: 20,
+                        itemStyle: {
+                            normal: {
+                                color: 'transparent',
+                                barBorderRadius: 5,
+                            }
+                        },
+                        z: 1
+                    },
+                        // {
+                        //     name: '外框',
+                        //     type: 'bar',
+                        //     yAxisIndex: 2,
+                        //     barGap: '-100%',
+                        //     data: [100, 100, 100, 100, 100],
+                        //     barWidth: 24,
+                        //     itemStyle: {
+                        //         normal: {
+                        //             color: function (params) {
+                        //                 var num = myColor.length;
+                        //                 return myColor[params.dataIndex % num]
+                        //             },
+                        //             barBorderRadius: 5,
+                        //         }
+                        //     },
+                        //     z: 0
+                        // },
+                        // {
+                        //     name: '外圆',
+                        //     type: 'scatter',
+                        //     hoverAnimation: false,
+                        //     data: [0, 0, 0, 0, 0],
+                        //     yAxisIndex: 2,
+                        //     symbolSize: 35,
+                        //     itemStyle: {
+                        //         normal: {
+                        //             color: function(params) {
+                        //                 var num = myColor.length;
+                        //                 return myColor[params.dataIndex % num]
+                        //             },
+                        //             opacity: 1,
+                        //         }
+                        //     },
+                        //     z: 2
+                        // }
+                    ]
+                };
+                myChart.setOption(option)
+                window.addEventListener("resize", () => {
+                    myChart.resize();
+                });
+        }
+        catch (err) {
+            throw '获取入库的数据失败'
+
+        }
+    }
+    //出库
+    else if (e == 1) {
+        try {
+            const res = await getInventoryDispatchStatus();
+            console.log(res, '出库的数据');
+            Xdata = [];
+            Ydata = [];
+            res.forEach(item => {
+                Ydata.push(item.materialType)
+                Xdata.push(item.totalPrice)
+            })
+            let myChart = echarts.init(wzqk.value)
+                let option = {
+                    //你的代码
+                    backgroundColor: '',
+                    grid: {
+                        left: '21%',
+                        top: '38%',
+                        right: '10%',
+                        width: '70%',
+                        height: '60%',
+                        bottom: '8%',
+                        containLabel: true
+                    },
+                    dataZoom: [
+                        {
+                            yAxisIndex: 0, //这里是从X轴的0刻度开始
+                            show: false, //是否显示滑动条，不影响使用
+                            type: "slider", // 这个 dataZoom 组件是 slider 型 dataZoom 组件
+                            startValue: 0, // 从头开始。
+                            endValue: 4, // 一次性展示5个。。
+                        }
+                    ],
+                    xAxis: [{
+                        show: false,
+                    }],
+                    yAxis: [{
+                        axisTick: 'none',
+                        axisLine: 'none',
+                        offset: '12',
+                        axisLabel: {
+                            textStyle: {
+                                color: '#ffffff',
+                                fontSize: '12',
+                            }
+                        },
+                        data: Ydata,
+                    },
+                    {
+                        axisTick: 'none',
+                        axisLine: 'none',
+                        axisLabel: {
+                            textStyle: {
+                                color: '#ffffff',
+                                fontSize: '12',
+                            }
+                        },
+                        //y
+                        data: ['5', '4', '3', '2', '1']
+                    },
+                    ],
+                    series: [{
+                        name: '条',
+                        type: 'bar',
+                        yAxisIndex: 0,
+                        data: Xdata,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: 'right',
+                                textStyle: {
+                                    color: '#ffffff',
+                                    fontSize: '16',
+                                }
+                            }
+                        },
+                        barWidth: 12,
+                        itemStyle: {
+                            normal: {
+                                color: function (params) {
+                                    var num = myColor.length;
+                                    return myColor[params.dataIndex % num]
+                                },
+                            }
+                        },
+                        z: 2
+                    }, {
+                        name: '白框',
+                        type: 'bar',
+                        yAxisIndex: 1,
+                        barGap: '-100%',
+                        data: [99, 99.5, 99.5, 99.5, 99.5],
+                        barWidth: 20,
+                        itemStyle: {
+                            normal: {
+                                color: 'transparent',
+                                barBorderRadius: 5,
+                            }
+                        },
+                        z: 1
+                    },
+                    ]
+                };
+                myChart.setOption(option)
+                window.addEventListener("resize", () => {
+                    myChart.resize();
+                });
+
+        }
+        catch (err) {
+            throw '获取出库的数据失败'
+        }
+
+    }
+
+}
+
+onMounted(() => {
+    GetData(selcetData.value)
+})
+</script>
+
+<style scoped>
+.box {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+
+.box .charts {
+    width: 100%;
+    height: 100%;
+    /* background: pink; */
+
+
+}
+
+
+.title {
+    font-size: 20px;
+    color: red;
+    position: absolute;
+    left: 14%;
+    top: 6%;
+    font-weight: 700;
+    background: linear-gradient(to bottom, #ffffff, rgb(29, 233, 234));
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+
+}
+
+:deep(.select .el-select-dropdown) {
+    background: rgba(132, 159, 228, 0.2) !important;
+
+}
+
+:deep(.select .el-select-dropdown .el-select-dropdown__item) {
+    /* background: rgba(12,21,44,0.2); */
+}
+
+.el-select-dropdown__item.selected,
+.el-select-dropdown__item:hover,
+.el-select-dropdown__item.hover {
+    color: #fff;
+    background: #409EFF;
+}
+
+.select {
+    position: absolute;
+    left: 14%;
+    top: 20%;
+    /* height: 10%; */
+}
+
+:deep(.el-popper.is-light) {
+    background: #307cbf;
+    border: 1px solid #273f70;
+}
+
+:deep(.el-select-dropdown__item.hover) {
+    background: transparent;
+    border: none;
+    color: #04FAA0;
+}
+
+
+:deep(.el-select-dropdown__item) {
+    background: transparent;
+    border: none;
+    color: #fff;
+}
+
+:deep(.el-popper.is-light .el-popper__arrow::before) {
+    border: 1px solid #4778d9;
+    background: #4778d9;
+    right: 0;
+}
+
+:deep(.el-select__wrapper) {
+    /* position: absolute; */
+    /* width: 50%; */
+    /* height: 4%; */
+    /* left: 20%;
+    top:; */
+    background: transparent !important;
+    border: rgba(255, 255, 255, 0.2) 1px solid !important;
+    box-shadow: none;
+
+}
+</style>

src/views/DataVisualization/home/components/wzkytj.vue

@@ -1,5 +1,4 @@
 <!-- 物资情况 -->
-
 <template>
     <div class="box">
         <div ref="wzqk" class="charts">

src/views/DataVisualization/home/index.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="right">
                 <div class="right-card">
-                    <Crktj></Crktj>
+                    <Wzcrktj></Wzcrktj>
                 </div>
                 <div class="right-card">
                     <Wzsyqkpm></Wzsyqkpm>
@@ -56,7 +56,7 @@ import Yjwzfl from '@/views/DataVisualization/home/components/yjwzfl.vue'
 import Wzshtj from '@/views/DataVisualization/home/components/wzshtj.vue'
 import Wzkytj from '@/views/DataVisualization/home/components/wzkytj.vue'
 import Wzdyqk from '@/views/DataVisualization/home/components/wzdyqk.vue'
-import Crktj from '@/views/DataVisualization/home/components/crktj.vue'
+import Wzcrktj from '@/views/DataVisualization/home/components/wzcrktj.vue'
 import Wzsyqkpm from '@/views/DataVisualization/home/components/wzsyqkpm.vue'
 </script>
 <style scoped>

src/views/InformationAudit/enterWarehouseAudit/detail.vue

@@ -5,7 +5,7 @@
       <el-table :data="tableData" style="width: 100%" stripe border>
         <el-table-column prop="inboundType" label="入库类型" header-align="center" align="center">
           <template #default="scope">
-            {{ cklxObject[scope.row.inboundType] }}
+            {{ scope.row.inboundType ? showCh(scope.row.inboundType, indound_type) : scope.row.inboundType }}
           </template>
         </el-table-column>
         <el-table-column prop="materialGroup" label="物资大类" header-align="center" align="center" />
@@ -18,12 +18,14 @@
         <el-table-column prop="totalPrice" label="价值（万元）" header-align="center" align="center" />
         <el-table-column prop="isAvailable" label="是否可用" header-align="center" align="center">
           <template #default="scope">
-            {{ sfkyObject[scope.row.isAvailable] }}
+            {{ scope.row.isAvailable ? showCh(scope.row.isAvailable, is_available) : scope.row.isAvailable }}
           </template>
         </el-table-column>
         <el-table-column label="附件上传" header-align="center" align="center" width="160">
           <template #default="scope">
-            <span class="fileName" @click="fileDown(scope.row.filePart)">{{ scope.row.fileName }}</span>
+            <span class="fileName" @click="fileDownload(scope.row.filePart, scope.row.fileName)">{{
+              scope.row.fileName
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
@@ -36,7 +38,9 @@
           <el-table-column prop="opinion" label="审核意见" header-align="center" align="center" />
           <el-table-column label="附件" header-align="center" align="center">
             <template #default="scope">
-              <span class="fileName" @click="fileDown(scope.row.filePart)">{{ scope.row.fileName }}</span>
+              <span class="fileName" @click="fileDownload(scope.row.filePart, scope.row.fileName)">{{
+                scope.row.fileName
+              }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="auditingTime" label="审核时间" header-align="center" align="center" />
@@ -97,16 +101,13 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter, useRoute } from "vue-router";
 import { useDict } from "@/hooks/dict";
 
-const { indound_type, is_available, auditing_status } = useDict("indound_type", "is_available", "auditing_status");
+const { indound_type, is_available } = useDict("indound_type", "is_available");
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
   tableData: [],
   auditData: [],
   isShow: false,
-  cklxObject: {}, //入库类型
-  sfkyObject: {}, //是否可用
-  dysfObject: {}, //调用省份
   fileUrl: "/admin/sysFile/uploadVoucher",
   myHeader: { Authorization: "Bearer " + sessionStorage.getItem("access_token") }
 });
@@ -125,7 +126,7 @@ let paramsData = reactive({
   bucket: "bound"
 });
 
-let { tableData, auditData, isShow, cklxObject, sfkyObject, dysfObject, fileUrl, myHeader } = toRefs(data);
+let { tableData, auditData, isShow, fileUrl, myHeader } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -141,53 +142,10 @@ const getList = () => {
     }
   });
 };
-// 字典-入库类型
-const getOutboundTypeList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "1764183440564498433"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      cklxObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-是否可用
-const getIsAvailableList = () => {
-  const data = reactive({
-    size: 10,
-    current: 1,
-    dictId: "1764184353161162753"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      sfkyObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-调用省份
-const getProvinceList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "1763408141744652289"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      dysfObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
+// 根据码回显中文
+const showCh = (value: any, option: any) => {
+  const filterItem = option.filter((item: any) => item.value == value);
+  return filterItem.length ? filterItem[0].label : "-";
 };
 // 通过
 const handleAgree = () => {
@@ -271,18 +229,35 @@ const beforeRemove = (uploadFile: any, uploadFiles: any) => {
   );
 };
 
-// 根据码回显中文
-const showCh = (value: any, option: any) => {
-  const filterItem = option.filter((item: any) => item.value == value);
-  return filterItem.length ? filterItem[0].label : "-";
-};
-const fileDown = (filePart: any) => {
-  console.log(filePart, "filePart---");
-  window.location.href = `/admin/sysFile/${filePart ? filePart : ""}`;
+const fileDownload = (filePart: any, fileName: string) => {
+  function createObjectURL(object: any) {
+    return window.URL ? window.URL.createObjectURL(object) : window.webkitURL.createObjectURL(object);
+  }
+  var xhr = new XMLHttpRequest();
+  var formData = new FormData();
+  xhr.open("get", "/admin/sysFile/" + filePart);
+  xhr.setRequestHeader("Authorization", "Bearer " + sessionStorage.getItem("access_token"));
+  xhr.responseType = "blob";
+  xhr.onload = function (e) {
+    if (this.status == 200) {
+      var blob = this.response;
+      console.log(this.response);
+      if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, fileName);
+      } else {
+        var a = document.createElement("a");
+        var url = createObjectURL(blob);
+        a.href = url;
+        a.download = fileName;
+        document.body.appendChild(a);
+        a.click();
+        window.URL.revokeObjectURL(url);
+      }
+    }
+  };
+  xhr.send(formData);
 };
 
-getOutboundTypeList();
-getIsAvailableList();
 onMounted(() => {
   getList();
 });

src/views/InformationAudit/enterWarehouseAudit/index.vue

@@ -11,7 +11,7 @@
         <el-col :span="6">
           <el-form-item label="入库类型">
             <el-select v-model="formData.inboundType" class="m-2" placeholder="请选择" clearable style="width: 280px">
-              <el-option v-for="item in cklxOptions" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in indound_type" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -22,13 +22,19 @@
         </el-col>
         <el-col :span="6">
           <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+          <el-button type="primary" :icon="RefreshRight" @click="handleReSearch">查询</el-button>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="审批节点">
             <el-select v-model="formData.status" class="m-2" placeholder="请选择" clearable style="width: 280px">
-              <el-option v-for="(item, index) in dqspjdOptions" :key="index" :label="item.label" :value="item.value" />
+              <el-option
+                v-for="(item, index) in auditing_status"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -39,7 +45,7 @@
       <el-table-column prop="warehouse" label="库点简称" header-align="center" align="center" />
       <el-table-column prop="inboundType" label="出库类型" header-align="center" align="center">
         <template #default="scope">
-          {{ cklxObject[scope.row.inboundType] }}
+          {{ scope.row.inboundType ? showCh(scope.row.inboundType, indound_type) : scope.row.inboundType }}
         </template>
       </el-table-column>
       <el-table-column prop="materialGroup" label="物资大类" header-align="center" align="center" />
@@ -49,7 +55,12 @@
       <el-table-column prop="inboundTime" label="入库日期" header-align="center" align="center" />
       <el-table-column prop="status" label="当前审批节点" header-align="center" align="center">
         <template #default="scope">
-          {{ spjdObject[scope.row.status] }}
+          {{ scope.row.status ? showCh(scope.row.status, auditing_status) : scope.row.status }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="submitTime" label="提交时间" header-align="center" align="center">
+        <template #default="scope">
+          {{ scope.row.submitTime }}
         </template>
       </el-table-column>
       <el-table-column label="操作" header-align="center" align="center" width="160">
@@ -86,18 +97,15 @@
 import { reactive, toRefs, onMounted } from "vue";
 import { getInAuditList } from "@/api/inAndOut/inAudit/index";
 import { getDictItemList } from "@/api/admin/index";
-import { Search } from "@element-plus/icons-vue";
+import { Search, RefreshRight } from "@element-plus/icons-vue";
 import { useRouter } from "vue-router";
+import { useDict } from "@/hooks/dict";
+
+const { indound_type, auditing_status } = useDict("indound_type", "auditing_status");
 
 const router = useRouter();
 const data = reactive({
   tableData: [],
-  cklxOptions: [],
-  cklxObject: {}, //入库类型
-  // dysfObject: {}, //调用省份
-  spjdObject: {}, //审批节点
-  dqspjdOptions: [],
-  spjdOptions: [],
   deptId: ""
 });
 let page = reactive({
@@ -112,7 +120,7 @@ let formData = reactive({
   status: ""
 });
 
-let { tableData, cklxOptions, cklxObject, spjdObject, dqspjdOptions, spjdOptions, deptId } = toRefs(data);
+let { tableData, deptId } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -128,39 +136,10 @@ const getList = () => {
     }
   });
 };
-// 字典-入库类型
-const getOutboundTypeList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "1764183440564498433"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      cklxOptions.value = res.data.records;
-      cklxObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-审批节点
-const getStatusList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "423059273"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      dqspjdOptions.value = res.data.records;
-      spjdObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
+// 根据码回显中文
+const showCh = (value: any, option: any) => {
+  const filterItem = option.filter((item: any) => item.value == value);
+  return filterItem.length ? filterItem[0].label : "-";
 };
 // 查询
 const handleSearch = () => {
@@ -173,12 +152,10 @@ const handleReSearch = () => {
     pageSize: 10,
     total: 0
   };
-  formData = {
-    warehouse: "",
-    inboundType: "",
-    materialNameVo: "",
-    status: ""
-  };
+  formData.warehouse = "";
+  formData.inboundType = "";
+  formData.materialNameVo = "";
+  formData.status = "";
   getList();
 };
 // 审核
@@ -202,8 +179,6 @@ const handleShow = (row: any) => {
   });
 };
 
-getOutboundTypeList();
-getStatusList();
 onMounted(() => {
   getList();
   let deptObj: any = sessionStorage.getItem("userInfo");

src/views/InformationAudit/outWarehouseAudit/detail.vue

@@ -5,7 +5,7 @@
       <el-table :data="tableData" style="width: 100%" stripe border>
         <el-table-column prop="outboundType" label="出库类型" header-align="center" align="center">
           <template #default="scope">
-            {{ cklxObject[scope.row.outboundType] }}
+            {{ scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType }}
           </template>
         </el-table-column>
         <el-table-column prop="materialGroup" label="物资大类" header-align="center" align="center" />
@@ -15,7 +15,7 @@
         <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
         <el-table-column prop="province" label="调用省份" header-align="center" align="center">
           <template #default="scope">
-            {{ dysfObject[scope.row.province] }}
+            {{ scope.row.province ? showCh(scope.row.province, province_ch) : scope.row.province }}
           </template>
         </el-table-column>
         <el-table-column prop="outboundTime" label="出库日期" header-align="center" align="center" />
@@ -23,12 +23,14 @@
         <el-table-column prop="totalPrice" label="价值（万元）" header-align="center" align="center" />
         <el-table-column prop="isAvailable" label="是否可用" header-align="center" align="center">
           <template #default="scope">
-            {{ sfkyObject[scope.row.isAvailable] }}
+            {{ scope.row.isAvailable ? showCh(scope.row.isAvailable, is_available) : scope.row.isAvailable }}
           </template>
         </el-table-column>
         <el-table-column label="附件上传" header-align="center" align="center" width="160">
           <template #default="scope">
-            <span class="fileName" @click="fileDown(scope.row.filePart)">{{ scope.row.fileName }}</span>
+            <span class="fileName" @click="fileDownload(scope.row.filePart, scope.row.fileName)">{{
+              scope.row.fileName
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="remarks" label="备注" header-align="center" align="center" />
@@ -41,7 +43,9 @@
           <el-table-column prop="opinion" label="审核意见" header-align="center" align="center" />
           <el-table-column label="附件" header-align="center" align="center">
             <template #default="scope">
-              <span class="fileName" @click="fileDown(scope.row.filePart)">{{ scope.row.fileName }}</span>
+              <span class="fileName" @click="fileDownload(scope.row.filePart, scope.row.fileName)">{{
+                scope.row.fileName
+              }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="auditingTime" label="审核时间" header-align="center" align="center" />
@@ -100,6 +104,9 @@ import { getDictItemList } from "@/api/admin/index";
 import { Search } from "@element-plus/icons-vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useRouter, useRoute } from "vue-router";
+import { useDict } from "@/hooks/dict";
+
+const { outdound_type, is_available, province_ch } = useDict("outdound_type", "is_available", "province_ch");
 
 const router = useRouter();
 const route = useRoute();
@@ -107,9 +114,6 @@ const data = reactive({
   tableData: [],
   auditData: [],
   isShow: false,
-  cklxObject: {}, //出库类型
-  sfkyObject: {}, //是否可用
-  dysfObject: {}, //调用省份
   fileUrl: "/admin/sysFile/uploadVoucher",
   myHeader: { Authorization: "Bearer " + sessionStorage.getItem("access_token") }
 });
@@ -128,7 +132,7 @@ let paramsData = reactive({
   bucket: "bound"
 });
 
-let { tableData, auditData, isShow, cklxObject, sfkyObject, dysfObject, fileUrl, myHeader } = toRefs(data);
+let { tableData, auditData, isShow, fileUrl, myHeader } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -144,53 +148,10 @@ const getList = () => {
     }
   });
 };
-// 字典-出库类型
-const getOutboundTypeList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "214124"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      cklxObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-是否可用
-const getIsAvailableList = () => {
-  const data = reactive({
-    size: 10,
-    current: 1,
-    dictId: "1764184353161162753"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      sfkyObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-调用省份
-const getProvinceList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "1763408141744652289"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      dysfObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
+// 根据码回显中文
+const showCh = (value: any, option: any) => {
+  const filterItem = option.filter((item: any) => item.value == value);
+  return filterItem.length ? filterItem[0].label : "-";
 };
 // 通过
 const handleAgree = () => {
@@ -271,14 +232,35 @@ const beforeRemove = (uploadFile: any, uploadFiles: any) => {
     () => false
   );
 };
-const fileDown = (filePart: any) => {
-  console.log(filePart, "filePart---");
-  window.location.href = `/admin/sysFile/${filePart ? filePart : ""}`;
+const fileDownload = (filePart: any, fileName: string) => {
+  function createObjectURL(object: any) {
+    return window.URL ? window.URL.createObjectURL(object) : window.webkitURL.createObjectURL(object);
+  }
+  var xhr = new XMLHttpRequest();
+  var formData = new FormData();
+  xhr.open("get", "/admin/sysFile/" + filePart);
+  xhr.setRequestHeader("Authorization", "Bearer " + sessionStorage.getItem("access_token"));
+  xhr.responseType = "blob";
+  xhr.onload = function (e) {
+    if (this.status == 200) {
+      var blob = this.response;
+      console.log(this.response);
+      if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, fileName);
+      } else {
+        var a = document.createElement("a");
+        var url = createObjectURL(blob);
+        a.href = url;
+        a.download = fileName;
+        document.body.appendChild(a);
+        a.click();
+        window.URL.revokeObjectURL(url);
+      }
+    }
+  };
+  xhr.send(formData);
 };
 
-getOutboundTypeList();
-getIsAvailableList();
-getProvinceList();
 onMounted(() => {
   getList();
 });
@@ -299,7 +281,7 @@ onMounted(() => {
 .el-form-item {
   align-items: center;
 }
-.fileName{
+.fileName {
   color: #4281e6;
   text-decoration: underline;
   cursor: pointer;

src/views/InformationAudit/outWarehouseAudit/index.vue

@@ -6,7 +6,7 @@
         <el-col :span="6">
           <el-form-item label="出库类型">
             <el-select v-model="formData.outboundType" class="m-2" placeholder="请选择" clearable style="width: 280px">
-              <el-option v-for="item in cklxOptions" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in outdound_type" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -18,30 +18,27 @@
         <el-col :span="6">
           <el-form-item label="当前审批节点">
             <el-select v-model="formData.status" class="m-2" placeholder="请选择" clearable style="width: 280px">
-              <el-option v-for="(item, index) in dqspjdOptions" :key="index" :label="item.label" :value="item.value" />
+              <el-option
+                v-for="(item, index) in auditing_status"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+          <el-button type="primary" :icon="RefreshRight" @click="handleReSearch">重置</el-button>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="审批节点">
-            <el-select v-model="formData.spjd" class="m-2" placeholder="请选择" clearable style="width: 280px">
-              <el-option v-for="item in spjdOptions" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row> -->
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
       <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
       <el-table-column prop="warehouse" label="库点简称" header-align="center" align="center" />
       <el-table-column prop="outboundType" label="出库类型" header-align="center" align="center">
         <template #default="scope">
-          {{ cklxObject[scope.row.outboundType] }}
+          {{ scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType }}
         </template>
       </el-table-column>
       <el-table-column prop="materialGroup" label="物资大类" header-align="center" align="center" />
@@ -50,13 +47,18 @@
       <el-table-column prop="quantity" label="数量" header-align="center" align="center" />
       <el-table-column prop="calledProvince" label="调用省份" header-align="center" align="center">
         <template #default="scope">
-          {{ dysfObject[scope.row.calledProvince] }}
+          {{ scope.row.calledProvince ? showCh(scope.row.calledProvince, province_ch) : scope.row.calledProvince }}
         </template>
       </el-table-column>
       <el-table-column prop="outboundTime" label="出库日期" header-align="center" align="center" />
       <el-table-column prop="status" label="当前审批节点" header-align="center" align="center">
         <template #default="scope">
-          {{ spjdObject[scope.row.status] }}
+          {{ scope.row.status ? showCh(scope.row.status, auditing_status) : scope.row.status }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="submitTime" label="提交时间" header-align="center" align="center">
+        <template #default="scope">
+          {{ scope.row.submitTime }}
         </template>
       </el-table-column>
       <el-table-column label="操作" header-align="center" width="160">
@@ -93,18 +95,20 @@
 import { reactive, toRefs, onMounted } from "vue";
 import { getInAuditList } from "@/api/inAndOut/outAudit/index";
 import { getDictItemList } from "@/api/admin/index";
-import { Search } from "@element-plus/icons-vue";
+import { Search, RefreshRight } from "@element-plus/icons-vue";
 import { useRouter } from "vue-router";
+import { useDict } from "@/hooks/dict";
+
+const { outdound_type, is_available, province_ch, auditing_status } = useDict(
+  "outdound_type",
+  "is_available",
+  "province_ch",
+  "auditing_status"
+);
 
 const router = useRouter();
 const data = reactive({
   tableData: [],
-  cklxOptions: [],
-  cklxObject: {}, //出库类型
-  dysfObject: {}, //调用省份
-  spjdObject: {}, //审批节点
-  dqspjdOptions: [],
-  spjdOptions: [],
   deptId: ""
 });
 let page = reactive({
@@ -118,7 +122,7 @@ let formData = reactive({
   status: ""
 });
 
-let { tableData, cklxOptions, cklxObject, dqspjdOptions, spjdOptions, dysfObject, spjdObject, deptId } = toRefs(data);
+let { tableData, deptId } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -134,55 +138,11 @@ const getList = () => {
     }
   });
 };
-// 字典-出库类型
-const getOutboundTypeList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "214124"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      cklxOptions.value = res.data.records;
-      cklxObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-审批节点
-const getStatusList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "423059273"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      dqspjdOptions.value = res.data.records;
-      spjdObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
-};
-// 字典-调用省份
-const getProvinceList = () => {
-  const data = reactive({
-    size: 100,
-    current: 1,
-    dictId: "1763408141744652289"
-  });
-  getDictItemList(data).then((res: any) => {
-    if (res.code === 0) {
-      dysfObject.value = res.data.records.reduce((acc: any, item: any) => {
-        acc[item.value] = item.label;
-        return acc;
-      }, {});
-    }
-  });
+
+// 根据码回显中文
+const showCh = (value: any, option: any) => {
+  const filterItem = option.filter((item: any) => item.value == value);
+  return filterItem.length ? filterItem[0].label : "-";
 };
 // 查询
 const handleSearch = () => {
@@ -195,12 +155,9 @@ const handleReSearch = () => {
     pageSize: 10,
     total: 0
   };
-  formData = {
-    outboundType: "",
-    materialNameVo: "",
-    status: ""
-    // spjd: "",
-  };
+  formData.outboundType = "";
+  formData.materialNameVo = "";
+  formData.status = "";
   getList();
 };
 // 审核
@@ -222,12 +179,8 @@ const handleShow = (row: any) => {
       type: "show"
     }
   });
-
 };
 
-getOutboundTypeList();
-getStatusList();
-getProvinceList();
 onMounted(() => {
   getList();
   let deptObj: any = sessionStorage.getItem("userInfo");

src/views/InformationFilling/enterWarehouseInfo/index.vue

@@ -23,18 +23,22 @@
       </el-row>
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
-      <el-table-column type="index" label="序号" align="center" width="60" />
-      <el-table-column prop="inboundType" label="入库类型" align="center">
+      <el-table-column type="index" label="序号" align="center" width="60">
+        <template #default="scope">
+          {{ (page.currentPage-1) * page.pageSize + scope.$index+1}}
+        </template>
+      </el-table-column>
+      <el-table-column prop="inboundType" label="入库类型" align="center" width="100">
         <template #default="scope">
           {{scope.row.inboundType ? showCh(scope.row.inboundType, indound_type) : scope.row.inboundType}}
         </template>
       </el-table-column>
-      <el-table-column prop="materialGroup" label="物资大类" align="center" />
+      <el-table-column prop="materialGroup" label="物资大类" align="center" width="100" />
       <el-table-column prop="materialType" label="物资类别" align="center" />
       <el-table-column prop="materialName" label="物资名称" align="center" />
       <el-table-column prop="quantity" label="数量" align="center" width="80" />
       <el-table-column prop="inboundTime" label="入库日期" align="center" width="115" />
-      <el-table-column prop="isAvailable" label="是否可用" align="center">
+      <el-table-column prop="isAvailable" label="是否可用" align="center" width="100">
         <template #default="scope">
           {{scope.row.isAvailable ? showCh(scope.row.isAvailable, is_available) : scope.row.isAvailable}}
         </template>
@@ -44,7 +48,7 @@
           {{scope.row.status ? showCh(scope.row.status, auditing_status) : scope.row.status}}
         </template>
       </el-table-column>
-      <el-table-column prop="submitTime" label="提交时间" align="center" width="115" />
+      <el-table-column prop="submitTime" label="提交时间" align="center" width="175" />
       <el-table-column fixed="right" label="操作" width="150" align="center">
         <template #default="{ row }">
           <el-button link type="success" size="small" @click="openDetail(row, 'look')">查看</el-button>

src/views/InformationFilling/outIssue/index.vue

@@ -23,7 +23,11 @@
       </el-row>
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
-      <el-table-column type="index" label="序号" align="center" width="60" />
+      <el-table-column type="index" label="序号" align="center" width="60">
+        <template #default="scope">
+          {{ (page.currentPage-1) * page.pageSize + scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column prop="outboundType" label="出库类型" align="center">
         <template #default="scope">
           {{scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType}}

src/views/InformationFilling/outWarehouseInfo/index.vue

@@ -23,7 +23,11 @@
       </el-row>
     </el-form>
     <el-table :data="tableData" style="width: 100%" stripe border>
-      <el-table-column type="index" label="序号" align="center" width="60" />
+      <el-table-column type="index" label="序号" align="center" width="60">
+        <template #default="scope">
+          {{ (page.currentPage-1) * page.pageSize + scope.$index+1}}
+        </template>
+      </el-table-column>
       <el-table-column prop="outboundType" label="出库类型" align="center">
         <template #default="scope">
           {{scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType}}

vue.config.js

@@ -21,7 +21,7 @@ module.exports = defineConfig({
         }
       },
       "/api": {
-        target: process.env.VUE_APP_BASE_URL,
+        target: 'http://192.168.1.108:8083',
         ws: true,
         changeOrigin: true,
         pathRewrite: {