From 2f0d3a2a1d0d32276e03c17792dae040f900c698 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Thu, 14 Mar 2024 15:16:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=9D=9E=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index b56bf7eb94..4c875a54e3 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryMapper">
     <update id="updateTimeByPlanSids">
         update loan_repayment_plan_details
-        set updateTime = #{formatDate},
+        set updateTime = #{formatDate}
         where sid in
         <foreach item="sid" collection="stringList" open="(" separator="," close=")">
             #{sid}

From 674cccb3c32de5d118f0be24bfd64d76736dfe24 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Mar 2024 16:13:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E3=80=81=E4=B8=8B=E8=BD=BD=E5=90=88=E5=90=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anruifinmanagement/finwaitinvoiceapply.js | 12 +++
 .../backups/finginvoiceapplyAdd.vue           | 75 +++++++++++++++++-
 .../finginvoiceapplyEdit.vue                  | 76 ++++++++++++++++++-
 3 files changed, 160 insertions(+), 3 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
index e10086a970..e1095136d0 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
@@ -205,3 +205,15 @@ export function deliveredFinSelect(data) {
   })
 }
 
+// 生成合同
+export function saveInvoicedApplyInfoPdf(data) {
+  return request({
+    url: '/fin/v1/finbillapplication/saveInvoicedApplyInfoPdf',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
index 5ab72b5da1..f11eb53fd0 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
@@ -171,6 +171,13 @@
               </el-table-column>
             </el-table>
           </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -201,7 +208,7 @@
 </template>
 
 <script>
-import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdf } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
 import salesOrder from '@/components/publicPage/salesOrder'
@@ -232,6 +239,7 @@ export default {
       image_list2: [],
       image_list4: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -526,23 +534,76 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
     },
+    handleCreate() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfoPdf(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
       if (this.formobj.oneBillMoney === '') {
-        this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
+        this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
         return
       }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+        if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
+          return
+        }
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -567,14 +628,23 @@ export default {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           submit(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '提交成功' })
               this.handleReturn('true')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -650,6 +720,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
index 7459d3fa35..55b4de1fea 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
@@ -170,6 +170,13 @@
               </el-table-column>
             </el-table>
           </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -201,7 +208,7 @@
 </template>
 
 <script>
-import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdf } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
 import salesOrder from '../publicPage/salesOrder'
@@ -232,6 +239,7 @@ export default {
       image_list2: [],
       image_list4: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -543,17 +551,72 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
     },
+    handleCreate() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfoPdf(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
       if (this.formobj.oneBillMoney === '') {
         this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
         return
       }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空'})
+          return
+        }
+        if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息'
+          })
+          return
+        }
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               // 子页面向父级页面传递值(关闭弹框)
               window.parent.postMessage({
@@ -564,9 +627,11 @@ export default {
                 }
               }, '*')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -591,8 +656,15 @@ export default {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           submit(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '提交成功' })
               // 子页面向父级页面传递值(关闭弹框)
               window.parent.postMessage({
@@ -603,9 +675,11 @@ export default {
                 }
               }, '*')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }

From 2fbf64e3b99f8692481ecb49ef2a746b796ab874 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Mar 2024 16:13:33 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=90=88=E5=90=8C=E3=80=81=E4=B8=8B=E8=BD=BD=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/anruifinmanagement/arrearsbilling.js  |  12 +-
 .../arrearsbilling/arrearsbillingAdd.vue      |  77 +++++++++++-
 .../arrearsbillingEdit.vue                    | 116 +++++++++++++++---
 3 files changed, 183 insertions(+), 22 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js
index 6bdc042119..87841208a8 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js
@@ -167,4 +167,14 @@ export function createPdf(data) {
     params: data
   })
 }
