|  | @@ -13,6 +13,8 @@
 | 
	
		
			
				|  |  |          @row-save="rowSave"
 | 
	
		
			
				|  |  |          ref="crud"
 | 
	
		
			
				|  |  |          :key="key"
 | 
	
		
			
				|  |  | +        :page.sync="page"
 | 
	
		
			
				|  |  | +        @on-load="onLoad"
 | 
	
		
			
				|  |  |          @selection-change="selectionChange"
 | 
	
		
			
				|  |  |          @row-update="rowUpdate"
 | 
	
		
			
				|  |  |          @resetColumn="resetColumn('crud','option','optionBack',codeValue)"
 | 
	
	
		
			
				|  | @@ -69,7 +71,7 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -import {tradingBoxFees,generateBill, revokeBill} from "@/api/boxManagement";
 | 
	
		
			
				|  |  | +import {tradingBoxFees,generateBill, revokeBill, tradingBoxFeesList} from "@/api/boxManagement";
 | 
	
		
			
				|  |  |  import reportDialog from "@/components/report-dialog/main.vue";
 | 
	
		
			
				|  |  |  import {getParities} from "@/api/basicData/customerInquiry";
 | 
	
		
			
				|  |  |  import {dateFormat} from "@/util/date";
 | 
	
	
		
			
				|  | @@ -84,6 +86,12 @@ export default {
 | 
	
		
			
				|  |  |        reportName: '',
 | 
	
		
			
				|  |  |        option: {},
 | 
	
		
			
				|  |  |        optionBack: {},
 | 
	
		
			
				|  |  | +        page: {
 | 
	
		
			
				|  |  | +            pageSize: 20,
 | 
	
		
			
				|  |  | +            currentPage: 1,
 | 
	
		
			
				|  |  | +            total: 0,
 | 
	
		
			
				|  |  | +            pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
 | 
	
		
			
				|  |  | +        },
 | 
	
		
			
				|  |  |        leaseIn: {
 | 
	
		
			
				|  |  |          align: 'center',
 | 
	
		
			
				|  |  |          index: true,
 | 
	
	
		
			
				|  | @@ -614,15 +622,27 @@ export default {
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    watch: {
 | 
	
		
			
				|  |  |      listData(newVla, oldVal) {
 | 
	
		
			
				|  |  | -      this.data_one = newVla.filter(item => item.feesType === 1); //应收
 | 
	
		
			
				|  |  | -      this.data_two = newVla.filter(item => item.feesType === 2); //应付
 | 
	
		
			
				|  |  | -      if (this.activeNameTwo === "first") {
 | 
	
		
			
				|  |  | -        this.dataList = this.data_one;
 | 
	
		
			
				|  |  | -      } else {
 | 
	
		
			
				|  |  | -        this.dataList = this.data_two;
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -      this.key++
 | 
	
		
			
				|  |  | +        console.log(this.listData,625)
 | 
	
		
			
				|  |  | +      // this.data_one = newVla.filter(item => item.feesType === 1); //应收
 | 
	
		
			
				|  |  | +      // this.data_two = newVla.filter(item => item.feesType === 2); //应付
 | 
	
		
			
				|  |  | +        this.tradingBoxFeesListfun(1)
 | 
	
		
			
				|  |  | +        this.tradingBoxFeesListfun(2)
 | 
	
		
			
				|  |  | +        // console.log(this.data_one,'one')
 | 
	
		
			
				|  |  | +        // console.log(this.data_two,'two')
 | 
	
		
			
				|  |  | +      // if (this.activeNameTwo === "first") {
 | 
	
		
			
				|  |  | +      //   this.dataList = this.data_one;
 | 
	
		
			
				|  |  | +      // } else {
 | 
	
		
			
				|  |  | +      //   this.dataList = this.data_two;
 | 
	
		
			
				|  |  | +      // }
 | 
	
		
			
				|  |  | +      // this.key++
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +      "page.currentPage":{
 | 
	
		
			
				|  |  | +          handler(newVla,oldVal) {
 | 
	
		
			
				|  |  | +              console.log(newVla,640)
 | 
	
		
			
				|  |  | +              this.tradingBoxFeesListfun(1)
 | 
	
		
			
				|  |  | +              this.tradingBoxFeesListfun(2)
 | 
	
		
			
				|  |  | +          },
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  |      "option.menu":{
 | 
	
		
			
				|  |  |        handler(newVla,oldVal) {
 | 
	
		
			
				|  |  |          if (newVla !== oldVal) {
 | 
	
	
		
			
				|  | @@ -741,6 +761,37 @@ export default {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | +      onLoad(page, params = {}){
 | 
	
		
			
				|  |  | +          console.log(page,757)
 | 
	
		
			
				|  |  | +          this.page.currentPage = page.currentPage
 | 
	
		
			
				|  |  | +          this.page.pageSize = page.pageSize
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  | +      // 租出,租入,卖箱,买箱的接口
 | 
	
		
			
				|  |  | +      tradingBoxFeesListfun(feesType){
 | 
	
		
			
				|  |  | +          tradingBoxFeesList({
 | 
	
		
			
				|  |  | +              current: this.page.currentPage,
 | 
	
		
			
				|  |  | +              size: this.page.pageSize,
 | 
	
		
			
				|  |  | +              pid:this.id,
 | 
	
		
			
				|  |  | +              feesType:feesType
 | 
	
		
			
				|  |  | +          }).then(res=>{
 | 
	
		
			
				|  |  | +              if (feesType == 1) {
 | 
	
		
			
				|  |  | +                  this.data_one = res.data.data.records
 | 
	
		
			
				|  |  | +                  this.page.total = res.data.data.total
 | 
	
		
			
				|  |  | +              }else {
 | 
	
		
			
				|  |  | +                  console.log(res.data.data,755)
 | 
	
		
			
				|  |  | +                  this.data_two = res.data.data.records
 | 
	
		
			
				|  |  | +                  this.page.total = res.data.data.total
 | 
	
		
			
				|  |  | +              }
 | 
	
		
			
				|  |  | +              console.log(this.data_one,'one')
 | 
	
		
			
				|  |  | +              console.log(this.data_two,'two')
 | 
	
		
			
				|  |  | +              if (this.activeNameTwo === "first") {
 | 
	
		
			
				|  |  | +                  this.dataList = this.data_one;
 | 
	
		
			
				|  |  | +              } else {
 | 
	
		
			
				|  |  | +                  this.dataList = this.data_two;
 | 
	
		
			
				|  |  | +              }
 | 
	
		
			
				|  |  | +              this.key++
 | 
	
		
			
				|  |  | +          })
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  |      //生成账单
 | 
	
		
			
				|  |  |      generateBill(){
 | 
	
		
			
				|  |  |        this.$confirm("您确定要生成账单吗?", {
 |