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

liuyg

2021-04-13 a944f9e41effdbab16addf349b2de4838c36f0bb

 src/views/parcel/parcel.vue

@@ -33,6 +33,15 @@
        </el-button>
      </template> -->

      <template slot="menuLeft">
          <el-button type="warning"
                      size="small"
                      plain
                      icon="el-icon-download"
                      @click="handleExport">导出
          </el-button>
        </template>

    </avue-crud>
    <template>
      <div>
@@ -277,6 +286,16 @@
           }
         }
      },
      //数据导出
      handleExport() {
        this.$confirm("是否导出用户数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          window.open(`/api/blade-jfpts/parcel/parcel/export-parcel?startTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&decisioDiagramResult=${this.$route.query.decisioDiagramResult}`);
        });
      },
      onLoad(page, params = {}) {
        const { dateTime } = this.query;
        let values = {