From 9578ae952527cdafc64d642f5183aa60ef92b7f2 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 10 九月 2025 11:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
index 02cc9eb..5da6fa1 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -8,7 +8,7 @@
<template #dispatchNo-form="{ row, size, }">
<div style="cursor: pointer;">
- <el-input v-model="form.dispatchNo" @click="handleFormSearch" readonly placeholder="璇疯緭鍏ヨ皟搴﹀崟鍙�">
+ <el-input v-model="form.dispatchNo" @click="handleFormSearch" readonly placeholder="璇疯緭鍏� 璋冨害鍗曞彿">
<template #append>
<el-button icon="Search" style="cursor: pointer;" @click="handleFormSearch"></el-button>
</template>
@@ -38,14 +38,16 @@
@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" 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" type="primary"
+ v-if="row.isConfirmed == 1 && row.relatedBillStatus != 2 && row.relatedBillStatus != 3" :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 && ![2, 3].includes(row.relatedBillStatus)"
:underline="false" plain @click="handleAffirm(row)" v-hasPermi="['cwgl:estimatedReceivable:confirm']"> 纭
</el-link>
- <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 1" :underline="false" plain
- @click="handleInvalid(row)" v-hasPermi="['cwgl:estimatedReceivable:invalid']"> 浣滃簾
+ <el-link class="link-btn" type="primary"
+ v-if="row.isConfirmed == 1 && row.relatedBillStatus != 2 && row.relatedBillStatus != 3" :underline="false"
+ plain @click="handleInvalid(row)" v-hasPermi="['cwgl:estimatedReceivable:invalid']"> 浣滃簾
</el-link>
<el-link class="link-btn" type="primary" :underline="false" plain @click="handleFlow(row)"
v-hasPermi="['cwgl:estimatedReceivable:flog']"> 鏃ュ織
@@ -198,12 +200,14 @@
message: "璐圭敤绯荤粺缂栧彿涓嶈兘涓虹┖", trigger: "blur"
}
],
+ minWidth: 140,
search: true,
addDisplay: false,
editDisplay: false,
},
dispatchNo: {
label: '璋冨害鍗曞彿',
+ minWidth: 120,
rules: [
{
required: true,
@@ -227,7 +231,7 @@
label: '瀹㈡埛鍚嶇О',
search: true,
minWidth: 220,
-
+ showOverflowTooltip: true,
type: 'select', // 璁剧疆涓轰笅鎷夋绫诲瀷
dicData: [], // 浣跨敤 selectCustomName 浣滀负鏁版嵁婧�
disabled: false // 鏍规嵁闇�瑕佽缃槸鍚︾鐢�
@@ -236,16 +240,20 @@
label: '椤圭洰鍚嶇О',
search: true,
disabled: true,
+ minWidth: 220,
+ showOverflowTooltip: true,
},
orderDate: {
label: '涓嬪崟鏃ユ湡',
search: true,
+ minWidth: 180,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
feeName: {
label: '璐圭敤鍚嶇О',
+ minWidth: 120,
rules: [
{
required: true,
@@ -270,12 +278,14 @@
},
relatedBillName: {
label: '鍏宠仈璐﹀崟鍚嶇О',
+ minWidth: 120,
addDisplay: false, // 鏂板鏃朵笉鏄剧ず
editDisplay: false, // 淇敼鏃朵笉鏄剧ず
},
relatedBillStatus: {
label: '鍏宠仈璐﹀崟鐘舵��',
search: true,
+ minWidth: 120,
dataType: 'string',
type: 'select',
addDisplay: false, // 鏂板鏃朵笉鏄剧ず
@@ -297,6 +307,8 @@
},
remark: {
label: '澶囨敞',
+ minWidth: 120,
+ showOverflowTooltip: true,
type: 'textarea', minRows: 3, maxRows: 5,
},
@@ -618,3 +630,12 @@
}
getSelectCustomName()
</script>
+<style>
+:deep(.avue-crud__table) {
+ overflow-y: auto;
+}
+
+:deep(.el-scrollbar__bar.is-horizontal) {
+ pointer-events: auto;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0