Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-09 4f11d6a54ade61ba7daf8ba856014d2f8994badf

 src/views/parcel/parcel.vue

@@ -76,6 +76,7 @@
        form: {},
        query: {},
        showViewer: false, // 显示查看器
        activeClass: 0,
        imgUrl:'',
        loading: true,
        page: {
@@ -87,11 +88,10 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          activeClass: 3,
          border: false,
          stripe:true,
          index: true,
@@ -239,6 +239,7 @@
        this.query = {};
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.activeClass=0;
        this.onLoad(this.page);
      },
      searchChange(params, done) {
@@ -298,7 +299,7 @@
      },
      //数据导出
      handleExport() {
        this.$confirm("是否导出用户数据?", "提示", {
        this.$confirm("是否导出包裹数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
@@ -308,18 +309,12 @@
      },
      //数据报表导出
      handleExportStatis() {
        this.$confirm("是否导出包裹报表数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          let startTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
          let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
          let decisioDiagramResult = this.$route.query.decisioDiagramResult==undefined? '':this.$route.query.decisioDiagramResult;
          let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
          //window.open(`http://localhost:8108/ureport/excel?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
          window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
        });
      },
      onLoad(page, params = {}) {
        const { dateTime } = this.query;
@@ -341,6 +336,7 @@
                decisioDiagramResult:this.$route.query.decisioDiagramResult
              };
            }
            this.activeClass=4;
        }else{
            if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
              this.page.currentPage = 1;
@@ -348,6 +344,23 @@
                startTime:this.$route.query.startTime,
                endTime:this.$route.query.endTime
              }
              this.activeClass=4;
            }

            if(this.activeClass==0){
              this.page.currentPage = 1;
              // 当前时间
              var date = new Date();
              //年
              var Y = date.getFullYear();
              //月
              var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
              //日
              var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
              params = {
                startTime:Y + "-" + M + "-" + D + " 00:00:00",
                endTime:Y +"-" +M +"-" + D +  " 23:59:59"
              }
            }
        }