From 9814b8e966fd8229f45ed5aef991acf9dd977445 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 20 Feb 2024 09:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlethevehicleaccount.js                |  2 +-
 .../settlethevehicleaccount.vue               | 84 +++++++++++--------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/anrui-riskcenter-ui/src/api/settlethevehicleaccount/settlethevehicleaccount.js b/anrui-riskcenter-ui/src/api/settlethevehicleaccount/settlethevehicleaccount.js
index 8a2c5706dd..5663710e8a 100644
--- a/anrui-riskcenter-ui/src/api/settlethevehicleaccount/settlethevehicleaccount.js
+++ b/anrui-riskcenter-ui/src/api/settlethevehicleaccount/settlethevehicleaccount.js
@@ -4,7 +4,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/riskcenter/v1/loansubletapply/listPage',
+      url: '/riskcenter/v1/LoanSettleVehicle/listPage',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
diff --git a/anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue b/anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue
index 1d0cc6299f..f14de83447 100644
--- a/anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue
+++ b/anrui-riskcenter-ui/src/views/settlethevehicleaccount/settlethevehicleaccount.vue
@@ -8,27 +8,29 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="listQuery.params.company" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="销售部门">
-                <el-input v-model="listQuery.params.applyName" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="贷款合同编号">
-                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.loanContractNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.applyName" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车牌号">
-                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="贷款人">
-                <el-input v-model="listQuery.params.applyName" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.loanName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="结清类型">
-                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.typeStateKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in typeState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -47,19 +49,19 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="nodeState" label="结清类型" width="100" header-align="center" />
-            <el-table-column prop="company" label="分公司" align="center" width="130" />
-            <el-table-column prop="dept" label="销售部门" align="center" width="130" />
-            <el-table-column prop="nodeState" label="贷款合同编号" width="180" header-align="center" />
-            <el-table-column prop="company" label="车架号" align="center" width="130" />
-            <el-table-column prop="dept" label="车牌号" align="center" width="130" />
-            <el-table-column prop="company" label="贷款人" align="center" width="130" />
-            <el-table-column prop="dept" label="期数" align="center" width="130" />
-            <el-table-column prop="company" label="结清日期" align="center" width="130" />
-            <el-table-column prop="dept" label="资方结清金额" align="center" width="130" />
-            <el-table-column prop="company" label="公司正常结清合计" align="center" width="130" />
-            <el-table-column prop="dept" label="减免后结清合计" align="center" width="130" />
-            <el-table-column prop="company" label="结清利润" align="center" width="130" />
+            <el-table-column prop="typeStateValue" label="结清类型" width="100" header-align="center" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="130" />
+            <el-table-column prop="createDept" label="销售部门" align="center" width="130" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="180" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="130" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
+            <el-table-column prop="loanName" label="贷款人" align="center" width="130" />
+            <el-table-column prop="peroid" label="期数" align="center" width="130" />
+            <el-table-column prop="settingDate" label="结清日期" align="center" width="130" />
+            <el-table-column prop="bankSettlePrice" label="资方结清金额" align="center" width="130" />
+            <el-table-column prop="settleAll" label="公司正常结清合计" align="center" width="140" />
+            <el-table-column prop="amountTo" label="减免后结清合计" align="center" width="130" />
+            <el-table-column prop="profit" label="结清利润" align="center" width="130" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -80,9 +82,10 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/settlethevehicleaccount/settlethevehicleaccount'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
-  name: 'Deduct',
+  name: 'SettleTheVehicleAccount',
   components: {
     Pagination,
     pageye,
@@ -106,6 +109,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      typeState_list: [],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -114,16 +118,16 @@ export default {
         size: 10,
         total: 0,
         params: {
-          applyName: '',
-          billNo: '',
-          applyEndDate: '',
-          applyStartDate: '',
+          createDept: '',
+          loanContractNo: '',
+          loanName: '',
           menuUrl: '',
           orgPath: '',
-          company: '',
+          typeStateKey: '',
+          useOrgName: '',
           userSid: '',
-          closingStartDate: '',
-          closingEndDate: ''
+          vehMark: '',
+          vinNo: ''
         }
       }
     }
@@ -131,11 +135,19 @@ export default {
   created() {
     // 初始化变量
     this.getList()
+    this.init()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'typeState' }).then((res) => {
+        if (res.success) {
+          this.typeState_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -198,16 +210,16 @@ export default {
         size: 10,
         total: 0,
         params: {
-          applyName: '',
-          billNo: '',
-          applyEndDate: '',
-          applyStartDate: '',
+          createDept: '',
+          loanContractNo: '',
+          loanName: '',
           menuUrl: '',
           orgPath: '',
-          company: '',
+          typeStateKey: '',
+          useOrgName: '',
           userSid: '',
-          closingStartDate: '',
-          closingEndDate: ''
+          vehMark: '',
+          vinNo: ''
         }
       }
       this.getList()