From ae7401fed128863f24cf4ea32140c1288f55b626 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 20 Jan 2025 16:06:02 +0800
Subject: [PATCH 1/8] =?UTF-8?q?POST=E8=AF=B7=E6=B1=82=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAput?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/anrui/oa/api/HrHireApplyRest.java     |  6 +++---
 .../src/main/java/com/yxt/anrui/oa/api/OaFormRest.java | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
index 44d7e7ba8b..763a776697 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
@@ -45,19 +45,19 @@ public class HrHireApplyRest {
     }
 
     @ApiOperation("提交审批流程")
-    @PostMapping("/submit")
+    @PutMapping("/submit")
     public ResultBean submit(@RequestBody HrHireApplyDto dto) {
         return hrHireApplyService.submit(dto);
     }
 
     @ApiOperation(value = "驳回任务")
-    @PostMapping(value = "/reject")
+    @PutMapping(value = "/reject")
     public ResultBean reject(@Valid @RequestBody TaskDto dto) {
         return hrHireApplyService.reject(dto);
     }
 
     @ApiOperation(value = "办理（同意）")
-    @PostMapping("/complete")
+    @PutMapping("/complete")
     public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
         return hrHireApplyService.complete(dto);
     }
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
index b3e4160969..36ba330ccb 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
@@ -56,7 +56,7 @@ public class OaFormRest {
     }
 
     @ApiOperation(value = "办理（同意）")
-    @PostMapping("/complete")
+    @PutMapping("/complete")
     public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
         BusinessVariablesDto businessVariables = new BusinessVariablesDto();
         BeanUtil.copyProperties(dto, businessVariables);
@@ -76,25 +76,25 @@ public class OaFormRest {
     }
 
     @ApiOperation(value = "驳回任务")
-    @PostMapping(value = "/reject")
+    @PutMapping(value = "/reject")
     public ResultBean reject(@Valid @RequestBody TaskDto dto) {
         return oaFormService.reject(dto);
     }
 
     @ApiOperation(value = "撤回流程")
-    @PostMapping(value = "/revokeProcess")
+    @PutMapping(value = "/revokeProcess")
     public ResultBean revokeProcess(@Valid @RequestBody TaskDto dto) {
         return oaFormService.revokeProcess(dto);
     }
 
     @ApiOperation(value = "终止任务")
-    @PostMapping(value = "/breakProcess")
+    @PutMapping(value = "/breakProcess")
     public ResultBean breakProcess(@Valid @RequestBody TaskDto dto) {
         return oaFormService.breakProcess(dto);
     }
 
     @ApiOperation(value = "加签")
-    @PostMapping(value = "/delegate")
+    @PutMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody DelegateDto dto) {
         return oaFormService.delegate(dto);
     }

From efead886e2e45d974313bf83b46bd3b0bdca7362 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 20 Jan 2025 16:14:32 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
index 10fcc97e1a..b962aa79ad 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
@@ -381,6 +381,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
             if (businessTaskId.equals(dto.getTaskId())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(dto, flowTaskVo);
+                flowTaskVo.setInstanceId(dto.getProcInsId());
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());

From 308ad0677bb4e824c3f185100e7ad067f23eb94f Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 20 Jan 2025 16:18:31 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
index b962aa79ad..55b5fa55d8 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
@@ -418,6 +418,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
             if (dto.getUserSid().equals(oaForm.getCreateBySid())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(dto, flowTaskVo);
+                flowTaskVo.setInstanceId(dto.getProcInsId());
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());

From 8942de08e3c7ec0a3ecf8d6e795ce495d60e1e4f Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 20 Jan 2025 16:20:43 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
index 763a776697..bf5a4f57a0 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
@@ -45,7 +45,7 @@ public class HrHireApplyRest {
     }
 
     @ApiOperation("提交审批流程")
-    @PutMapping("/submit")
+    @PostMapping("/submit")
     public ResultBean submit(@RequestBody HrHireApplyDto dto) {
         return hrHireApplyService.submit(dto);
     }

From 5d453328b00f3ed1349fa3b1fb9135a33967a0da Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Jan 2025 16:53:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20--=20=E8=9E=8D=E8=B5=84=E5=B9=B3=E4=BB=93?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/anruifinmanagement/payment.js     |   9 +
 .../fukuanshenqing/paymentAdd.vue             | 181 +++++++++++++-----
 .../fukuanshenqing/paymentInfo.vue            |  58 ++++--
 .../relation/closingPayment.vue               | 181 ++++++++++++++++++
 .../fukuanguanli/fukuanDaiBanInfo.vue         |  57 ++++--
 .../fukuanguanli/fukuanEdit.vue               | 179 ++++++++++++-----
 .../fukuanguanli/fukuanYiBanInfo.vue          |  57 ++++--
 .../fukuanguanli/relation/closingPayment.vue  | 181 ++++++++++++++++++
 8 files changed, 743 insertions(+), 160 deletions(-)
 create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
 create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js
