Merge remote-tracking branch 'origin/master'

1 month ago · 23977ba3d7
8 changed files with 124 additions and 22 deletions
--- a/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js
+++ b/anrui-riskcenter-ui/src/api/returntostorage/returntostorage.js
@ -41,6 +41,13 @@ export default {
      headers: { 'Content-Type': 'application/json' }
    })
  },
+  createPdf: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanReturnInboundApply/createPdf',
+      method: 'post',
+      params: data
+    })
+  },
  // 提交流程
  submit: function(params) {
    return request({
--- a/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js
+++ b/anrui-riskcenter-ui/src/api/returntothewarehouse/returntothewarehouse.js
@ -25,6 +25,13 @@ export default {
      params: data
    })
  },
+  createPdf: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanoutboundapply/createPdf',
+      method: 'post',
+      params: data
+    })
+  },
  // 提交流程
  submit: function(params) {
    return request({
--- a/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js
+++ b/anrui-riskcenter-ui/src/api/secondarysalesnotrecovery/secondarysalesnotrecovery.js
@ -40,6 +40,13 @@ export default {
      headers: { 'Content-Type': 'application/json' }
    })
  },
+  createPdf: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansecondarysalesnotapply/createPdf',
+      method: 'post',
+      params: data
+    })
+  },
  // 提交流程
  submit: function(params) {
    return request({
--- a/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue
+++ b/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue
@ -74,6 +74,7 @@
            <el-table-column label="操作" width="180px" align="center">
              <template slot-scope="scope">
                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState !='已办结'" @click="toDownload(scope.row)">下载</el-button>
                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
              </template>
            </el-table-column>
@ -458,6 +459,32 @@ export default {
      this.viewState = 4
      this.$refs['divInfo'].showInfo(row)
    },
+    toDownload(row) {
+      req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => {
+        if (res.success) {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '交回车辆入库申请单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '交回车辆入库申请单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+        }
+      }).catch(() => {})
+    },
    // 删除
    doDel() {
      if (this.sids.length === 0) {
--- a/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue
+++ b/anrui-riskcenter-ui/src/views/returntothewarehouse/returntothewarehouse.vue
@ -79,6 +79,7 @@
            <el-table-column label="操作" width="180px" align="center">
              <template slot-scope="scope">
                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState !='已办结'" @click="toDownload(scope.row)">下载</el-button>
                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
              </template>
            </el-table-column>
@ -338,6 +339,32 @@ export default {
      this.viewState = 4
      this.$refs['divInfo'].showInfo(row)
    },
+    toDownload(row) {
+      req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => {
+        if (res.success) {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '交回车辆出库申请单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '交回车辆出库申请单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+        }
+      }).catch(() => {})
+    },
    // 修改、编辑、详情返回列表页面
    resetState() {
      this.viewState = 1
--- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue
+++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue
@ -524,45 +524,45 @@ export default {
        this.formobj.loanSecondarySalesCost.otherCostAssume = ''
      }
    },
-    // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 - 催收费用 - 承担方为公司的各项费用
+    // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 + 催收费用 + 承担方为公司的各项费用
    lossPrice() {
      let money = '0'
-      money = parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)
+      money = Math.round((parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)) * 100) / 100
      // 车辆售价不等于空
      if (this.formobj.loanSecondarySalesCost.vehPrice !== '') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)
+        money = Math.round((parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)) * 100) / 100
      }
      // 催收费用不等于空
      if (this.formobj.loanSecondarySalesCost.collectionCost !== '') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)) * 100) / 100
      }
      // 资方结清费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.bankSettleCost !== '' && this.formobj.loanSecondarySalesCost.bankSettleCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)) * 100) / 100
      }
      // 车辆违章费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.vehicleViolationCost !== '' && this.formobj.loanSecondarySalesCost.vehicleViolationCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)) * 100) / 100
      }
      // 年检费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.inspectYearCost !== '' && this.formobj.loanSecondarySalesCost.inspectYearCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)) * 100) / 100
      }
      // 保险费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.insureCost !== '' && this.formobj.loanSecondarySalesCost.insureCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.insureCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.insureCost)) * 100) / 100
      }
      // 过户费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.ownershipCost !== '' && this.formobj.loanSecondarySalesCost.ownershipCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)) * 100) / 100
      }
      // 停车费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.stopCost !== '' && this.formobj.loanSecondarySalesCost.stopCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.stopCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.stopCost)) * 100) / 100
      }
      // 其他费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.otherCost !== '' && this.formobj.loanSecondarySalesCost.otherCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.otherCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.otherCost)) * 100) / 100
      }
      this.formobj.loanSecondarySalesCost.lossPrice = money
      return money