-
+// 生成合同
+export function saveInvoicedApplyInfoPdfQk(data) {
+  return request({
+    url: '/fin/v1/finbillapplication/saveInvoicedApplyInfoPdfQk',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
index 9f812d5425..2f83748851 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
@@ -185,6 +185,13 @@
               </el-table-column>
             </el-table>
           </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -248,7 +255,7 @@
 </template>
 
 <script>
-import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/arrearsbilling'
+import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo, saveInvoicedApplyInfoPdfQk } from '@/api/anruifinmanagement/arrearsbilling'
 import { selectAllDisList, typeValues, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
 import selectVehicle from './relation/selectVehicle'
@@ -281,6 +288,7 @@ export default {
       image_list7: [],
       image_list8: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -608,19 +616,76 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '欠款开票申请')
     },
+    handleCreate() {
+      if (this.formobj.finBillVehicles.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfoPdfQk(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
+      if (this.formobj.finBillVehicles.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+        if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
+          return
+        }
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -659,14 +724,23 @@ export default {
           }
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           submit(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '提交成功' })
               this.handleReturn('true')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -814,6 +888,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
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 5bc069deb6..ea435f74e6 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
@@ -161,25 +161,34 @@
               </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">
-                <el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="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">
+                  <el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -243,7 +252,7 @@
 </template>
 
 <script>
-import { fetchDetailsBySid, saveOrUpdate, submit } from '@/api/anruifinmanagement/arrearsbilling'
+import { fetchDetailsBySid, saveOrUpdate, submit, saveInvoicedApplyInfoPdfQk } from '@/api/anruifinmanagement/arrearsbilling'
 import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
 import selectVehicle from './relation/selectVehicle'
@@ -278,6 +287,7 @@ export default {
       image_list7: [],
       image_list8: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -579,13 +589,68 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '欠款开票申请')
     },
+    handleCreate() {
+      if (this.formobj.finBillVehicles.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfoPdfQk(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
+      if (this.formobj.finBillVehicles.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+        if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
+          return
+        }
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -595,9 +660,11 @@ export default {
                 }
               }, '*')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -636,8 +703,15 @@ export default {
           }
           this.getUrl()
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           submit(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '提交成功' })
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -647,9 +721,11 @@ export default {
                 }
               }, '*')
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }

From e60e3e343045713ffb77d1117a60825b0c64662c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Mar 2024 16:39:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8--=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E3=80=81=E4=B8=8B=E8=BD=BD=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/chukuguanli/chukubanli.js         | 12 +++++
 .../relation/billingapplicationAdd.vue        | 54 ++++++++++++++++++-
 .../chukuguanli/relation/kaipiaoAdd.vue       | 54 ++++++++++++++++++-
 3 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
index 705f8ae07a..4a5065f46a 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
@@ -253,6 +253,18 @@ export function save(data) {
   })
 }
 
