Sfoglia il codice sorgente

添加搜索返回后保留搜索条件的效果 ---cjh

17767204043 3 anni fa
parent
commit
bf8a5e7411

+ 24 - 8
src/routerMap/index.js

@@ -539,6 +539,7 @@ const routerMap = [
     name: "Approvallist", //审批-->审批列表
     meta: {
       index: 4,
+      keepAlive:true
     },
     component: (resolve) => require(["@/views/Approval/list"], resolve),
   },
@@ -710,7 +711,7 @@ const routerMap = [
     name: "BidSystemContractList", // 报价系统→工装订单→列表页
     meta: {
       index: 3,
-      // keepAlive: true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/BidSystem/ContractList/list"], resolve),
@@ -846,7 +847,7 @@ const routerMap = [
     name: "BidSystemProductDeOrder", // 报价系统→生产拆单
     meta: {
       index: 3,
-      // keepAlive: true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/BidSystem/ProductDeOrder/list"], resolve),
@@ -1102,7 +1103,7 @@ const routerMap = [
     name: "RequisitionOrderList", //采购模块-->请购单列表(现改称采购计划)
     meta: {
       index: 3,
-      // keepAlive: true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/RequisitionOrder/list"], resolve),
@@ -1121,6 +1122,7 @@ const routerMap = [
     name: "extraCostsList", //采购模块-->项目杂费
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/extraCosts/list"], resolve),
@@ -1148,7 +1150,7 @@ const routerMap = [
     name: "PurchasingOrderList", //采购模块-->采购单列表
     meta: {
       index: 3,
-      // keepAlive: true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/PurchasingOrder/list"], resolve),
@@ -1168,6 +1170,7 @@ const routerMap = [
     name: "ArrivalOrderList", //采购模块-->到货单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/ArrivalOrder/list"], resolve),
@@ -1186,6 +1189,7 @@ const routerMap = [
     name: "QualitycontrolOrderList", //采购模块-->到货单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/QualitycontrolOrder/list"], resolve),
@@ -1205,6 +1209,7 @@ const routerMap = [
     name: "InstockOrderList", //采购模块-->入库单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/InstockOrder/list"], resolve),
@@ -1214,6 +1219,7 @@ const routerMap = [
     name: "redFontInstockOrderList", //采购模块-->红字入库单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/redFontInstockOrder/list"], resolve),
@@ -1241,6 +1247,7 @@ const routerMap = [
     name: "redFontOutstockOrderList", //采购模块-->红字出库单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/redFontOutstockOrder/list"], resolve),
@@ -1286,6 +1293,7 @@ const routerMap = [
     name: "OutstockOrderList", //采购模块-->出库单列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/OutstockOrder/list"], resolve),
@@ -1313,6 +1321,7 @@ const routerMap = [
     name: "ProductionInWarehouseList", //供应链管理-->生产入库列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/ProductionInWarehouse/list"], resolve),
@@ -1322,6 +1331,7 @@ const routerMap = [
     name: "DeliveryOutWarehouseList", //供应链管理-->发货出库列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/DeliveryOutWarehouse/list"], resolve),
@@ -1690,7 +1700,7 @@ const routerMap = [
     name: "RoomList", //房间列表
     meta: {
       index: 3,
-      // keepAlive:true
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/roomList/list"], resolve),
@@ -1718,7 +1728,7 @@ const routerMap = [
     name: "Ironware", //码单五金列表
     meta: {
       index: 3,
-      // keepAlive:true
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/Ironware/list"], resolve),
@@ -1738,7 +1748,7 @@ const routerMap = [
     name: "WeightMemo", //码单列表
     meta: {
       index: 3,
-      // keepAlive:true
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/weightMemo/list"], resolve),
@@ -1766,7 +1776,7 @@ const routerMap = [
     name: "matchList", //匹配列表-->列表
     meta: {
       index: 3,
-      // keepAlive:true
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/MatchList/matchList"], resolve),
@@ -2112,6 +2122,7 @@ const routerMap = [
     name: "AgreementList", //合同-->合同列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/Agreement/list"], resolve),
@@ -2130,6 +2141,7 @@ const routerMap = [
     name: "MatchList", //合同-->匹配-->匹配列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/Agreement/match/list"], resolve),
@@ -2157,6 +2169,7 @@ const routerMap = [
     name: "deepenList", //合同-->合同列表-->深化单-->列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/Agreement/deepen/list"], resolve),
@@ -2175,6 +2188,7 @@ const routerMap = [
     name: "SealApproveList", //印章审批列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/SealApprove/list"], resolve),
@@ -2193,6 +2207,7 @@ const routerMap = [
     name: "PayrollRequisitionList", //采购请款单-->列表
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/PayrollRequisition/list"], resolve),
@@ -2220,6 +2235,7 @@ const routerMap = [
     name: "productMessageList", //生产通知单
     meta: {
       index: 3,
+      keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/Agreement/productMessage/list"], resolve),

+ 10 - 0
src/views/Agreement/deepen/list.vue

@@ -113,6 +113,16 @@ export default {
                     break;
             }
         }
+    },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/Agreement/deepen/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
     }
 }
 </script>

+ 10 - 0
src/views/Agreement/list.vue

@@ -174,7 +174,17 @@ export default {
              this.initData(this.proxyData)
         }
 
+    },
+      beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/Agreement/edit"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
     }
+      }
 }
 </script>
 <style lang="scss" scoped>

+ 10 - 0
src/views/Agreement/match/list.vue

@@ -171,6 +171,16 @@ export default {
   computed: {},
   // 监控data中的数据变化
   watch: {},
+  beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/Agreement/match/matching"  || to.path == "/cms/Agreement/match/check"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
   beforeCreate() {}, // 生命周期 - 创建之前
   beforeMount() {}, // 生命周期 - 挂载之前
   beforeUpdate() {}, // 生命周期 - 更新之前

+ 10 - 0
src/views/Agreement/productMessage/list.vue

@@ -86,6 +86,16 @@ export default {
         handleSet(row){
             this.$router.push({path:'/cms/Agreement/productMessage/confirm',query:{order_no:row.order_no}})
         }
+    },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/Agreement/productMessage/confirm"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
     }
 }
 </script>

+ 12 - 1
src/views/Approval/list.vue

@@ -247,7 +247,18 @@ export default {
         }
       })
     },
-  }
+  },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/approval/examine" || to.path == "/cms/BidSystem/ContractList/requisitionDetail" || to.path == "/cms/BidSystem/ContractList/purchaseDetail" ||
+        to.path == "/cms/BidSystem/ContractList/arrivalDetail" || to.path == "/cms/BidSystem/ContractList/qualitytestingDetail"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
 }
 </script>
 

+ 17 - 7
src/views/BidSystem/ContractList/list.vue

@@ -1,16 +1,26 @@
 <template>
-  <div style="height:92%">
-    <BSTList v-if="true"/>
+  <div style="height: 92%">
+    <BSTList v-if="true" />
     <OldList v-else />
   </div>
 </template>
 <script>
-import OldList from '@/views/BidSystem/ContractList/oldList'
-import BSTList from '@/views/BidSystem/ContractList/BSTList'
+import OldList from "@/views/BidSystem/ContractList/oldList";
+import BSTList from "@/views/BidSystem/ContractList/BSTList";
 export default {
-  components:{
+  components: {
     OldList,
-    BSTList
+    BSTList,
   },
-}
+  beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/BidSystem/ContractList/edit"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
+};
 </script>

+ 14 - 2
src/views/BidSystem/ProductDeOrder/list.vue

@@ -35,7 +35,7 @@
           icon="md-return-left"
           style="margin-right: 10px"
           >导出</Button
-        > 
+        >
         <!-- <Button
           @click="gopage()"
           type="primary"
@@ -85,7 +85,7 @@
           >
           <a style="margin: 0 5px" @click="handleSet(row, index, 3)">详情</a>
           <a
-            style="margin: 0 5px;"
+            style="margin: 0 5px"
             :disabled="row.sub_status != 2"
             :style="row.sub_status != 2 ? 'margin: 0 5px;' : 'margin: 0 5px;'"
             @click="handleSet(row, index, 4)"
@@ -530,6 +530,18 @@ export default {
   },
   // 监控data中的数据变化
   watch: {},
+  beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/BidSystem/ProductDeOrder/detail" ||
+      to.path == "/cms/BidSystem/ProductDeOrder/infodetail" ||
+      to.path == "/cms/BidSystem/ProductDeOrder/budget"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
   beforeCreate() {}, // 生命周期 - 创建之前
   beforeMount() {}, // 生命周期 - 挂载之前
   beforeUpdate() {}, // 生命周期 - 更新之前

+ 11 - 1
src/views/PayrollRequisition/list.vue

@@ -434,7 +434,17 @@ export default {
           
         }
 
-    }
+    },
+      beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PayrollRequisition/edit" || to.path == "/cms/PayrollRequisition/detail"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
 }
 </script>
 <style lang="scss" scoped>

+ 10 - 0
src/views/ProductionOrderList/ProductionPlanlist/list.vue

@@ -20,6 +20,16 @@ export default {
       next((vm) => {});
     }
   },
+  beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/productionorderlist/productionplanlist/details"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
 };
 </script>
 <style scoped>

+ 10 - 0
src/views/PurchasingManage/ArrivalOrder/list.vue

@@ -266,6 +266,16 @@ export default {
          }
        })
   },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/ArrivalOrder/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))

+ 10 - 0
src/views/PurchasingManage/DeliveryOutWarehouse/list.vue

@@ -113,6 +113,16 @@ export default {
       this.initData(this.proxyData);
     },
   },
+    beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/PurchasingManage/DeliveryOutWarehouse/detail"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>

+ 10 - 0
src/views/PurchasingManage/InstockOrder/list.vue

@@ -265,6 +265,16 @@ export default {
      // 获取供应商列表
     this.axios({ method: 'get', url: '/api/supply_list', }).then((res) => { this.suppliersList = res.data.data }).catch((err) => { });
   },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/InstockOrder/detail" || to.path == "/cms/PurchasingManage/InstockOrder/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
     this.initData()

+ 24 - 9
src/views/PurchasingManage/OutstockOrder/list.vue

@@ -231,9 +231,7 @@ export default {
       supplierTitle: "",
       suppliersList: [],
       warehouseList: [],
-      purchaseTypeList: [
-     
-      ],
+      purchaseTypeList: [],
       searchData: {
         order_out_no: "",
         type: "",
@@ -326,14 +324,22 @@ export default {
   // 生命周期 - 创建完成(可以访问当前this实例)
   created() {
     //获取出库类型
-    this.axios({ method: 'get', url: '/api/basic_purchase_list',params:{type_id:3} }).then((res) => { this.purchaseTypeList = res.data.data }).catch((err) => { });
+    this.axios({
+      method: "get",
+      url: "/api/basic_purchase_list",
+      params: { type_id: 3 },
+    })
+      .then((res) => {
+        this.purchaseTypeList = res.data.data;
+      })
+      .catch((err) => {});
     // 获取操作员
     this.axios("/api/user").then((res) => (this.userList = res.data.data));
     // 获取仓库列表
     this.axios({ method: "get", url: "/api/warehouse" })
       .then((res) => {
-        this.warehouseList = res.data.filter(v=>{
-          return v.type_id==1
+        this.warehouseList = res.data.filter((v) => {
+          return v.type_id == 1;
         });
       })
       .catch((err) => {});
@@ -350,9 +356,7 @@ export default {
   },
   methods: {
     supplyChange(e) {
-    
-          this.supplierTitle = e;
-        
+      this.supplierTitle = e;
     },
     initData() {
       let obj = JSON.parse(JSON.stringify(this.searchData));
@@ -478,6 +482,17 @@ export default {
   computed: {},
   // 监控data中的数据变化
   watch: {},
+  beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/PurchasingManage/OutstockOrder/detail" ||
+      to.path == "/cms/PurchasingManage/OutstockOrder/edit"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
   beforeCreate() {}, // 生命周期 - 创建之前
   beforeMount() {}, // 生命周期 - 挂载之前
   beforeUpdate() {}, // 生命周期 - 更新之前

+ 10 - 0
src/views/PurchasingManage/ProductionInWarehouse/list.vue

@@ -114,6 +114,16 @@ export default {
       this.initData(this.proxyData);
     },
   },
+    beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/PurchasingManage/ProductionInWarehouse/detail" 
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>

+ 10 - 0
src/views/PurchasingManage/PurchasingOrder/list.vue

@@ -310,6 +310,16 @@ export default {
           }
           })
   },
+  beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/PurchasingOrder/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))

+ 10 - 0
src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -280,6 +280,16 @@ export default {
           }
           })
 },
+  beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/qualitycontrolOrder/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))

+ 10 - 0
src/views/PurchasingManage/RequisitionOrder/list.vue

@@ -265,6 +265,16 @@ export default {
       }
         })
   },
+  beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/RequisitionOrder/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   methods: {
     initData () {
       this.searchData.start_time = parseInt(new Date(this.searchData.time[2]).getTime() / 1000) || ''

+ 11 - 1
src/views/PurchasingManage/extraCosts/list.vue

@@ -286,7 +286,17 @@ export default {
           
         }
 
-    }
+    },
+      beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/extraCosts/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
 }
 </script>
 <style lang="scss" scoped>

