前端

src/views/warehouse/costmanagement.vue

@@ -151,6 +151,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
+      currentPage:1,
       warehouseType: '1',
       // 提交类型
       submitType: true,
@@ -189,7 +190,8 @@ export default {
       this.$router.push({ path: 'warehouselocation'})
     },
      weightedsubsidiary(){
-      this.$router.push({ path: 'weightedsubsidiary'  })
+       console.log(this.cangid)
+      this.$router.push({ path: 'weightedsubsidiary',query:{cangId:this.cangid}  })
     },
     warehouseNameChange(e) {
       for(let i = 0 ; i < this.warehouseList1.length; i++){

src/views/warehouse/warehouselocation.vue

@@ -235,6 +235,7 @@ export default {
       id:0,
       warehouseName: '',
       warehouseId:'',
+      start:2021,
       forbidden:false,
       forbidden1:false,
       addvisible:false,
@@ -257,13 +258,13 @@ export default {
   activated() {
 
       this.year=new Date().getFullYear()
-      for(var i=2021;i<=this.year;i++){
+      for(var i=this.start;i<=this.year;i++){
           this.yearList.push({value:i})
       }
       if(this.year>=new Date().getFullYear()){
           this.forbidden1=true
       }
-      if(this.year<=2021){
+      if(this.year<=this.start){
           this.forbidden=true
       }
     this.selectWarehouse()
@@ -306,7 +307,7 @@ export default {
     },
     minus(){
 
-        if(this.year<=2021){
+        if(this.year<=this.start){
             this.forbidden=true
         }else{
             this.year--

src/views/warehouse/weightedsubsidiary.vue

@@ -209,6 +209,7 @@ export default {
       warehouseId:'',
       forbidden:false,
       forbidden1:false,
+      start:2021,
       addvisible:false,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -227,6 +228,7 @@ export default {
     }
   },
   activated() {
+    this.cangid=this.$route.query.cangId
 // 货名
       // packList({ constId: 'CON2' })
       //   .toPromise()
@@ -234,13 +236,13 @@ export default {
       //     this.goodnameList = response
       //   })
       this.year=new Date().getFullYear()
-      for(var i=2021;i<=this.year;i++){
+      for(var i=this.start;i<=this.year;i++){
           this.yearList.push({value:i})
       }
       if(this.year>=new Date().getFullYear()){
           this.forbidden1=true
       }
-      if(this.year<=2021){
+      if(this.year<=this.start){
           this.forbidden=true
       }
     this.selectWarehouse()
@@ -266,7 +268,7 @@ export default {
     },
     minus(){
 
-        if(this.year<=2021){
+        if(this.year<=this.start){
             this.forbidden=true
         }else{
             this.year--