+// 生成附件并保存数据
+export function saveInvoicedApplyInfo2Pdf(data) {
+  return request({
+    url: '/buscenter/v1/busbillapplication/saveInvoicedApplyInfo2Pdf',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
 // 维护开票信息（企业） --出库申请开票申请合并
 export function saveQiYe(data) {
   return request({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
index 13edded352..c00244058b 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
@@ -158,6 +158,13 @@
               </el-table-column>
             </el-table>
           </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -187,7 +194,7 @@
 </template>
 
 <script>
-import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
+import { fetchDetailByCkSid, save, fetchByContractNo, saveInvoicedApplyInfo2Pdf } from '@/api/chukuguanli/chukubanli'
 import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
 import upload from '@/components/uploadFile/uploadImg'
 import xiaoshoudingdanInfo from '@/components/publicPage/dingdanInfo'
@@ -216,6 +223,7 @@ export default {
       image_list2: [],
       image_list4: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -423,6 +431,40 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
     },
+    handleCreate() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfo2Pdf(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
       if (this.formobj.oneBillMoney === '') {
         this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
@@ -446,14 +488,23 @@ export default {
             return
           }
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           save(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn()
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -528,6 +579,7 @@ export default {
     },
     handleReturn() {
       this.formobj = {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
index a4f842bfde..0f7adac055 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
@@ -158,6 +158,13 @@
               </el-table-column>
             </el-table>
           </div>
+          <div style="padding-bottom: 1px;border: 1px solid #E0E3EB" class="titleOne">
+            <div style="color: red;font-weight: bold">注:若开票信息需要修改时，请在修改后点击生成合同按钮重新生成相关附件</div>
+            <div>
+              <el-button type="primary" size="mini" class="btntopblueline" style="padding-right: 10px" @click="handleCreate()">生成合同</el-button>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="handleDownLoad(formobj.allDownloadUrl)">下载合同</el-button>
+            </div>
+          </div>
           <div class="title">证件(营业执照或身份证)</div>
           <el-row>
             <el-col :span="24">
@@ -187,7 +194,7 @@
 </template>
 
 <script>
-import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
+import { fetchDetailByCkSid, save, fetchByContractNo, saveInvoicedApplyInfo2Pdf } from '@/api/chukuguanli/chukubanli'
 import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
 import upload from '@/components/uploadFile/uploadImg'
 import xiaoshoudingdanInfo from '../../../publicPage/dingdanInfo'
@@ -216,6 +223,7 @@ export default {
       image_list2: [],
       image_list4: [],
       formobj: {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',
@@ -423,6 +431,40 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
     },
+    handleCreate() {
+      if (this.formobj.oneBillMoney === '') {
+        this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
+        return
+      }
+      for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles[i].openTickName === '') {
+          this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+          return
+        }
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '附件信息正在生成中,请稍等',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      saveInvoicedApplyInfo2Pdf(this.formobj).then((res) => {
+        if (res.success) {
+          loading.close()
+          this.formobj.sid = res.data.sid
+          this.formobj.allDownloadUrl = res.data.allDownloadUrl
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+        }
+      })
+    },
+    handleDownLoad(val) {
+      if (val !== null && val !== '' && val !== undefined) {
+        window.open(val, '_blank')
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请生成附件后再下载' })
+        return
+      }
+    },
     handleSave() {
       if (this.formobj.oneBillMoney === '') {
         this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
@@ -446,14 +488,23 @@ export default {
             return
           }
           this.submitdisabled = true
+          const loading = this.$loading({
+            lock: true,
+            text: '附件信息正在生成中,请稍等',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           save(this.formobj).then((res) => {
             if (res.success) {
+              loading.close()
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn()
             } else {
+              loading.close()
               this.submitdisabled = false
             }
           }).catch(() => {
+            loading.close()
             this.submitdisabled = false
           })
         }
@@ -528,6 +579,7 @@ export default {
     },
     handleReturn() {
       this.formobj = {
+        allDownloadUrl: '',
         applyDate: '',
         arrearsMoney: '',
         arrearsOpenYYKey: '',

From e445d1221f207f6e60c060b650d0e3516ce4486a Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 15 Mar 2024 08:33:12 +0800
Subject: [PATCH 5/5] =?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/BusBillApplicationRest.java      | 3 +++
 .../fin/biz/finbillapplication/FinBillApplicationRest.java  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
index ef3f016ca9..0faa4e1c56 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
@@ -56,6 +56,9 @@ public class BusBillApplicationRest implements BusBillApplicationFeign {
     public ResultBean save(@RequestBody BusBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<DownloanVoUrl> resultBean = busBillApplicationService.saveOrUpdateDto(dto);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
         DownloanVoUrl downloanVoUrl = resultBean.getData();
         return rb.success().setData(downloanVoUrl.getSid());
 //        return busBillApplicationService.saveOrUpdateDto(dto);
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
index 601c48d575..6b4cfaf2d0 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
@@ -108,6 +108,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
     public ResultBean save(@RequestBody FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<DownloanVoUrl> resultBean = finBillApplicationService.saveOrUpdateDto(dto);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
         DownloanVoUrl downloanVoUrl = resultBean.getData();
         return rb.success().setData(downloanVoUrl.getSid());
 //        return finBillApplicationService.saveOrUpdateDto(dto);
@@ -117,6 +120,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
     public ResultBean saveQK(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<DownloanVoUrl> resultBean = finBillApplicationService.saveOrUpdateDtoQK(dto);
+        if(!resultBean.getSuccess()){
+            return rb.setMsg(resultBean.getMsg());
+        }
         DownloanVoUrl downloanVoUrl = resultBean.getData();
         return rb.success().setData(downloanVoUrl.getSid());
 //        return finBillApplicationService.saveOrUpdateDtoQK(dto);