+ 10 - 0
src/views/PurchasingManage/redFontInstockOrder/list.vue

@@ -251,6 +251,16 @@ export default {
       userList: [],
     }
   },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/PurchasingManage/redFontInstockOrder/edit" || to.path == "/cms/PurchasingManage/redFontInstockOrder/detail"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
   // 生命周期 - 创建完成(可以访问当前this实例)
   created () {
     //获取入库类型

+ 11 - 0
src/views/PurchasingManage/redFontOutstockOrder/list.vue

@@ -377,6 +377,17 @@ export default {
       this.initData()
     }
   },
+    beforeRouteLeave(to, from, next) {
+    if (
+      to.path == "/cms/PurchasingManage/redFontOutstockOrder/detail" ||
+      to.path == "/cms/PurchasingManage/redFontOutstockOrder/edit"
+    ) {
+      next();
+    } else {
+      from.meta.keepAlive = false;
+      next();
+    }
+  },
   // 监听属性 类似于data概念
   computed: {},
   // 监控data中的数据变化

+ 10 - 1
src/views/SealApprove/list.vue

@@ -381,8 +381,17 @@ export default {
                  this.$router.push({path:'/cms/SealApprove/edit',query:{type,seal_no:row.seal_no,state:row.state}})
             }
           
+        },
+        beforeRouteLeave(to, from, next) {
+          if (
+            to.path == "/cms/SealApprove/edit"
+          ) {
+            next();
+          } else {
+            from.meta.keepAlive = false;
+            next();
+          }
         }
