From 462d0be423c09098c7462e3878414130edbcefd9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 20 Oct 2023 11:28:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue   | 2 +-
 .../workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
index b854dacda3..5bc069deb6 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
+++ b/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)
       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: '因开票信息与所选开票类型不符，请维护开票信息' })
           row.openTickName = ''
           row.openTickSid = ''
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue
index 49429e7a41..7348ffc2d7 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue
@@ -377,12 +377,12 @@ export default {
     showInfo(sid) {
       fetchDetailsBySid(sid).then((res) => {
         if (res.success) {
+          this.formobj = res.data
           if (this.formobj.isLQOrigInvoice === '是') {
             this.viewTitle = '欠款开票及领手续申请'
           } else {
             this.viewTitle = '欠款开票详情'
           }
-          this.formobj = res.data
           if (this.formobj.zjApplicationAppendxs.length > 0) {
             this.formobj.zjApplicationAppendxs.forEach((e) => {
               this.image_list1.push(e.fileUrl)

From 06b38e265ca6d5b69a15712b2c1f2ea355bbecd2 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 20 Oct 2023 13:36:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBusAdvanceGinvoiceapplyService.java    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
index 8478e7efde..c49ac942ac 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/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.setIdCardImages(idCardImages);
         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();
         /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);

From e13459db29656da533c8147ceb0a9bfba80b0aaa Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 20 Oct 2023 14:06:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arrearscollectionAdd.vue                  | 80 ++++++++++---------
 .../arrearscollectionInfo.vue                 | 80 ++++++++++---------
 .../arrearscollectionByDivisionDaiBanInfo.vue | 80 ++++++++++---------
 .../arrearscollectionByFileDaiBanInfo.vue     | 80 ++++++++++---------
 .../arrearscollectionDaiBanInfo.vue           | 80 ++++++++++---------
 .../arrearscollectionEdit.vue                 | 80 ++++++++++---------
 .../arrearscollectionYiBanInfo.vue            | 80 ++++++++++---------
 7 files changed, 287 insertions(+), 273 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
index 50894c9f23..41eeec65f4 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
+++ b/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-col>
         </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue
index 371e1e6a09..5c959aac65 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue
+++ b/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-col>
         </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue
index 4c310e241d..f5a1900138 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue
+++ b/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-col>
           </el-row>
-          <div class="title">挂车开票信息</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.billTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.openTickName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票信息" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="合格证" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票类型" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.billTypeValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue
index 7ccc28272e..07bfe01a4f 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue
+++ b/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-col>
           </el-row>
-          <div class="title">挂车开票信息</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.billTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.openTickName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票信息" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="合格证" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票类型" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.billTypeValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue
index 307d032ab9..98b9cb8c7e 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue
+++ b/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-col>
           </el-row>
-          <div class="title">挂车开票信息</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.billTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.openTickName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票信息" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="合格证" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票类型" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.billTypeValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
index 1ef238b661..a534c4a08e 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
+++ b/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-col>
         </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <div v-if="formobj.finBillTrailers !== null">
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">提前领取发票原因</div>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue
index f1f1e515e8..4c92712ae7 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue
+++ b/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-col>
           </el-row>
-          <div class="title">挂车开票信息</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票类型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.billTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.openTickName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票信息" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="开票金额" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="合格证" align="center">
-              <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票类型" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.billTypeValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">提前领取发票原因</div>

From dfba08a8a898812007b8bce4d614a55efa87d5cd Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 20 Oct 2023 15:49:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busbillapplication/BusBillApplicationService.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
index d2651ff548..fd0b436795 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
+++ b/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.setBillTypeKey(busBillVehicle.getBillTypeKey());
                     busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
+                    busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
                     busBillTrailerService.save(busBillTrailer);
                 }
             }
@@ -232,6 +233,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
                         busBillTrailer.setBillTypeValue(busBillVehicle.getBillTypeValue());
                         busBillTrailer.setOpenTickSid(busBillVehicle.getOpenTickSid());
                         busBillTrailer.setOpenTickName(busBillVehicle.getOpenTickName());
+                        busBillTrailer.setOneBillMoney(busBillApplication.getOneBillMoney());
                     }
                 }
                 busBillTrailerService.save(busBillTrailer);