index 1ea697e64b..d26c3ec93f 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js
@@ -19,6 +19,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 查询分页列表 -- 选择融资平仓付款
+  chooseEve: function(data) {
+    return request({
+      url: '/fin/v1/finpaymentapplydetailsbeloweve/chooseEve',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 查询分页列表 -- 选择挂车
   trailerApply: function(data) {
     return request({
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
index 350c8d6f05..666b099ddb 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
@@ -88,59 +88,91 @@
               </div>
             </el-col>
           </el-row>
-          <div class="title titleOne">
-            <div>付款明细</div>
-            <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
+          <div v-if="formobj.costTypeValue === '融资付款'">
+            <div class="title titleOne">
+              <div>融资平仓付款明细</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleSelect()">选择</el-button>
+            </div>
+            <el-table :key="eveKey" :data="formobj.eveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="deleteEve(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+              <el-table-column prop="period" label="期数" align="center" width="100" />
+              <el-table-column label="付款方式" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.payWayValue" placeholder="请选择" filterable @change="changePayWay($event, scope.row)">
+                    <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+              <el-table-column prop="bank" label="开户行" align="center" width="130" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+              <el-table-column prop="exePayPrice" label="付款金额(元)" align="center" width="140" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            </el-table>
           </div>
-          <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column fixed label="操作" width="180" align="center">
-              <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
-                <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增关联付款</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="款项名称" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
-                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="付款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
-                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款通路" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
-                  <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
-            <el-table-column prop="bank" label="开户行" align="center" width="140" />
-            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="付款备注" align="center" min-width="200">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="关联付款详情" align="center" width="120">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
-          </el-table>
+          <div v-else>
+            <div class="title titleOne">
+              <div>付款明细</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
+            </div>
+            <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column fixed label="操作" width="180" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
+                  <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增关联付款</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="款项名称" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
+                    <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款方式" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
+                    <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="厂家回款通路" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
+                    <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+              <el-table-column prop="bank" label="开户行" align="center" width="140" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+              <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款备注" align="center" min-width="200">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="关联付款详情" align="center" width="120">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+            </el-table>
+          </div>
+
           <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
             <div class="title titleOne">
               <div>车辆列表</div>
@@ -311,6 +343,8 @@
     <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
     <!-- 查看上装配置信息 -->
     <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
+    <!-- 选择融资平仓付款 -->
+    <closingPayment v-show="viewState == 8" ref="divClosingPayment" @backData="backClosingPayment" @doback="resetState" />
   </div>
 </template>
 
@@ -322,6 +356,7 @@ import trailerCar from './relation/trailerCar'
 import top from './relation/top'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
+import closingPayment from './relation/closingPayment'
 import tops from '@/components/publicPage/tops'
 
 export default {
@@ -332,7 +367,8 @@ export default {
     top,
     paymentInformationAdd,
     paymentInformationInfo,
-    tops
+    tops,
+    closingPayment
   },
   data() {
     return {
@@ -344,6 +380,7 @@ export default {
       paymentKey: 2,
       trailerKey: 3,
       topKey: 4,
+      eveKey: 5,
       index: 0,
       carBrand_list: [],
       costRange_list: [],
@@ -379,6 +416,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
@@ -537,6 +575,42 @@ export default {
         this.formobj.payCompanySid = ''
       }
     },
+    handleSelect() {
+      this.viewState = 8
+      this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+    },
+    deleteEve(index) {
+      this.formobj.eveList.splice(index, 1)
+    },
+    backClosingPayment(value) {
+      this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
+      console.log(value, 77)
+      value.forEach((e) => {
+        this.formobj.eveList.push({
+          sid: '', // sid
+          applySid: '', // 付款申请sid
+          costTitleValue: e.costTitleValue, // 平仓款名称
+          openDate: e.openDate, // 融资付款开通日期
+          period: e.period, // 期数
+          payWayKey: '', // 付款方式Key
+          payWayValue: '', // 付款方式Value
+          receiveCompany: e.receiveCompany, // 收款单位名称
+          receivingAccount: e.receivingAccount, // 收款银行账号
+          bank: e.bank, // 开户行
+          exePayPrice: e.exePayPrice, // 平仓付款金额
+          remarks: e.remarks
+        })
+      })
+    },
+    changePayWay(value, row) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.payWayKey = choose[0].dictKey
+      } else {
+        row.payWayKey = ''
+      }
+    },
     handleAdd() {
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
@@ -924,6 +998,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
index 832a84512d..7def996843 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
@@ -58,24 +58,43 @@
               </div>
             </el-col>
           </el-row>
-          <div class="title">付款明细</div>
-          <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
-            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
-            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
-            <el-table-column prop="bank" label="开户行" align="center" width="140" />
-            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
-            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
-            <el-table-column label="关联付款详情" align="center" width="120">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
-          </el-table>
+          <div v-if="formobj.costTypeValue === '融资付款'">
+            <div class="title">
+              <div>融资平仓付款明细</div>
+            </div>
+            <el-table :key="eveKey" :data="formobj.eveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+              <el-table-column prop="period" label="期数" align="center" width="100" />
+              <el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
+              <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+              <el-table-column prop="bank" label="开户行" align="center" width="130" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+              <el-table-column prop="exePayPrice" label="付款金额(元)" align="center" width="140" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            </el-table>
+          </div>
+          <div v-else>
+            <div class="title">付款明细</div>
+            <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+              <el-table-column prop="bank" label="开户行" align="center" width="140" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+              <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+              <el-table-column label="关联付款详情" align="center" width="120">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+            </el-table>
+          </div>
           <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
             <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
               <div>车辆列表</div>
@@ -222,6 +241,7 @@ export default {
       paymentKey: 2,
       trailerKey: 3,
       topKey: 4,
+      eveKey: 5,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -250,6 +270,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
@@ -390,6 +411,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
new file mode 100644
index 0000000000..04d1f72e17
--- /dev/null
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
@@ -0,0 +1,181 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div>
+      <button-bar view-title="选择融资平仓款" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50px"/>
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
+            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+            <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+            <el-table-column prop="period" label="期数" align="center" width="100" />
+            <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+            <el-table-column prop="bank" label="开户行" align="center" width="130" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="平仓付款日期" align="center" width="140" />
+            <el-table-column prop="exePayPrice" label="平仓付款金额" align="center" width="140" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/anruifinmanagement/payment'
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+
+export default {
+  name: 'ClosingPayment',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doConfirm',
+          btnLabel: '确定'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      multipleSelection: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          useOrgSid: '',
+          sidList: []
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doConfirm':
+          this.doConfirm()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.chooseEve(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    showData(value, createOrgSid) {
+      this.listQuery.params.useOrgSid = createOrgSid
+      const aa = []
+      // if (value.length > 0) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     for (var j = 0; j < value[i].vehRebateSids.length; j++) {
+      //       aa.push(value[i].vehRebateSids[j])
+      //     }
+      //   }
+      // }
+      this.listQuery.params.sidList = aa
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          createBySid: '',
+          createEndTime: '',
+          createStartTime: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      }
+      this.getList()
+    },
+    doConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
index 0fc373a07e..0fd3f9b0e8 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
@@ -60,24 +60,43 @@
               </div>
             </el-col>
           </el-row>
-          <div class="title">付款明细</div>
-          <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
-            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
-            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
-            <el-table-column prop="bank" label="开户行" align="center" width="140" />
-            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
-            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
-            <el-table-column label="关联付款详情" align="center" width="120">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
-          </el-table>
+          <div v-if="formobj.costTypeValue === '融资付款'">
+            <div class="title">
+              <div>融资平仓付款明细</div>
+            </div>
+            <el-table :key="eveKey" :data="formobj.eveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+              <el-table-column prop="period" label="期数" align="center" width="100" />
+              <el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
+              <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+              <el-table-column prop="bank" label="开户行" align="center" width="130" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+              <el-table-column prop="exePayPrice" label="付款金额(元)" align="center" width="140" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            </el-table>
+          </div>
+          <div v-else>
+            <div class="title">付款明细</div>
+            <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+              <el-table-column prop="bank" label="开户行" align="center" width="140" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+              <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+              <el-table-column label="关联付款详情" align="center" width="120">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+            </el-table>
+          </div>
           <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
             <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
               <div>车辆列表</div>
@@ -246,6 +265,7 @@ export default {
       paymentKey: 2,
       trailerKey: 3,
       topKey: 4,
+      eveKey: 5,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -274,6 +294,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
index e7bc30cd7b..26e910b3ab 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
@@ -87,59 +87,90 @@
               </div>
             </el-col>
           </el-row>
-          <div class="title titleOne">
-            <div>付款明细</div>
-            <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
+          <div v-if="formobj.costTypeValue === '融资付款'">
+            <div class="title titleOne">
+              <div>融资平仓付款明细</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleSelect()">选择</el-button>
+            </div>
+            <el-table :key="eveKey" :data="formobj.eveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="deleteEve(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+              <el-table-column prop="period" label="期数" align="center" width="100" />
+              <el-table-column label="付款方式" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.payWayValue" placeholder="请选择" filterable @change="changePayWay($event, scope.row)">
+                    <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+              <el-table-column prop="bank" label="开户行" align="center" width="130" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+              <el-table-column prop="exePayPrice" label="付款金额(元)" align="center" width="140" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            </el-table>
+          </div>
+          <div v-else>
+            <div class="title titleOne">
+              <div>付款明细</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
+            </div>
+            <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column fixed label="操作" width="180" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
+                  <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增关联付款</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="款项名称" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
+                    <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款方式" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
+                    <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="厂家回款通路" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
+                    <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+              <el-table-column prop="bank" label="开户行" align="center" width="140" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+              <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款备注" align="center" min-width="200">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="关联付款详情" align="center" width="120">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+            </el-table>
           </div>
-          <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column fixed label="操作" width="180" align="center">
-              <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
-                <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增关联付款</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="款项名称" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
-                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="付款方式" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
-                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="厂家回款通路" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
-                  <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
-            <el-table-column prop="bank" label="开户行" align="center" width="140" />
-            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="付款备注" align="center" min-width="200">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="关联付款详情" align="center" width="120">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
-          </el-table>
           <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
             <div class="title titleOne">
               <div>车辆列表</div>
@@ -310,6 +341,8 @@
     <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
     <!-- 查看上装配置信息 -->
     <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
+    <!-- 选择融资平仓付款 -->
+    <closingPayment v-show="viewState == 8" ref="divClosingPayment" @backData="backClosingPayment" @doback="resetState" />
   </div>
 </template>
 
@@ -321,6 +354,7 @@ import trailerCar from './relation/trailerCar'
 import top from './relation/top'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
+import closingPayment from './relation/closingPayment'
 import tops from '@/views/workFlow/publicPage/tops'
 
 export default {
@@ -331,7 +365,8 @@ export default {
     top,
     paymentInformationAdd,
     paymentInformationInfo,
-    tops
+    tops,
+    closingPayment
   },
   data() {
     return {
@@ -343,6 +378,7 @@ export default {
       paymentKey: 2,
       trailerKey: 3,
       topKey: 4,
+      eveKey: 5,
       index: 0,
       carBrand_list: [],
       costRange_list: [],
@@ -378,6 +414,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
@@ -528,6 +565,42 @@ export default {
         this.formobj.payCompanySid = ''
       }
     },
+    handleSelect() {
+      this.viewState = 8
+      this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+    },
+    deleteEve(index) {
+      this.formobj.eveList.splice(index, 1)
+    },
+    backClosingPayment(value) {
+      this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
+      console.log(value, 77)
+      value.forEach((e) => {
+        this.formobj.eveList.push({
+          sid: '', // sid
+          applySid: '', // 付款申请sid
+          costTitleValue: e.costTitleValue, // 平仓款名称
+          openDate: e.openDate, // 融资付款开通日期
+          period: e.period, // 期数
+          payWayKey: '', // 付款方式Key
+          payWayValue: '', // 付款方式Value
+          receiveCompany: e.receiveCompany, // 收款单位名称
+          receivingAccount: e.receivingAccount, // 收款银行账号
+          bank: e.bank, // 开户行
+          exePayPrice: e.exePayPrice, // 平仓付款金额
+          remarks: e.remarks
+        })
+      })
+    },
+    changePayWay(value, row) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.payWayKey = choose[0].dictKey
+      } else {
+        row.payWayKey = ''
+      }
+    },
     handleAdd() {
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
index b47b0fb266..07c43943d8 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
@@ -58,24 +58,43 @@
               </div>
             </el-col>
           </el-row>
-          <div class="title">付款明细</div>
-          <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
-            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
-            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
-            <el-table-column prop="bank" label="开户行" align="center" width="140" />
-            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
-            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
-            <el-table-column label="关联付款详情" align="center" width="120">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
-          </el-table>
+          <div v-if="formobj.costTypeValue === '融资付款'">
+            <div class="title">
+              <div>融资平仓付款明细</div>
+            </div>
+            <el-table :key="eveKey" :data="formobj.eveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+              <el-table-column prop="period" label="期数" align="center" width="100" />
+              <el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
+              <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+              <el-table-column prop="bank" label="开户行" align="center" width="130" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+              <el-table-column prop="exePayPrice" label="付款金额(元)" align="center" width="140" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            </el-table>
+          </div>
+          <div v-else>
+            <div class="title">付款明细</div>
+            <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+              <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+              <el-table-column prop="bank" label="开户行" align="center" width="140" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+              <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+              <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+              <el-table-column label="关联付款详情" align="center" width="120">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+            </el-table>
+          </div>
           <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
             <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
               <div>车辆列表</div>
@@ -221,6 +240,7 @@ export default {
       paymentKey: 2,
       trailerKey: 3,
       topKey: 4,
+      eveKey: 5,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -249,6 +269,7 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
+        eveList: [], // 融资平仓付款明细列表
         detailsList: [], // 付款信息列表
         vehicleList: [], // 主车车辆列表
         trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
new file mode 100644
index 0000000000..e44f12749d
--- /dev/null
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
@@ -0,0 +1,181 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div>
+      <button-bar view-title="选择融资平仓款" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50px"/>
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
+            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+            <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
+            <el-table-column prop="period" label="期数" align="center" width="100" />
+            <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
+            <el-table-column prop="bank" label="开户行" align="center" width="130" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="平仓付款日期" align="center" width="140" />
+            <el-table-column prop="exePayPrice" label="平仓付款金额" align="center" width="140" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/anruifinmanagement/payment'
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+
+export default {
+  name: 'ClosingPayment',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doConfirm',
+          btnLabel: '确定'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      multipleSelection: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          useOrgSid: '',
+          sidList: []
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doConfirm':
+          this.doConfirm()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.chooseEve(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    showData(value, createOrgSid) {
+      this.listQuery.params.useOrgSid = createOrgSid
+      const aa = []
+      // if (value.length > 0) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     for (var j = 0; j < value[i].vehRebateSids.length; j++) {
+      //       aa.push(value[i].vehRebateSids[j])
+      //     }
+      //   }
+      // }
+      this.listQuery.params.sidList = aa
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          createBySid: '',
+          createEndTime: '',
+          createStartTime: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      }
+      this.getList()
+    },
+    doConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From e948e480e40a7f7f74f84da12cdbab583c044ae5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Jan 2025 16:53:34 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=9E=8D=E8=B5=84?=
 =?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financingClosingPayment/financingClosingPayment.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
index c0bb6f326d..0c2a2129bc 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
@@ -265,7 +265,7 @@ export default {
         if (resp.success) {
           this.formobj.createOrgSid = resp.data
           this.formobj.useOrgSid = resp.data
-          fetchBySid({ useOrgSid: resp.data }).then((respsone) => {
+          fetchBySid(resp.data).then((respsone) => {
             if (respsone.success) {
               this.formobj.createOrgName = respsone.data.name
               this.formobj.useOrgName = respsone.data.name

From 5003322b47d9f64efe5b5ad9b735ba4a229b4a46 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Jan 2025 17:08:59 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financialpolicymanagement/financialpolicymanagement.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
index 5d0db76d11..90c4117d89 100644
--- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
+++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
@@ -459,7 +459,7 @@ export default {
     },
     toEdit() {
       if (this.multipleSelection.length === 1) {
-        if (!this.multipleSelection[0].updateBtn) {
+        if (this.multipleSelection[0].updateBtn) {
           this.viewState = 3
           this.$refs['divAdd'].showEdit(this.multipleSelection)
         } else {

From e397e6125250699dce2e3f2adc1e55cb64363d04 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Jan 2025 17:16:06 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financialpolicymanagement/financialpolicymanagement.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
index 90c4117d89..08f3143fec 100644
--- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
+++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
@@ -461,7 +461,7 @@ export default {
       if (this.multipleSelection.length === 1) {
         if (this.multipleSelection[0].updateBtn) {
           this.viewState = 3
-          this.$refs['divAdd'].showEdit(this.multipleSelection)
+          this.$refs['divAdd'].showEdit({ sid: this.sids[0] })
         } else {
           this.$message({ showClose: true, type: 'error', message: '该记录已报备且仍在有效期内,无法再次编辑' })
         }