From a7c1d30e5c878be2f97a363319782d4b5a7a02c5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 29 Dec 2023 10:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=92=E6=89=A3=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/deduct/deduct.vue               | 24 +++++++++++++++----
 .../src/views/deduct/deductAdd.vue            | 11 ++++++++-
 .../src/views/deduct/deductInfo.vue           |  7 +++++-
 .../workFlow/huakouFlow/deductDaiBan.vue      |  7 +++++-
 .../views/workFlow/huakouFlow/deductEdit.vue  | 11 ++++++++-
 .../views/workFlow/huakouFlow/deductYiBan.vue |  7 +++++-
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/deduct/deduct.vue b/anrui-riskcenter-ui/src/views/deduct/deduct.vue
index ba9e083f6e..3c86eac624 100644
--- a/anrui-riskcenter-ui/src/views/deduct/deduct.vue
+++ b/anrui-riskcenter-ui/src/views/deduct/deduct.vue
@@ -23,6 +23,11 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.applyEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.closingStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.closingEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -72,6 +77,11 @@
                 <span>{{ scope.row.applyDate }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="办结日期" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.closingDate }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="申请编号" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
@@ -93,9 +103,9 @@
         <!--End查询列表部分-->
       </div>
     </div>
-    <!--款项结转新增及修改 -->
+    <!--新增及修改 -->
     <deductAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
-    <!--款项结转申请详情-->
+    <!--详情-->
     <deductInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
@@ -146,7 +156,7 @@ export default {
       ],
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
-      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      viewState: 2, // 1、列表 2、新增 3、编辑 4、查看
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
@@ -165,7 +175,9 @@ export default {
           menuUrl: '',
           orgPath: '',
           company: '',
-          userSid: ''
+          userSid: '',
+          closingStartDate: '',
+          closingEndDate: ''
         }
       }
     }
@@ -280,7 +292,9 @@ export default {
           menuUrl: '',
           orgPath: '',
           company: '',
-          userSid: ''
+          userSid: '',
+          closingStartDate: '',
+          closingEndDate: ''
         }
       }
       this.getList()
diff --git a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
index b6b1c3df01..cad76b8ada 100644
--- a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
+++ b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue
@@ -39,6 +39,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <span style="color: red;font-weight: bold">注：因间还未及时在资方认款而造成同一期实还金额合计为负数或零时不在次申请中显示</span>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>当月还款记录</div>
           </div>
@@ -50,10 +55,10 @@
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" />
           </el-table>
         </el-form>
       </div>
@@ -142,6 +147,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.records.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '当月还款记录列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.submit(this.formobj).then((res) => {
             if (res.success) {
diff --git a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
index 2b064cc210..97600fb1fc 100644
--- a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
+++ b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue
@@ -37,6 +37,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <span style="color: red;font-weight: bold">注：因间还未及时在资方认款而造成同一期实还金额合计为负数或零时不在次申请中显示</span>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>当月还款记录</div>
           </div>
@@ -48,10 +53,10 @@
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" />
           </el-table>
         </el-form>
       </div>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
index 2223f83752..d4f4fb7892 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue
@@ -40,6 +40,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <span style="color: red;font-weight: bold">注：因间还未及时在资方认款而造成同一期实还金额合计为负数或零时不在次申请中显示</span>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>当月还款记录</div>
           </div>
@@ -51,10 +56,10 @@
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" />
           </el-table>
         </el-form>
       </div>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
index f214535121..9ad761b7a6 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue
@@ -38,6 +38,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <span style="color: red;font-weight: bold">注：因间还未及时在资方认款而造成同一期实还金额合计为负数或零时不在次申请中显示</span>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>当月还款记录</div>
           </div>
@@ -49,10 +54,10 @@
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" />
           </el-table>
         </el-form>
       </div>
@@ -149,6 +154,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.records.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '当月还款记录列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.submit(this.formobj).then((res) => {
             if (res.success) {
diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
index 73c95c5b2c..d630afdd13 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue
@@ -37,6 +37,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <span style="color: red;font-weight: bold">注：因间还未及时在资方认款而造成同一期实还金额合计为负数或零时不在次申请中显示</span>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>当月还款记录</div>
           </div>
@@ -48,10 +53,10 @@
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120" />
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" />
-            <el-table-column prop="returnWay" label="还款方式" align="center" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />
             <el-table-column prop="actualMoney" label="实还金额" align="center" />
+            <el-table-column prop="returnWay" label="还款方式" align="center" />
           </el-table>
         </el-form>
       </div>