From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 ui/admin-ui3/src/views/cwgl/receivableBillSettlementDetail/index.vue |  285 ++++++++++++++++++++++++++------------------------------
 1 files changed, 132 insertions(+), 153 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/receivableBillSettlementDetail/index.vue b/ui/admin-ui3/src/views/cwgl/receivableBillSettlementDetail/index.vue
index 1ecc263..751113d 100644
--- a/ui/admin-ui3/src/views/cwgl/receivableBillSettlementDetail/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/receivableBillSettlementDetail/index.vue
@@ -1,48 +1,19 @@
 <template>
-  <basicContainer >
-    <avue-crud
-        :option="option"
-        :table-loading="pageF.loading"
-        :data="tableData"
-        :page="page"
-        :permission="permissionList"
-        :before-open="beforeOpen"
-        v-model="form"
-        ref="crudRef"
-        @row-update="rowUpdate"
-        @row-save="rowSave"
-        @refresh-change="refreshChange"
-        @row-del="rowDel"
-        @search-change="searchChange"
-        @search-reset="searchReset"
-        @selection-change="selectionChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @on-load="onLoad"
-    >
+  <basicContainer>
+    <avue-crud :option="option" :table-loading="pageF.loading" :data="tableData" :page="page"
+      :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crudRef" @row-update="rowUpdate"
+      @row-save="rowSave" @refresh-change="refreshChange" @row-del="rowDel" @search-change="searchChange"
+      @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+      @size-change="sizeChange" @on-load="onLoad">
       <template #menu-left>
-        <el-button
-            type="success"
-            icon="Edit"
-            :disabled="pageF.single"
-            v-hasPermi="['cwgl:receivableBillSettlementDetail:edit']"
-            @click="handleUpdate">淇敼
+        <el-button type="success" icon="Edit" :disabled="pageF.single"
+          v-hasPermi="['cwgl:receivableBillSettlementDetail:edit']" @click="handleUpdate">淇敼
         </el-button>
-        <el-button
-            type="danger"
-            icon="Delete"
-            :disabled="pageF.multiple"
-            @click="handleDelete"
-            v-hasPermi="['cwgl:receivableBillSettlementDetail:remove']"
-        >鍒犻櫎
+        <el-button type="danger" icon="Delete" :disabled="pageF.multiple" @click="handleDelete"
+          v-hasPermi="['cwgl:receivableBillSettlementDetail:remove']">鍒犻櫎
         </el-button>
-        <el-button
-            type="warning"
-            plain
-            icon="Download"
-            @click="handleExport"
-            v-hasPermi="['cwgl:receivableBillSettlementDetail:export']"
-        >瀵煎嚭
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['cwgl:receivableBillSettlementDetail:export']">瀵煎嚭
         </el-button>
       </template>
     </avue-crud>
@@ -50,125 +21,133 @@
 </template>
 
 <script setup name="receivableBillSettlementDetail" lang="ts">
-  import {ReceivableBillSettlementDetailI,addReceivableBillSettlementDetail, delReceivableBillSettlementDetail, exportReceivableBillSettlementDetail, getReceivableBillSettlementDetail, listReceivableBillSettlementDetail, updateReceivableBillSettlementDetail} from "@/api/cwgl/receivableBillSettlementDetail";
-  import useCurrentInstance from "@/utils/useCurrentInstance";
-  import {computed,reactive, ref, toRefs} from "vue";
-  import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
-  import {usePagePlus} from "@/hooks/usePagePlus";
-  import {hasPermission} from "@/utils/permissionUtils";
+import { ReceivableBillSettlementDetailI, addReceivableBillSettlementDetail, delReceivableBillSettlementDetail, exportReceivableBillSettlementDetail, getReceivableBillSettlementDetail, listReceivableBillSettlementDetail, updateReceivableBillSettlementDetail } from "@/api/cwgl/receivableBillSettlementDetail";
+import useCurrentInstance from "@/utils/useCurrentInstance";
+import { computed, reactive, ref, toRefs } from "vue";
+import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
+import { usePagePlus } from "@/hooks/usePagePlus";
+import { hasPermission } from "@/utils/permissionUtils";
 
