Merge remote-tracking branch 'origin/master'

4 months ago · a789ef7f6c
12 changed files with 248 additions and 8 deletions
--- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
@ -98,6 +98,16 @@ export default {
      method: 'get'
    })
  },
+  // 导出
+  downloadExcel: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatecheckapply/excelList',
+      method: 'post',
+      params: data,
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
  createPdf: function(data) {
    return request({
      url: '/scm/v1/scmvehrebatecheckapply/createPdf',
--- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
@ -51,6 +51,16 @@ export default {
      method: 'get'
    })
  },
+  // 导出
+  downloadExcel: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebatewith/excelList',
+      method: 'post',
+      params: data,
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
  createPdf: function(data) {
    return request({
      url: '/scm/v1/scmvehrebatewithapply/createPdf',
--- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
+++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
@ -98,6 +98,16 @@ export default {
      method: 'get'
    })
  },
+  // 导出
+  downloadExcel: function(data) {
+    return request({
+      url: '/scm/v1/scmspecialrebatecheckapply/excelList',
+      method: 'post',
+      params: data,
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
  createPdf: function(data) {
    return request({
      url: '/scm/v1/scmspecialrebatecheckapply/createPdf',
--- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js
+++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js
@ -51,6 +51,16 @@ export default {
      method: 'get'
    })
  },
+  // 导出
+  downloadExcel: function(data) {
+    return request({
+      url: '/scm/v1/scmspecialrebatewith/excelList',
+      method: 'post',
+      params: data,
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
  createPdf: function(data) {
    return request({
      url: '/scm/v1/scmspecialrebatewithapply/createPdf',
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
        </div>
@ -184,6 +184,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '单车返利核对明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ vehCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
        </div>
@ -163,6 +163,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '单车返利预提明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ vehWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
        </div>
@ -183,6 +183,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '专项返利核对明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ specialCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
        </div>
@ -191,6 +191,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '专项返利预提明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ specialWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
        </div>
@ -220,6 +220,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '单车返利核对明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ vehCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
        </div>
@ -155,6 +155,31 @@ export default {
    resetState() {
      this.viewState = 1
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '单车返利预提明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ vehWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
        </div>
@ -219,6 +219,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '专项返利核对明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ specialCheckSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue
@ -7,7 +7,7 @@
        <div>{{ viewTitle }}</div>
        <!--start 添加修改按钮-->
        <div>
-          <el-button type="primary" size="small">导出</el-button>
+          <el-button type="primary" size="small" @click="doExport">导出</el-button>
          <el-button type="primary" size="small" @click="download">下载</el-button>
          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
        </div>
@ -226,6 +226,31 @@ export default {
      })
      return sums
    },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel({ sid: this.formobj.sid }).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '专项返利预提明细' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
    download() {
      req.createPdf({ specialWithSid: this.formobj.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
        if (resp.success && resp.data !== '') {