Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
fanzongzhe 2 years ago
parent
commit
2f680f86e4
  1. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
  2. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
  3. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue
  4. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
  5. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue
  6. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue
  7. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue
  8. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue
  9. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
  10. 80
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue
  11. 27
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@ -133,6 +133,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName()); busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
busBillTrailer.setBillTypeKey(busBillVehicle.getBillTypeKey()); busBillTrailer.setBillTypeKey(busBillVehicle.getBillTypeKey());
busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue()); busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
busBillTrailerService.save(busBillTrailer); busBillTrailerService.save(busBillTrailer);
} }
} }
@ -232,6 +233,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue()); busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
busBillTrailer.setOpenTickSid(busBillVehicle.getOpenTickSid()); busBillTrailer.setOpenTickSid(busBillVehicle.getOpenTickSid());
busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName()); busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
} }
} }
busBillTrailerService.save(busBillTrailer); busBillTrailerService.save(busBillTrailer);

80
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue

@ -119,45 +119,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

80
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue

@ -115,45 +115,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@ -514,7 +514,7 @@ export default {
} }
const choose = this.openTick_list.filter((item) => item.name === val) const choose = this.openTick_list.filter((item) => item.name === val)
if (choose !== null && choose.length > 0) { if (choose !== null && choose.length > 0) {
if ((choose[0].openTickTypeValue !== row.billTypeValue || !choose[0].companyIs) && row.billTypeValue === '增值税专用发票') { if ((choose[0].openTickTypeValue !== row.billTypeValue || !choose[0].companyIs) && row.billTypeValue === '增值税专用发票') {
this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' }) this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符,请维护开票信息' })
row.openTickName = '' row.openTickName = ''
row.openTickSid = '' row.openTickSid = ''

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@ -377,12 +377,12 @@ export default {
showInfo(sid) { showInfo(sid) {
fetchDetailsBySid(sid).then((res) => { fetchDetailsBySid(sid).then((res) => {
if (res.success) { if (res.success) {
this.formobj = res.data
if (this.formobj.isLQOrigInvoice === '是') { if (this.formobj.isLQOrigInvoice === '是') {
this.viewTitle = '欠款开票及领手续申请' this.viewTitle = '欠款开票及领手续申请'
} else { } else {
this.viewTitle = '欠款开票详情' this.viewTitle = '欠款开票详情'
} }
this.formobj = res.data
if (this.formobj.zjApplicationAppendxs.length > 0) { if (this.formobj.zjApplicationAppendxs.length > 0) {
this.formobj.zjApplicationAppendxs.forEach((e) => { this.formobj.zjApplicationAppendxs.forEach((e) => {
this.image_list1.push(e.fileUrl) this.image_list1.push(e.fileUrl)

80
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue

@ -126,45 +126,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

80
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue

@ -126,45 +126,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

80
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue

@ -126,45 +126,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

80
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue

@ -118,45 +118,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

80
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue

@ -124,45 +124,47 @@
<el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">挂车开票信息</div> <div v-if="formobj.finBillTrailers !== null">
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%"> <div class="title">挂车开票信息</div>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/> <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column label="挂车车架号" align="center"> <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<template slot-scope="scope"> <el-table-column label="挂车车架号" align="center">
<span>{{ scope.row.gcVinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.gcVinNo }}</span>
</el-table-column> </template>
<el-table-column label="主车车架号" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="主车车架号" align="center">
<span>{{ scope.row.vinNo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.vinNo }}</span>
</el-table-column> </template>
<el-table-column label="开票类型" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票类型" align="center">
<span>{{ scope.row.billTypeValue }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.billTypeValue }}</span>
</el-table-column> </template>
<el-table-column label="开票名称" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票名称" align="center">
<span>{{ scope.row.openTickName }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.openTickName }}</span>
</el-table-column> </template>
<el-table-column label="开票信息" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票信息" align="center">
<span>{{ scope.row.invoiceInfo }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.invoiceInfo }}</span>
</el-table-column> </template>
<el-table-column label="开票金额" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="开票金额" align="center">
<span>{{ scope.row.oneBillMoney }}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.oneBillMoney }}</span>
</el-table-column> </template>
<el-table-column label="合格证" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="合格证" align="center">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span> <template slot-scope="scope">
</template> <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">提前领取发票原因</div> <div class="span-sty">提前领取发票原因</div>

27
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -1089,6 +1089,33 @@ public class AppBusAdvanceGinvoiceapplyService {
vo.setRegisterContractImages(registerContractImages); vo.setRegisterContractImages(registerContractImages);
vo.setIdCardImages(idCardImages); vo.setIdCardImages(idCardImages);
vo.setArrearsCollectionAppendxs(qklpfjImages); vo.setArrearsCollectionAppendxs(qklpfjImages);
//《公司股东会对外担保决议》(公司担保)
List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
List<String> gsgdhdwdbjy = new ArrayList<>();
if (pcgsgdhdwdbjy != null) {
for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
}
}
vo.setGsgdhdwdbjy(gsgdhdwdbjy);
//《责任人担保承诺书》
List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
List<String> zrrdbcns = new ArrayList<>();
if (pczrrdbcns != null) {
for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
zrrdbcns.add(pczrrdbcn.getFileUrl());
}
}
vo.setZrrdbcns(zrrdbcns);
//资方信审截图
List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
List<String> zfxsjt = new ArrayList<>();
if (pczfxsjt != null) {
for (FinBillFileVo pczfxs : pczfxsjt) {
zfxsjt.add(pczfxs.getFileUrl());
}
}
vo.setZfxsjt(zfxsjt);
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
/*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
vo.setIsCanEdit(false); vo.setIsCanEdit(false);

Loading…
Cancel
Save