--- a/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue
+++ b/anrui-riskcenter-ui/src/views/secondarysalesnotrecovery/secondarysalesnotrecovery.vue
@ -66,6 +66,7 @@
            <el-table-column label="操作" width="180px" align="center">
              <template slot-scope="scope">
                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState !='已办结'" @click="toDownload(scope.row)">下载</el-button>
                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
              </template>
            </el-table-column>
@ -323,6 +324,32 @@ export default {
      this.viewState = 4
      this.$refs['divInfo'].showInfo(row)
    },
+    toDownload(row) {
+      req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => {
+        if (res.success) {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '二次销售车辆不追偿申请单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '二次销售车辆不追偿申请单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+        }
+      }).catch(() => {})
+    },
    // 删除
    doDel() {
      if (this.sids.length === 0) {
--- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue
@ -542,45 +542,45 @@ export default {
        this.formobj.loanSecondarySalesCost.otherCostAssume = ''
      }
    },
-    // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 - 催收费用 - 承担方为公司的各项费用
+    // 计算预计亏损金额 = 欠款合计 - 贷款保证金 - 车辆售价 + 催收费用 + 承担方为公司的各项费用
    lossPrice() {
      let money = '0'
-      money = parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)
+      money = Math.round((parseFloat(this.formobj.loanSecondarySalesCost.arrearsAll) - parseFloat(this.formobj.loanSecondarySalesCost.loanDeposit)) * 100) / 100
      // 车辆售价不等于空
      if (this.formobj.loanSecondarySalesCost.vehPrice !== '') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)
+        money = Math.round((parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehPrice)) * 100) / 100
      }
      // 催收费用不等于空
      if (this.formobj.loanSecondarySalesCost.collectionCost !== '') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.collectionCost)) * 100) / 100
      }
      // 资方结清费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.bankSettleCost !== '' && this.formobj.loanSecondarySalesCost.bankSettleCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.bankSettleCost)) * 100) / 100
      }
      // 车辆违章费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.vehicleViolationCost !== '' && this.formobj.loanSecondarySalesCost.vehicleViolationCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.vehicleViolationCost)) * 100) / 100
      }
      // 年检费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.inspectYearCost !== '' && this.formobj.loanSecondarySalesCost.inspectYearCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.inspectYearCost)) * 100) / 100
      }
      // 保险费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.insureCost !== '' && this.formobj.loanSecondarySalesCost.insureCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.insureCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.insureCost)) * 100) / 100
      }
      // 过户费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.ownershipCost !== '' && this.formobj.loanSecondarySalesCost.ownershipCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.ownershipCost)) * 100) / 100
      }
      // 停车费不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.stopCost !== '' && this.formobj.loanSecondarySalesCost.stopCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.stopCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.stopCost)) * 100) / 100
      }
      // 其他费用不等于空且承担方为公司
      if (this.formobj.loanSecondarySalesCost.otherCost !== '' && this.formobj.loanSecondarySalesCost.otherCostAssume === '公司') {
-        money = parseFloat(money) - parseFloat(this.formobj.loanSecondarySalesCost.otherCost)
+        money = Math.round((parseFloat(money) + parseFloat(this.formobj.loanSecondarySalesCost.otherCost)) * 100) / 100
      }
      this.formobj.loanSecondarySalesCost.lossPrice = money
      return money