-  const { proxy } = useCurrentInstance();
-  const crudRef = ref();
+const { proxy } = useCurrentInstance();
+const crudRef = ref();
 
-  const permissionList = computed(()=>{
-    return {
-      addBtn: hasPermission(["cwgl:receivableBillSettlementDetail:add"]),
-      delBtn: hasPermission(["cwgl:receivableBillSettlementDetail:remove"]),
-      editBtn: hasPermission(["cwgl:receivableBillSettlementDetail:edit"]),
-      viewBtn: hasPermission(["cwgl:receivableBillSettlementDetail:query"]),
-    }
-  })
+const permissionList = computed(() => {
+  return {
+    addBtn: hasPermission(["cwgl:receivableBillSettlementDetail:add"]),
+    delBtn: hasPermission(["cwgl:receivableBillSettlementDetail:remove"]),
+    editBtn: hasPermission(["cwgl:receivableBillSettlementDetail:edit"]),
+    viewBtn: hasPermission(["cwgl:receivableBillSettlementDetail:query"]),
+  }
+})
 
-  const data = reactive({
-    form:<ReceivableBillSettlementDetailI>{},
-    queryParams:<ReceivableBillSettlementDetailI&PageQueryInterface>{},
-    page: <PagesInterface>{
-      pageSize: 10,
-      total: 0,
-      currentPage: 1,
+const data = reactive({
+  form: <ReceivableBillSettlementDetailI>{},
+  queryParams: <ReceivableBillSettlementDetailI & PageQueryInterface>{},
+  page: <PagesInterface>{
+    pageSize: 10,
+    total: 0,
+    currentPage: 1,
+  },
+  selectionList: [],
+})
+const { queryParams, form, page, selectionList } = toRefs(data);
+const option = ref({
+  pageKey: 'ReceivableBillSettlementDetail',
+  rowKey: 'id',
+  column: {
+    id: {
+      label: 'ID',
     },
-    selectionList:[],
-  })
-  const {queryParams,form,page,selectionList} = toRefs(data);
-  const option = ref({
-    pageKey: 'ReceivableBillSettlementDetail',
-    rowKey: 'id',
-    column: {
-                                id: {
-          label: 'ID',
-                            },
-                                billId: {
-          label: '搴旀敹璐﹀崟ID',
-                                rules: [
-              {
-                required: true,
-                message: "搴旀敹璐﹀崟ID涓嶈兘涓虹┖", trigger: "blur" }
-            ],                  },
-                                settlementMethod: {
-          label: '缁撶畻鏂瑰紡',
-                                rules: [
-              {
-                required: true,
-                message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }
-            ],                  },
-                                customerBank: {
-          label: '瀹㈡埛寮�鎴疯',
-                            },
-                                customerBankAccount: {
-          label: '瀹㈡埛閾惰璐﹀彿',
-                            },
-                                receivingBankAccount: {
-          label: '鏀舵閾惰璐︽埛',
-                            },
-                                receivingBank: {
-          label: '鏀舵璐︽埛寮�鎴疯',
-                            },
-                                receiptDate: {
-          label: '鏀舵鏃ユ湡',
-                                rules: [
-              {
-                required: true,
-                message: "鏀舵鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
-            ],                  },
-                                receiptAmount: {
-          label: '鏀舵閲戦',
-                                rules: [
-              {
-                required: true,
-                message: "鏀舵閲戦涓嶈兘涓虹┖", trigger: "blur" }
-            ],                  },
-                                remainingPendingAmount: {
-          label: '鏀舵鍚庡緟鏀堕噾棰�',
-                            },
-                                remark: {
-          label: '澶囨敞',
-                      type: 'textarea', minRows: 3, maxRows: 5,
-                            },
-                                createBy: {
-          label: '鍒涘缓浜�',
-                            },
-                                createTime: {
-          label: '鍒涘缓鏃堕棿',
-                            },
-                                updateBy: {
-          label: '鏇存柊浜�',
-                            },
-                                updateTime: {
-          label: '鏇存柊鏃堕棿',
-                            },
-                                deleted: {
-          label: '鍒犻櫎鏍囪(0:姝e父;1:鍒犻櫎)',
-                            },
-          }
-  })
+    billId: {
+      label: '搴旀敹璐﹀崟ID',
+      rules: [
+        {
+          required: true,
+          message: "搴旀敹璐﹀崟ID涓嶈兘涓虹┖", trigger: "blur"
+        }
+      ],
+    },
+    settlementMethod: {
+      label: '缁撶畻鏂瑰紡',
+      rules: [
+        {
+          required: true,
+          message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur"
+        }
+      ],
+    },
+    customerBank: {
+      label: '瀹㈡埛寮�鎴疯',
+    },
+    customerBankAccount: {
+      label: '瀹㈡埛閾惰璐﹀彿',
+    },
+    receivingBankAccount: {
+      label: '鏀舵閾惰璐︽埛',
+    },
+    receivingBank: {
+      label: '鏀舵璐︽埛寮�鎴疯',
+    },
+    receiptDate: {
+      label: '鏀舵鏃ユ湡',
+      rules: [
+        {
+          required: true,
+          message: "鏀舵鏃ユ湡涓嶈兘涓虹┖", trigger: "blur"
+        }
+      ],
+    },
+    receiptAmount: {
+      label: '鏀舵閲戦',
+      rules: [
+        {
+          required: true,
+          message: "鏀舵閲戦涓嶈兘涓虹┖", trigger: "blur"
+        }
+      ],
+    },
+    remainingPendingAmount: {
+      label: '鏀舵鍚庡緟鏀堕噾棰�',
+    },
+    remark: {
+      label: '澶囨敞',
+      type: 'textarea', minRows: 3, maxRows: 5,
+    },
+    createBy: {
+      label: '鍒涘缓浜�',
+    },
+    createTime: {
+      label: '鍒涘缓鏃堕棿',
+    },
+    updateBy: {
+      label: '鏇存柊浜�',
+    },
+    updateTime: {
+      label: '鏇存柊鏃堕棿',
+    },
+    deleted: {
+      label: '鍒犻櫎鏍囪(0:姝e父;1:鍒犻櫎)',
+    },
+  }
+})
 
-  const { tableData,pageF,rowSave,rowUpdate,rowDel,beforeOpen,searchChange,
-    searchReset,selectionChange,onLoad,currentChange,sizeChange,handleDelete,handleExport,handleUpdate,refreshChange} = usePagePlus({
-    form:form,
-    option:option,
-    queryParams:queryParams,
-    idKey:'id',
-    page:page.value,
-    getListApi:listReceivableBillSettlementDetail,
-    getDetailApi:getReceivableBillSettlementDetail,
-    exportApi:exportReceivableBillSettlementDetail,
-    deleteApi:delReceivableBillSettlementDetail,
-    addApi:addReceivableBillSettlementDetail,
-    updateApi:updateReceivableBillSettlementDetail,
-    handleUpdateFunc:()=>{
+const { tableData, pageF, rowSave, rowUpdate, rowDel, beforeOpen, searchChange,
+  searchReset, selectionChange, onLoad, currentChange, sizeChange, handleDelete, handleExport, handleUpdate, refreshChange } = usePagePlus({
+    form: form,
+    option: option,
+    queryParams: queryParams,
+    idKey: 'id',
+    page: page.value,
+    getListApi: listReceivableBillSettlementDetail,
+    getDetailApi: getReceivableBillSettlementDetail,
+    exportApi: exportReceivableBillSettlementDetail,
+    deleteApi: delReceivableBillSettlementDetail,
+    addApi: addReceivableBillSettlementDetail,
+    updateApi: updateReceivableBillSettlementDetail,
+    handleUpdateFunc: () => {
       crudRef.value.rowEdit(selectionList.value[0]);
     },
-    handleSelectionChangeFunc:(selection:any)=>{
+    handleSelectionChangeFunc: (selection: any) => {
       selectionList.value = selection;
     }
   })

--
Gitblit v1.8.0