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

src/api/basicInfo/index.ts

@@ -23,51 +23,11 @@ export function deptDetail(deptId: string) {
   });
 }
 
-
-// 添加数据
-export function addInData(data: any) {
-  return request({
-    url: `/admin/in`,
-    method: "post",
-    data
-  });
-}
-
 // 修改数据
-export function updateInData(data: any) {
+export function updateDept(data: any) {
   return request({
-    url: `/admin/in`,
+    url: `/admin/dept`,
     method: "put",
     data
   });
 }
-// 删除数据
-export function deleteInData(id: string) {
-  return request({
-    url: `/admin/in/${id}`,
-    method: "delete"
-  });
-}
-// 查看数据
-export function lookInData(id: string) {
-  return request({
-    url: `/admin/in/indound/${id}`,
-    method: "get"
-  });
-}
-
-// 物资类别
-export function dictTree(data: any) {
-  return request({
-    url: `/admin/sys/dict/tree/1`,
-    method: "get",
-    params: data
-  });
-}
-// 预览
-export function sysFile(filePart: string) {
-  return request({
-    url: `/admin/sysFile/${filePart}`,
-    method: "get"
-  });
-}

src/api/home/index.ts

@@ -0,0 +1,19 @@
+import request from "@/api";
+
+// 库区列表
+export function kuList(data: any) {
+  return request({
+    url: "/admin/out/material/page",
+    params: { size: data.size, current: data.current },
+    method: "GET"
+  });
+}
+
+// 统计数据
+export function statistics() {
+  return request({
+    url: "/admin/out/aduicount",
+    method: "GET"
+  });
+}
+

src/api/inAndOut/formationFilling/in.ts

@@ -53,6 +53,7 @@ export function dictTree(data: any) {
 export function sysFile(filePart: string) {
   return request({
     url: `/admin/sysFile/${filePart}`,
-    method: "get"
+    method: "get",
+    responseType: 'blob'
   });
 }

src/views/InformationAudit/enterWarehouseAudit/index.vue

@@ -70,8 +70,8 @@
           >
           <el-button
             v-if="
-              (deptId == '9' && scope.row.status == '3') ||
-              (deptId == '10' && (scope.row.status == '2' || scope.row.status == '6'))
+              (deptType == '1' && scope.row.status == '3') ||
+              (deptType == '2' && (scope.row.status == '2' || scope.row.status == '6'))
             "
             link
             type="primary"
@@ -106,7 +106,7 @@ const { indound_type, auditing_status } = useDict("indound_type", "auditing_stat
 const router = useRouter();
 const data = reactive({
   tableData: [],
-  deptId: ""
+  deptType: ""
 });
 let page = reactive({
   currentPage: 1,
@@ -120,7 +120,7 @@ let formData = reactive({
   status: ""
 });
 
-let { tableData, deptId } = toRefs(data);
+let { tableData, deptType } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -182,7 +182,7 @@ const handleShow = (row: any) => {
 onMounted(() => {
   getList();
   let deptObj: any = sessionStorage.getItem("userInfo");
-  deptId = deptObj ? JSON.parse(deptObj).deptId : "";
+  deptType = deptObj ? JSON.parse(deptObj).deptType : "";
 });
 </script>
 

src/views/InformationAudit/outWarehouseAudit/index.vue

@@ -66,8 +66,8 @@
           <el-button link type="success" size="small" style="margin-left:30px" @click="handleShow(scope.row)">查看</el-button>
           <el-button
             v-if="
-              (deptId == '9' && scope.row.status == '3') ||
-              (deptId == '10' && (scope.row.status == '2' || scope.row.status == '6'))
+              (deptType == '1' && scope.row.status == '3') ||
+              (deptType == '2' && (scope.row.status == '2' || scope.row.status == '6'))
             "
             link
             type="primary"
@@ -107,7 +107,7 @@ const { outdound_type, is_available, province_ch, auditing_status } = useDict(
 const router = useRouter();
 const data = reactive({
   tableData: [],
-  deptId: ""
+  deptType: ""
 });
 let page = reactive({
   currentPage: 1,
@@ -120,7 +120,7 @@ let formData = reactive({
   status: ""
 });
 
-let { tableData, deptId } = toRefs(data);
+let { tableData, deptType } = toRefs(data);
 
 // 获取列表
 const getList = () => {
@@ -182,7 +182,7 @@ const handleShow = (row: any) => {
 onMounted(() => {
   getList();
   let deptObj: any = sessionStorage.getItem("userInfo");
-  deptId = deptObj ? JSON.parse(deptObj).deptId : "";
+  deptType = deptObj ? JSON.parse(deptObj).deptType : "";
 });
 </script>
 

src/views/InformationFilling/enterWarehouseInfo/detail.vue

@@ -122,10 +122,11 @@ import { addInData, updateInData, lookInData, dictTree, sysFile } from "@/api/in
 import { useDict } from '@/hooks/dict';
 // import { closeTagAndOpenLastTag } from '@/router/Routermethods';
 import store from "@/store";
-
+import { getQuery } from '@/hooks/detailQuery/index';
 const { indound_type, is_available, province_ch } = useDict('indound_type', 'is_available', 'province_ch');
 
-const props = defineProps(['id','type'])
+// const props = defineProps(['id','type'])
+const props = getQuery("/InformationFilling/enterWarehouseInfoDetail")
 // 价值计算带万
 const wanJson = ['118', '122', '124', '132', '182', '184']
 
@@ -249,15 +250,10 @@ const handleRemove = (file: any, uploadFiles: any) => {
   console.log(file, uploadFiles);
 };
 const handlePreview = (uploadFile: any) => {
-  console.log(uploadFile);
   sysFile(uploadFile.filePart).then((res: any) => {
-    if (res.code === 0) {
-      returnPage()
-      ElMessage({
-        message: "修改成功！",
-        type: "success"
-      });
-    }
+      const blob = new Blob([res], { type: "application/pdf;charset=UTF-8" });
+      const bFile = URL.createObjectURL(blob);
+      window.open(bFile);
   });
 };
 const handleExceed = (files: any, uploadFiles: any) => {

src/views/InformationFilling/enterWarehouseInfo/index.vue

@@ -74,6 +74,7 @@ import { getInPage, deleteInData } from "@/api/inAndOut/formationFilling/in";
 import router from "@/router";
 import { ElMessage } from "element-plus";
 import { useDict } from '@/hooks/dict';
+import { setQuery } from '@/hooks/detailQuery/index';
 
 const { indound_type, is_available, auditing_status } = useDict('indound_type', 'is_available', 'auditing_status');
 
@@ -105,10 +106,11 @@ const clearSearch = () => {
 };
 /** 添加/修改/查看进入详情操作 */
 const openDetail = (row: any, type) => {
-  router.push({
-    path: "/InformationFilling/enterWarehouseInfoDetail",
-    query: {id: row.inboundId, type: type}
-  });
+  setQuery("/InformationFilling/enterWarehouseInfoDetail", {id: row.inboundId, type: type})
+  // router.push({
+  //   path: "/InformationFilling/enterWarehouseInfoDetail",
+  //   query: {id: row.inboundId, type: type}
+  // });
 };
 /** 列表数据获取 */
 const getList = () => {

src/views/InformationFilling/outIssue/detail.vue

@@ -135,12 +135,14 @@ import router from "@/router";
 import { addOutData, updateOutData, lookOutData, dictTree, getDeptTypeList } from "@/api/inAndOut/formationFilling/out";
 import { sysFile } from "@/api/inAndOut/formationFilling/in";
 import { useDict } from '@/hooks/dict';
+import { getQuery } from '@/hooks/detailQuery/index';
 // import { closeTagAndOpenLastTag } from '@/router/Routermethods';
 import store from "@/store";
 
 const { outdound_type, is_available, province_ch } = useDict('outdound_type', 'is_available', 'province_ch');
 
-const props = defineProps(['id','type'])
+// const props = defineProps(['id','type'])
+const props = getQuery("/InformationFilling/outIssueDetail")
 // 价值计算带万
 const wanJson = ['118', '122', '124', '132', '182', '184']
 
@@ -287,13 +289,9 @@ const handleRemove = (file: any, uploadFiles: any) => {
 const handlePreview = (uploadFile: any) => {
   console.log(uploadFile);
   sysFile(uploadFile.filePart).then((res: any) => {
-    if (res.code === 0) {
-      returnPage()
-      ElMessage({
-        message: "修改成功！",
-        type: "success"
-      });
-    }
+    const blob = new Blob([res], { type: "application/pdf;charset=UTF-8" });
+    const bFile = URL.createObjectURL(blob);
+    window.open(bFile);
   });
 };
 const handleExceed = (files: any, uploadFiles: any) => {

src/views/InformationFilling/outIssue/index.vue

@@ -42,8 +42,8 @@
           {{scope.row.calledProvince ? showCh(scope.row.calledProvince, province_ch) : scope.row.calledProvince}}
         </template>
       </el-table-column>
+      <el-table-column prop="submitTime" label="出库日期" align="center" width="115" />
       <el-table-column prop="outboundTime" label="填写时间" align="center" width="115" />
-      <el-table-column prop="submitTime" label="提交时间" align="center" width="115" />
       <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>
@@ -69,6 +69,7 @@ import { getOutPage, deleteOutData } from "@/api/inAndOut/formationFilling/out";
 import router from "@/router";
 import { ElMessage } from "element-plus";
 import { useDict } from '@/hooks/dict';
+import { setQuery } from '@/hooks/detailQuery/index';
 
 const { outdound_type, is_available, province_ch, auditing_status } = useDict('outdound_type', 'is_available', 'province_ch', 'auditing_status');
 
@@ -101,10 +102,11 @@ const clearSearch = () => {
 };
 /** 添加/修改/查看进入详情操作 */
 const openDetail = (row: any, type) => {
-  router.push({
-    path: "/InformationFilling/outIssueDetail",
-    query: {id: row.outboundId, type: type}
-  });
+  setQuery("/InformationFilling/outIssueDetail", {id: row.outboundId, type: type})
+  // router.push({
+  //   path: "/InformationFilling/outIssueDetail",
+  //   query: {id: row.outboundId, type: type}
+  // });
 };
 /** 列表数据获取 */
 const getList = () => {

src/views/InformationFilling/outWarehouseInfo/detail.vue

@@ -129,12 +129,14 @@ import router from "@/router";
 import { addOutData, updateOutData, lookOutData, dictTree } from "@/api/inAndOut/formationFilling/out";
 import { sysFile } from "@/api/inAndOut/formationFilling/in";
 import { useDict } from '@/hooks/dict';
+import { getQuery } from '@/hooks/detailQuery/index';
 // import { closeTagAndOpenLastTag } from '@/router/Routermethods';
 import store from "@/store";
 
 const { outdound_type, is_available, province_ch } = useDict('outdound_type', 'is_available', 'province_ch');
 
-const props = defineProps(['id','type'])
+// const props = defineProps(['id','type'])
+const props = getQuery("/InformationFilling/outWarehouseInfoDetail")
 // 价值计算带万
 const wanJson = ['118', '122', '124', '132', '182', '184']
 
@@ -264,13 +266,9 @@ const handleRemove = (file: any, uploadFiles: any) => {
 const handlePreview = (uploadFile: any) => {
   console.log(uploadFile);
   sysFile(uploadFile.filePart).then((res: any) => {
-    if (res.code === 0) {
-      returnPage()
-      ElMessage({
-        message: "修改成功！",
-        type: "success"
-      });
-    }
+    const blob = new Blob([res], { type: "application/pdf;charset=UTF-8" });
+    const bFile = URL.createObjectURL(blob);
+    window.open(bFile);
   });
 };
 const handleExceed = (files: any, uploadFiles: any) => {

src/views/InformationFilling/outWarehouseInfo/index.vue

@@ -79,6 +79,7 @@ import { getOutPage, deleteOutData } from "@/api/inAndOut/formationFilling/out";
 import router from "@/router";
 import { ElMessage } from "element-plus";
 import { useDict } from '@/hooks/dict';
+import { setQuery } from '@/hooks/detailQuery/index';
 
 const { outdound_type, is_available, province_ch, auditing_status } = useDict('outdound_type', 'is_available', 'province_ch', 'auditing_status');
 
@@ -111,10 +112,11 @@ const clearSearch = () => {
 };
 /** 添加/修改/查看进入详情操作 */
 const openDetail = (row: any, type) => {
-  router.push({
-    path: "/InformationFilling/outWarehouseInfoDetail",
-    query: {id: row.outboundId, type: type}
-  });
+  setQuery("/InformationFilling/outWarehouseInfoDetail", {id: row.outboundId, type: type})
+  // router.push({
+  //   path: "/InformationFilling/outWarehouseInfoDetail",
+  //   query: {id: row.outboundId, type: type}
+  // });
 };
 /** 列表数据获取 */
 const getList = () => {

src/views/admin/dict/index.vue

@@ -23,7 +23,7 @@
     </el-form>
     <div>
       <el-row style="margin-bottom: 10px">
-        <el-button type="primary" :icon="Plus" @click="addOrUpdateHandle(false)">增加</el-button>
+        <el-button type="primary" :icon="Plus" @click="addOrUpdateHandle(false)">新增</el-button>
         <!-- <el-button type="primary" :icon="RefreshLeft" @click="addOrUpdateHandle(0)">缓存</el-button> -->
       </el-row>
       <el-table v-loading="tableLoading" border :data="tableData" row-key="id">

src/views/admin/role/index.vue

@@ -28,7 +28,7 @@
     </el-form>
     <div>
       <el-row style="margin-bottom: 10px">
-        <el-button type="primary" :icon="EditPen" @click="addOrUpdateHandle(0)">添加</el-button>
+        <el-button type="primary" :icon="Plus" @click="addOrUpdateHandle(0)">新增</el-button>
         <!-- <el-button type="primary" :icon="UploadFilled">导入</el-button>
         <el-button type="primary" :icon="Download">导出</el-button> -->
       </el-row>

src/views/basic/basicIndex/index.vue

@@ -30,26 +30,24 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="管理机构" prop="gljg">
-            <el-input v-model="ruleForm.gljg" />
+            <el-input v-model="gljg" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="地址" prop="name">
-            <el-col :span="12">
+        <el-col :span="12">
+          <el-form-item label="地址" prop="deptMergeAddress">
               <el-cascader
                 clearable
-                size="small"
-                v-model="ruleForm.name"
+                v-model="ruleForm.deptMergeAddress"
                 placeholder="请选择"
                 :options="addressOption"
-                :props="{ value: 'code', label: 'name' }"
+                :props="{ value: 'code',label: 'name' }"
                 style="width: 100%"
-                @change="handleChange"
-              ></el-cascader>
-            </el-col>
-            <el-col :span="12">
-              <el-input v-model="ruleForm.deptAddress" />
-            </el-col>
+                @change="handleChange"></el-cascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label=" " prop="deptAddress" label-width="1">
+            <el-input v-model="ruleForm.deptAddress" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -73,7 +71,7 @@
               :on-success="handleAvatarSuccess"
               :before-upload="beforeAvatarUpload"
             >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+              <img v-if="ruleForm.reservoirImg" :src="ruleForm.reservoirImg" class="avatar" />
               <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
             </el-upload>
           </el-form-item>
@@ -91,25 +89,78 @@
 import { reactive, ref } from "vue";
 import type { FormInstance, FormRules } from "element-plus";
 import { Plus } from "@element-plus/icons-vue";
-import { getAddress, deptDetail } from "@/api/basicInfo/index";
+import { getAddress, deptDetail, updateDept } from "@/api/basicInfo/index";
 import type { UploadProps } from "element-plus";
 import { useDict } from "@/hooks/dict";
 const { warehouse_type } = useDict("warehouse_type");
+import { ElMessage } from "element-plus";
+import { sysFile } from "@/api/inAndOut/formationFilling/in";
 
-//附件部分
-const myHeader = { Authorization: "Bearer " + sessionStorage.getItem("access_token") };
-const fileUrl = "/admin/sysFile/uploadVoucher";
-let paramsData = reactive({
-  bucket: "bound"
-});
 const formSize = ref("default");
 const ruleFormRef = ref<FormInstance>();
-const ruleForm = ref({});
-
+const ruleForm = ref({
+  name: '',
+  abbreviationName: '',
+  warehouseType: '',
+  deptMergeAddress: [],
+  deptAddress: '',
+  legalPerson: '',
+  deptPhone: '',
+  reservoirImg: '',
+});
+const fileName = ref("")
+const gljg = ref("")
+const rules = reactive({
+  name: [
+    { required: true, message: '请填写，不能为空', trigger: 'blur' }
+  ],
+  warehouseType: [
+    {
+      required: true,
+      message: '请选择，不能为空',
+      trigger: 'change',
+    },
+  ],
+  deptMergeAddress: [
+    {
+      required: true,
+      message: '请选择，不能为空',
+      trigger: 'change',
+    },
+  ],
+  legalPerson: [
+    { required: true, message: '请填写，不能为空', trigger: 'blur' }
+  ],
+  deptPhone: [
+    { required: true, message: '请填写，不能为空', trigger: 'blur' }
+  ],
+  reservoirImg: [
+    { required: true, message: '请填写，不能为空', trigger: 'blur' }
+  ]
+})
+//提交方法
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
     if (valid) {
+      let postData = {
+        ...ruleForm.value,
+        deptProvince : ruleForm.value.deptMergeAddress[0],
+        deptCity : ruleForm.value.deptMergeAddress[1],
+        deptArea : ruleForm.value.deptMergeAddress[2],
+        deptMergeAddress : JSON.stringify(ruleForm.value.deptMergeAddress),
+        warehouseType: JSON.stringify(ruleForm.value.warehouseType),
+        reservoirImg: fileName.value
+      }
+      console.log(postData)
+      updateDept(postData).then((res: any) => {
+        if (res.code === 0) {
+          ElMessage({
+            message: "修改成功！",
+            type: "success"
+          });
+        }
+      });
       console.log("submit!");
     } else {
       console.log("error submit!", fields);
@@ -117,49 +168,65 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   });
 };
 const addressOption = ref([]);
-const createdMth = async () => {
+const getOption = () => {
   getAddress().then((res: any) => {
     if (res.code === 0) {
       addressOption.value = res.data;
     }
   });
+}
+const createdMth = async () => {
   const deptId = JSON.parse(sessionStorage.getItem("userInfo")).deptId;
   let deptData = await deptDetail(deptId);
   ruleForm.value = deptData.data;
+  handlePreview(ruleForm.value.reservoirImg)
   if (deptData.data.parentId != "0") {
     let parentDept = await deptDetail(deptData.data.parentId);
-    ruleForm.value.gljg = parentDept.data.abbreviationName;
+    ruleForm.value.warehouseType = JSON.parse(deptData.data.warehouseType)
+    ruleForm.value.deptMergeAddress = JSON.parse(deptData.data.deptMergeAddress)
+    gljg.value = parentDept.data.abbreviationName;
   }
 };
+getOption();
 createdMth();
+const handlePreview = (filePart) => {
+  sysFile(filePart).then((res: any) => {
+    const blob = new Blob([res], { type: 'image/png' });
+    const bFile = URL.createObjectURL(blob);
+    fileName.value = filePart
+    ruleForm.value.reservoirImg = bFile;
+  });
+};
 const handleChange = (value) => {
   console.log(JSON.stringify(value));
 };
 const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   formEl.resetFields();
+  createdMth();
 };
 
-const options = Array.from({ length: 10000 }).map((_, idx) => ({
-  value: `${idx + 1}`,
-  label: `${idx + 1}`
-}));
 
 /*----------------------库区图-----------------*/
-const imageUrl = ref("");
+//附件部分
+const myHeader = { Authorization: "Bearer " + sessionStorage.getItem("access_token") };
+const fileUrl = "/admin/sysFile/uploadVoucher";
+let paramsData = reactive({
+  bucket: "bound"
+});
 
 const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
-  imageUrl.value = URL.createObjectURL(uploadFile.raw!);
+  handlePreview(response.data.fileName)
 };
 
 const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
-  if (rawFile.type !== "image/jpeg") {
-    ElMessage.error("Avatar picture must be JPG format!");
-    return false;
-  } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error("Avatar picture size can not exceed 2MB!");
-    return false;
-  }
+  // if (rawFile.type !== "image/jpeg") {
+  //   ElMessage.error("Avatar picture must be JPG format!");
+  //   return false;
+  // } else if (rawFile.size / 1024 / 1024 > 2) {
+  //   ElMessage.error("Avatar picture size can not exceed 2MB!");
+  //   return false;
+  // }
   return true;
 };
 </script>

src/views/home/components/gjj.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="container">
+    <el-card>
+      <!-- <template #header>
+        <div class="card-header">
+          <span>首页-国家局</span>
+        </div>
+      </template> -->
+      <div class="card_home">
+        <div class="card_title">
+          <div class="card_icon">
+            <el-icon size="30px" color="white">
+              <Stamp />
+            </el-icon>
+            <span>出入库审核</span>
+          </div>
+        </div>
+        <div class="card_content">
+          <div class="card_content_item">
+            <div class="content_left">
+              <div class="num">{{ formData.outaudi }}</div>
+              <div class="title">出库信息审核</div>
+            </div>
+            <div class="content_right"></div>
+          </div>
+          <div class="card_content_item card_content_right">
+            <div class="content_left">
+              <div class="num">{{ formData.inaudi }}</div>
+              <div class="title">入库信息审核</div>
+            </div>
+            <div class="content_right"></div>
+          </div>
+        </div>
+      </div>
+      <div class="card_home">
+        <div class="card_title">
+          <div class="card_icon">
+            <el-icon size="30px" color="white">
+              <TrendCharts />
+            </el-icon>
+            <span>统计</span>
+          </div>
+        </div>
+        <div class="card_content">
+          <div class="card_content_item">
+            <div class="content_left">
+              <div class="num">{{ formData.warecount }}</div>
+              <div class="title">库点总数</div>
+            </div>
+            <div class="content_right"></div>
+          </div>
+          <div class="card_content_item card_content_right" v-if="0"></div>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { statistics } from "@/api/home/index";
+import { reactive, toRefs, onMounted } from "vue";
+import { Stamp, TrendCharts } from "@element-plus/icons-vue";
+
+const data = reactive({
+  deptId: ""
+});
+const formData = reactive({
+  inaudi: "",
+  outaudi: "",
+  warecount: ""
+});
+
+let { deptId } = toRefs(data);
+
+// 获取统计数据
+const getStatistics = () => {
+  statistics().then((res: any) => {
+    if (res.code === 0) {
+      formData.inaudi = res.data.inaudi;
+      formData.outaudi = res.data.outaudi;
+      formData.warecount = res.data.warecount;
+    }
+  });
+};
+
+onMounted(() => {
+  getStatistics();
+});
+</script>
+
+<style lang="scss" scoped>
+.container{
+  width: 100%;
+  height: 100%;
+}
+:deep(.el-card) {
+  width: 100%;
+  height: 100%;
+  .card-header {
+    height: 60px;
+    font-size: 30px;
+    line-height: 60px;
+    font-weight: bolder;
+  }
+  .el-card__body {
+    height: 100%;
+  }
+}
+.card_home {
+  width: 100%;
+  height: 40%;
+  // background: pink;
+  padding-bottom: 40px;
+  .card_title {
+    width: 100%;
+    height: 50px;
+    margin-bottom: 20px;
+    .card_icon {
+      width: 200px;
+      height: 50px;
+      // line-height: 50px;
+      // border-radius: 15px;
+      // background: #53acfe;
+      margin: auto;
+      background-image: linear-gradient(to right, #4a6efd, #55beff);
+      color: #ffffff;
+      font-weight: 900;
+      text-align: center;
+      position: relative;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      box-sizing: border-box;
+      padding: 0 20px;
+      span{
+        font-size: 19px;
+        display: inline-block;
+        width: 95px;
+      }
+    }
+    .card_icon::before {
+      content: "";
+      display: inline-block;
+      width: 30px;
+      height: 30px;
+      background: #4a6efd;
+      position: absolute;
+      left: -15px;
+      top: 10px;
+      transform: rotate(45deg) skew(10deg, 10deg);
+    }
+    .card_icon::after {
+      content: "";
+      display: inline-block;
+      width: 30px;
+      height: 30px;
+      background: #55beff;
+      position: absolute;
+      right: -15px;
+      top: 10px;
+      transform: rotate(45deg) skew(10deg, 10deg);
+    }
+  }
+  .card_content {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 8%;
+    .card_content_item {
+      width: 40%;
+      height: 160px;
+      background: #e9f6fe;
+      border-radius: 20px;
+      display: flex;
+      justify-content: space-between;
+      .content_left {
+        width: 30%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        .num {
+          font-size: 46px;
+          font-weight: 900;
+          font-family: "黑体";
+          margin-bottom: 10px;
+        }
+        .title {
+          font-weight: 700;
+          font-size: 20px;
+          color: #666666;
+        }
+      }
+    }
+    .card_content_right {
+      background: #e9feea;
+    }
+  }
+}
+</style>

src/views/home/components/kq.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="container">
+    <el-card>
+      <template #header>
+        <div class="card-header">
+          <span>消息通知</span>
+        </div>
+      </template>
+      <div class="content_item">
+        <el-scrollbar height="65vh">
+          <el-table :data="tableData" style="width: 100%">
+            <el-table-column prop="outboundType" label="出库类型" min-width="200" header-align="center" align="center">
+              <template #default="scope">
+                {{ scope.row.outboundType ? showCh(scope.row.outboundType, outdound_type) : scope.row.outboundType }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="materialGroup" label="物资名称" min-width="300" header-align="center" align="center">
+              <template #default="scope">
+                {{
+                  (scope.row.materialGroup ? scope.row.materialGroup : "") +
+                  " / " +
+                  (scope.row.materialType ? scope.row.materialType : "") +
+                  " / " +
+                  (scope.row.materialName ? scope.row.materialName : "") +
+                  " / " +
+                  (scope.row.unit ? scope.row.unit : "")
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="specs" label="规格" min-width="200" header-align="center" align="center" />
+            <el-table-column prop="quantity" label="数量" min-width="200" header-align="center" align="center" />
+            <el-table-column prop="province" label="调用省份" min-width="200" header-align="center" align="center">
+              <template #default="scope">
+                {{ scope.row.province ? showCh(scope.row.province, province_ch) : scope.row.province }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="outboundTime"
+              label="出库日期"
+              min-width="200"
+              header-align="center"
+              align="center"
+            />
+          </el-table>
+          <pagination
+            v-show="page.total > 0"
+            v-model:page="page.currentPage"
+            v-model:limit="page.pageSize"
+            :total="page.total"
+            layout="->,total, sizes, prev, pager, next, jumper"
+            @pagination="getList"
+          />
+        </el-scrollbar>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { kuList } from "@/api/home/index";
+import { ref, reactive, toRefs, onMounted } from "vue";
+import { useDict } from "@/hooks/dict";
+
+const { outdound_type, province_ch } = useDict("outdound_type", "province_ch");
+
+const data = reactive({
+  tableData: []
+});
+let page = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  total: 0
+});
+
+let { tableData } = toRefs(data);
+
+// const list = ref([
+//   {
+//     content: "信息",
+//     overTime: "时间"
+//   },
+//   {
+//     content: "关于调拨出库的通知....",
+//     overTime: "2024-03-11"
+//   },
+//   {
+//     content: "关于调拨出库的通知....",
+//     overTime: "2024-03-11"
+//   },
+//   {
+//     content: "关于调拨出库的通知....",
+//     overTime: "2024-03-11"
+//   },
+//   {
+//     content: "关于调拨出库的通知....",
+//     overTime: "2024-03-11"
+//   }
+// ]);
+
+// 获取统计数据
+const getList = () => {
+  const data = reactive({
+    size: page.pageSize,
+    current: page.currentPage
+  });
+  kuList(data).then((res: any) => {
+    if (res.code === 0) {
+      tableData.value = res.data.records;
+      page.total = res.data.total;
+    }
+  });
+};
+
+// 根据码回显中文
+const showCh = (value: any, option: any) => {
+  const filterItem = option.filter((item: any) => item.value == value);
+  return filterItem.length ? filterItem[0].label : "-";
+};
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style lang="scss" scoped>
+.container {
+  width: 100%;
+  height: 100%;
+}
+:deep(.el-card) {
+  width: 100%;
+  height: 100%;
+  .card-header {
+    height: 20px;
+    font-size: 18px;
+    line-height: 20px;
+    // font-weight: bolder;
+  }
+  .el-card__body {
+    height: 100%;
+    // display: flex;
+    // flex-direction: column;
+    // align-items: center;
+    // padding-top: 100px;
+    // font-size: 20px;
+    .content_item {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>

src/views/home/index.vue

@@ -1,78 +1,28 @@
 <template>
   <basic-container>
-    <el-card>
-      <template #header>
-        <div class="card-header">
-          <span>首页</span>
-        </div>
-      </template>
-      <template v-for="item in list" :key="item">
-        <div class="content_item">
-          <div>{{ item.content }}</div>
-          <div>{{ item.overTime }}</div>
-        </div>
-      </template>
-    </el-card>
+    <Kq v-if="deptType =='3'"></Kq>
+    <Gjj v-if="deptType =='1' || deptType =='2'"></Gjj>
   </basic-container>
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, reactive, toRefs, onMounted } from "vue";
+import Kq from '@/views/home/components/kq.vue';
+import Gjj from '@/views/home/components/gjj.vue';
 
-const list = ref([
-  {
-    content: "信息",
-    overTime: "时间"
-  },
-  {
-    content: "关于调拨出库的通知....",
-    overTime: "2024-03-11"
-  },
-  {
-    content: "关于调拨出库的通知....",
-    overTime: "2024-03-11"
-  },
-  {
-    content: "关于调拨出库的通知....",
-    overTime: "2024-03-11"
-  },
-  {
-    content: "关于调拨出库的通知....",
-    overTime: "2024-03-11"
-  }
-]);
+const data = reactive({
+  deptType: ""
+});
+
+let { deptType } = toRefs(data);
+
+
+  let deptObj: any = sessionStorage.getItem("userInfo");
+  deptType = deptObj ? JSON.parse(deptObj).deptType : "";
+onMounted(() => {
+});
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-card) {
-  width: 100%;
-  height: 100%;
-  .card-header {
-    height: 60px;
-    font-size: 30px;
-    line-height: 60px;
-    font-weight: bolder;
-  }
-  .el-card__body {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding-top: 100px;
-    font-size: 20px;
-    .content_item {
-      width: 50%;
-      height: 80px;
-      display: flex;
-      justify-content: space-between;
-      &:nth-child(1) {
-        font-weight: bolder;
-      }
-      & > div {
-        min-width: 200px;
-        text-align: center;
-      }
-    }
-  }
-}
+
 </style>