From f68b6f735eb1b0f3702022d3a25510fcd21d1cf8 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 09 一月 2025 18:30:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/finance/payments.vue |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/admin/src/views/finance/payments.vue b/admin/src/views/finance/payments.vue
index e88731a..212bc99 100644
--- a/admin/src/views/finance/payments.vue
+++ b/admin/src/views/finance/payments.vue
@@ -2,7 +2,7 @@
   <div class="main_app">
     <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
     <div class="mt20">
-      <el-button @click="handleEdit()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+<!--      <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
     </div>
     <el-table v-loading="loading" :data="list" stripe>
       <el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
@@ -33,7 +33,7 @@
           <span v-if="row.payType === 6">鍏朵粬</span>
         </template>
       </el-table-column>
-      <el-table-column prop="payDateEnd" label="鍏ヨ处鏃ユ湡" show-overflow-tooltip />
+      <el-table-column prop="actPayDate" label="鍏ヨ处鏃ユ湡" show-overflow-tooltip />
       <el-table-column prop="createDate" label="鍒涘缓鏃ユ湡" show-overflow-tooltip />
       <el-table-column prop="realname" label="鍒涘缓浜�" show-overflow-tooltip />
       <el-table-column label="鐘舵��" min-width="100" fixed="right" show-overflow-tooltip>
@@ -44,33 +44,33 @@
       </el-table-column>
       <el-table-column label="鎿嶄綔" min-width="190" fixed="right">
         <template slot-scope="{row}">
-          <el-button type="text">鏌ョ湅璇︽儏</el-button>
-          <el-button type="text" @click="closeDW(row.id)">鍏抽棴娴佹按</el-button>
+          <el-button type="text" @click="$refs.details.open('鏀舵敮娴佹按璇︽儏', row.id)">鏌ョ湅璇︽儏</el-button>
+          <el-button type="text" @click="closeDW(row.id)" v-if="isShow(row.status, row.contractStatus)">鍏抽棴娴佹按</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="mt20">
       <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
     </div>
-    <Edit v-if="showEdit" ref="EditRef" @success="getList" @close="showEdit = false" />
+    <!--  璇︽儏  -->
+    <Details ref="details" />
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/common/Pagination'
 import QueryForm from '@/components/common/QueryForm'
-import Edit from './components/paymentsEdit.vue'
+import Details from './components/details'
 import { fetchList, close } from '@/api/ywContractRevenue'
 export default {
   components: {
     Pagination,
     QueryForm,
-    Edit
+    Details
   },
   data() {
     return {
       loading: false,
-      showEdit: false,
       pagination: {
         pageSize: 10,
         page: 1,
@@ -123,12 +123,22 @@
     this.getList()
   },
   methods: {
+    isShow (status, contractStatus) {
+      if (status === 1) return false
+      if (contractStatus === '3' || contractStatus === '4') return false
+      return true
+    },
     getList(page) {
       const { pagination, filters } = this
+      let form = JSON.parse(JSON.stringify(filters))
+      if (form && form.payDate && form.payDate.length > 0) {
+        form.payDateStart = form.payDate[0]
+        form.payDateEnd = form.payDate[1]
+      }
       this.loading = true
       fetchList({
         model: {
-          ...filters
+          ...form
         },
         capacity: pagination.pageSize,
         page: page || pagination.page,
@@ -153,16 +163,6 @@
       }).catch(() => {
       
       });
-    },
-    handleEdit(row) {
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.EditRef.isShowModal = true
-        if (row && row.id) {
-          this.$refs.EditRef.getDetail(row.id)
-        }
-      })
-
     },
     handleDel(row) {
       let message = `纭鍒犻櫎璇ヨ褰曞悧?`

--
Gitblit v1.9.3