优化

src/router/Routermethods.ts

@@ -35,8 +35,10 @@ export function setTitle(title: string) {
   document.title = title;
 }
 
-// 移除选中tag，如果是最后一个则打开前一个tag
-export function closeTagOrOpenLastTag(value: string) {
-  console.log(store.getters.tagList);
-  store.getters.tagList;
+// 移除当前tag，则打开最后一个tag
+export function closeTagAndOpenLastTag() {
+  store.commit("DEL_TAG", store.getters.tag);
+  router.push({
+    path: store.getters.tagList[store.getters.tagList.length - 1].value
+  });
 }

src/router/index.ts

@@ -22,24 +22,24 @@ const routes: Array<RouteRecordRaw> = [
         path: "outWarehouseInfoDetail",
         name: "outWarehouseInfoDetail",
         component: () => import("@/views/InformationFilling/outWarehouseInfo/detail.vue"),
-        props(route){
-          return route.query
+        props(route) {
+          return route.query;
         }
       },
       {
         path: "enterWarehouseInfoDetail",
         name: "enterWarehouseInfoDetail",
         component: () => import("@/views/InformationFilling/enterWarehouseInfo/detail.vue"),
-        props(route){
-          return route.query
+        props(route) {
+          return route.query;
         }
       },
       {
         path: "outIssueDetail",
         name: "outIssueDetail",
         component: () => import("@/views/InformationFilling/outIssue/detail.vue"),
-        props(route){
-          return route.query
+        props(route) {
+          return route.query;
         }
       }
     ]
@@ -54,20 +54,20 @@ const routes: Array<RouteRecordRaw> = [
         path: "outWarehouseAuditDetail",
         name: "outWarehouseAuditDetail",
         component: () => import("@/views/InformationAudit/outWarehouseAudit/detail.vue"),
-        props(route){
-          return route.query
+        props(route) {
+          return route.query;
         }
       },
       {
         path: "enterWarehouseAuditDetail",
         name: "enterWarehouseAuditDetail",
         component: () => import("@/views/InformationAudit/enterWarehouseAudit/detail.vue"),
-        props(route){
-          return route.query
+        props(route) {
+          return route.query;
         }
       }
     ]
-  },
+  }
 ];
 
 const baseRoutes: Array<RouteRecordRaw> = [

src/store/getters.ts

@@ -2,6 +2,7 @@ export default {
   access_token: (state: any) => state.user.access_token,
   refresh_token: (state: any) => state.user.refresh_token,
   menu: (state: any) => state.user.menu,
+  userInfo: (state: any) => state.user.userInfo,
 
   tag: (state: any) => state.tag.tag,
   tagWel: (state: any) => state.tag.tagWel,

src/store/modules/user.ts

@@ -148,7 +148,10 @@ export default {
         getUserInfo()
           .then((res) => {
             const data = res.data || {};
-            commit("SET_USER_INFO", data.sysUser);
+            const userInfo = data.sysUser;
+            userInfo.deptName = data.deptName;
+            userInfo.deptType = data.deptType;
+            commit("SET_USER_INFO", userInfo);
             commit("SET_ROLES", data.roles || []);
             commit("SET_PERMISSIONS", data.permissions || []);
             resolve(data.sysUser);

src/views/dataStatistics/droughtResistant/index.vue

@@ -3,14 +3,14 @@
   <basic-container>
     <el-form class="whole_form">
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
           <el-form-item label="省份">
             <el-select v-model="searchList.provinceDeptIdList" clearable multiple @change="getSupplies">
               <el-option v-for="item in cityList" :key="item.deptId" :label="item.name" :value="item.deptId" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
           <el-form-item label="储备仓库">
             <el-select
               v-model="searchList.deptIdList"
@@ -28,6 +28,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="userInfo.deptType === '2'">
+          <el-form-item label="储备仓库">
+            <el-select v-model="searchList.deptIdList" clearable multiple placeholder="请选择储备仓库">
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.deptId"
+                :label="item.abbreviationName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="物资类别">
             <el-select v-model="searchList.dmUpcode1List" clearable multiple>
@@ -70,6 +82,7 @@
 import { ref } from "vue";
 
 import { handleTree } from "@/utils/util";
+import { useGetters } from "@/hooks/storeHooks";
 import {
   getDroughtResistantHeader,
   getDroughtResistantList,
@@ -91,12 +104,23 @@ const cityList: any = ref([]);
 const warehouseList: any = ref([]);
 const suppliesList: any = ref([]);
 
-// 获取省份列表
-getCityList({ deptType: 2 }).then((res: any) => {
-  if (res.code === 0) {
-    cityList.value = res.data;
-  }
-});
+const { userInfo } = useGetters(["userInfo"]);
+
+if (userInfo.value.deptType === "1") {
+  // 获取省份列表
+  getCityList({ deptType: 2 }).then((res: any) => {
+    if (res.code === 0) {
+      cityList.value = res.data;
+    }
+  });
+} else {
+  // 获取储备仓库
+  getCityList({ parentIdList: [userInfo.value.deptId] }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+    }
+  });
+}
 
 // 根据省份列表获取储备仓库
 const getSupplies = (value: string[]) => {

src/views/dataStatistics/reliefMaterial/index.vue

@@ -3,14 +3,14 @@
   <basic-container>
     <el-form class="whole_form">
       <el-row :gutter="20">
-        <el-col :span="6">
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
           <el-form-item label="省份">
             <el-select v-model="searchList.provinceDeptIdList" clearable multiple @change="getSupplies">
               <el-option v-for="item in cityList" :key="item.deptId" :label="item.name" :value="item.deptId" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="6" v-if="userInfo.deptType === '1'">
           <el-form-item label="储备仓库">
             <el-select
               v-model="searchList.deptIdList"
@@ -28,6 +28,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="userInfo.deptType === '2'">
+          <el-form-item label="储备仓库">
+            <el-select v-model="searchList.deptIdList" clearable multiple placeholder="请选择储备仓库">
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.deptId"
+                :label="item.abbreviationName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="物资类别">
             <el-select v-model="searchList.dmUpcode1List" clearable multiple>
@@ -70,6 +82,7 @@
 import { ref } from "vue";
 
 import { handleTree } from "@/utils/util";
+import { useGetters } from "@/hooks/storeHooks";
 import {
   getDroughtResistantHeader,
   getDroughtResistantList,
@@ -86,12 +99,23 @@ const cityList: any = ref([]);
 const warehouseList: any = ref([]);
 const suppliesList: any = ref([]);
 
-// 获取省份列表
-getCityList({ deptType: 2 }).then((res: any) => {
-  if (res.code === 0) {
-    cityList.value = res.data;
-  }
-});
+const { userInfo } = useGetters(["userInfo"]);
+
+if (userInfo.value.deptType === "1") {
+  // 获取省份列表
+  getCityList({ deptType: 2 }).then((res: any) => {
+    if (res.code === 0) {
+      cityList.value = res.data;
+    }
+  });
+} else {
+  // 获取储备仓库
+  getCityList({ parentIdList: [userInfo.value.deptId] }).then((res: any) => {
+    if (res.code === 0) {
+      warehouseList.value = res.data;
+    }
+  });
+}
 
 // 根据省份列表获取储备仓库
 const getSupplies = (value: string[]) => {