From 47b04430376f2498e8ddd9eb77ebea1be4ec8f21 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 15 八月 2025 17:09:36 +0800
Subject: [PATCH] 修改

---
 ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
index e910b87..2f0256f 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -31,9 +31,16 @@
       </template>
 
 
+
+
       <template #menu="{ size, row, index }">
-        <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 1" :underline="false" plain :size="size"
-          @click="handleCancel(row)" v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 鍙栨秷纭
+        <el-link class="link-btn" style="margin-left: 5px;" type="primary" :underline="false" plain :size="size"
+          @click="handleEditBtn(row, index)" v-if="[0, 1].includes(row.relatedBillStatus) && row.isConfirmed != 2"
+          v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 缂栬緫
+        </el-link>
+        <el-link class="link-btn" style="margin-left: 5px;" type="primary" v-if="row.isConfirmed == 1"
+          :underline="false" plain :size="size" @click="handleCancel(row)"
+          v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 鍙栨秷纭
         </el-link>
         <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 0" :underline="false" plain
           @click="handleAffirm(row)" v-hasPermi="['cwgl:estimatedReceivable:confirm']"> 纭
@@ -107,7 +114,7 @@
 
   </el-dialog>
 
-  <flowLog ref="flowLogIshow" :flowParams="flowParams" ></flowLog>
+  <flowLog ref="flowLogIshow" :flowParams="flowParams"></flowLog>
 </template>
 
 <script setup name="estimatedReceivable" lang="ts">
@@ -115,8 +122,8 @@
   EstimatedReceivableI, addEstimatedReceivable, delEstimatedReceivable, exportEstimatedReceivable, getEstimatedReceivable, listEstimatedReceivable, updateEstimatedReceivable,
   getEstimatedReceivableConfirm, getCwglEstimatedReceivableCancel, getEstimatedReceivableInvalid
 } from "@/api/cwgl/estimatedReceivable";
-  import { listEstimatedReceivableLog} from "@/api/cwgl/estimatedReceivableLog";
-  import {listEstimatedReceivableBillLog} from "@/api/cwgl/estimatedReceivableBillLog";
+import { listEstimatedReceivableLog } from "@/api/cwgl/estimatedReceivableLog";
+import { listEstimatedReceivableBillLog } from "@/api/cwgl/estimatedReceivableBillLog";
 import {
   listPendingSettlementBusiness,
 } from "@/api/cwgl/pendingSettlementBusiness";
@@ -146,7 +153,9 @@
     pageNum: 1,
     pageSize: 10
   },
-  queryParams: <EstimatedReceivableI & PageQueryInterface>{},
+  queryParams: <EstimatedReceivableI & PageQueryInterface>{
+    feeType: 0
+  },
   page: <PagesInterface>{
     pageSize: 10,
     total: 0,
@@ -165,7 +174,9 @@
   editDisplay: false,
 
   addBtn: true,
-  editBtn: true,
+  editBtn: false,
+  editBtnIcon: ' ',
+
   delBtn: false,
   viewBtn: false,
 
@@ -246,13 +257,16 @@
     },
     relatedBillName: {
       label: '鍏宠仈璐﹀崟鍚嶇О',
+      addDisplay: false,  // 鏂板鏃朵笉鏄剧ず
+      editDisplay: false, // 淇敼鏃朵笉鏄剧ず
     },
     relatedBillStatus: {
       label: '鍏宠仈璐﹀崟鐘舵��',
       search: true,
       dataType: 'string',
       type: 'select',
-
+      addDisplay: false,  // 鏂板鏃朵笉鏄剧ず
+      editDisplay: false, // 淇敼鏃朵笉鏄剧ず
       dicUrl: '/system/dict/data/type/sys_related_status',
       //    formatter: (row, value) => {
       // // 鑷畾涔夋牸寮忓寲閫昏緫锛堝鏋滈渶瑕侊級
@@ -262,7 +276,8 @@
     isConfirmed: {
       label: '鏄惁纭',
       dataType: 'string',
-
+      addDisplay: false,  // 鏂板鏃朵笉鏄剧ず
+      editDisplay: false, // 淇敼鏃朵笉鏄剧ず
       search: true,
       type: 'select',
       dicUrl: '/system/dict/data/type/sys_affirm_status',
@@ -354,7 +369,13 @@
     },
     handleSelectionChangeFunc: (selection: any) => {
       selectionList.value = selection;
+    },
+    getBeginListFunc: (params = {}) => {
+      params.feeType = 0;
+      return params
+
     }
+
   })
 const dialog = reactive({
   visible: false,
@@ -444,8 +465,8 @@
   newForm.value.pageSize = pageSize;
   getEstimatedReceivableCancel();
 }
-const newOnLoad = () => {
-  getEstimatedReceivableCancel()
+const newOnLoad = (newPageF) => {
+  getEstimatedReceivableCancel(newPageF)
 }
 // 鍔犺浇闄勪欢鏁版嵁鐨勫嚱鏁�
 const loadAttachmentData = () => {
@@ -548,4 +569,8 @@
 
   })
 }
+const handleEditBtn = (row, index) => {
+  crudRef.value.rowEdit(row, index)
+  // option.value.editBtn = true;
+}
 </script>

--
Gitblit v1.8.0