-
     }
 }
 </script>

+ 10 - 0
src/views/leadMatch/Ironware/list.vue

@@ -109,6 +109,16 @@ export default {
             this.pageSize = e;
             this.initData(this.proxyData);
         }
+    },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/leadMatch/Ironware/edit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
     }
 }
 </script>

+ 14 - 0
src/views/leadMatch/MatchList/matchList.vue

@@ -19,6 +19,20 @@ export default {
                this.type = res.data;
        })
     },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/leadMatch/MatchList/BSTMatchPage" || 
+        to.path == "/cms/leadMatch/MatchList/BSTMatchCheck" ||
+        to.path == "/cms/leadMatch/MatchList/HXYMatchCheck" || 
+        to.path == "/cms/leadMatch/MatchList/HXYMatchPage" ||
+        to.path == "/cms/leadMatch/MatchList/NewHXYMatchPage"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
     components:{
         BSTList,
         HXYList

+ 11 - 0
src/views/leadMatch/roomList/list.vue

@@ -19,6 +19,17 @@ export default {
                this.type = res.data;
        })
     },
+     beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/leadMatch/roomList/HXYedit" || 
+        to.path == "/cms/leadMatch/roomList/BSTedit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
     components:{
         BSTList,
         HXYList

+ 10 - 0
src/views/leadMatch/weightMemo/list.vue

@@ -19,6 +19,16 @@ export default {
                this.type = res.data;
        })
     },
+    beforeRouteLeave(to, from, next) {
+      if (
+        to.path == "/cms/leadMatch/weightMemo/HXYedit" || to.path == "/cms/leadMatch/weightMemo/BSTedit"
+      ) {
+        next();
+      } else {
+        from.meta.keepAlive = false;
+        next();
+      }
+    },
     components:{
         BSTList,
         HXYList