Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue

@@ -29,6 +29,18 @@
               <el-form-item label="发起部门">
                 <el-input v-model="listQuery.params.createByDept" clearable placeholder="" />
               </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="排产订单编号">
+                <el-input v-model="listQuery.params.orderingNo" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="贴息">
+                <el-input v-model="listQuery.params.factoryDiscount" clearable placeholder="" />
+              </el-form-item>
               <el-form-item label="销售类型">
                 <el-select v-model="listQuery.params.saleTypeKey" class="filter-item" clearable placeholder="请选择">
                   <el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -224,7 +236,11 @@ export default {
           createByDept: '',
           saleTypeKey: '',
           customerName: '',
-          purchaseSystemName: ''
+          purchaseSystemName: '',
+          vinNo: '',
+          orderingNo: '',
+          useOrgName: '',
+          factoryDiscount: ''
         },
         current: 1,
         size: 10,
@@ -348,7 +364,11 @@ export default {
           createByDept: '',
           saleTypeKey: '',
           customerName: '',
-          purchaseSystemName: ''
+          purchaseSystemName: '',
+          vinNo: '',
+          orderingNo: '',
+          useOrgName: '',
+          factoryDiscount: ''
         },
         current: 1,
         size: 10,

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js

@@ -56,6 +56,16 @@ export function invoiceYJCH(data) {
   })
 }
 
+// 开票管理--导出
+export function exportExcel(data) {
+  return request({
+    url: '/fin/v1/finvehicleinvoice/exportExcel',
+    method: 'post',
+    responseType: 'blob', // 表明返回服务器返回的数据类型
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
 
 // 通过sid作废一条或多条记录
 export function cancellation(params) {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@@ -252,7 +252,7 @@
 </template>
 
 <script>
-import { listPage, cancellation, invoiceYJ, invoiceYJCH } from '@/api/anruifinmanagement/fininvoiceapply'
+import { listPage, cancellation, invoiceYJ, invoiceYJCH, exportExcel } from '@/api/anruifinmanagement/fininvoiceapply'
 import { getOrgSidByPath, typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -302,6 +302,13 @@ export default {
           btnKey: 'doCancellation',
           btnLabel: '作废'
         },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
         {
           type: 'info',
           size: 'small',
@@ -435,6 +442,9 @@ export default {
         case 'doClose':
           this.doClose()
           break
+        case 'doExport':
+          this.doExport()
+          break
         default:
           break
       }
@@ -669,6 +679,31 @@ export default {
     reseaState() {
       this.viewState = 1
     },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      exportExcel(this.listQuery.params).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 = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)