From f8f9a3bda066d2d757b658dd346c781267687c84 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 二月 2026 16:51:20 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/salesManagement/receiptPayment/index.vue | 3 +++
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue | 10 ++++++++++
src/views/financialManagement/revenueManagement/Modal.vue | 2 +-
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
index 4fc7088..ab7a63e 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
@@ -222,7 +222,17 @@
// 鍒濆鍖栨椂闂撮�夐」
const initTimeOptions = () => {
const options = []
+ const now = new Date()
+ const currentHour = now.getHours()
+ const currentMinute = now.getMinutes()
for (let hour = 8; hour <= 18; hour++) {
+ // 寮�濮嬫椂闂村繀椤绘櫄浜庡綋鍓嶆椂闂�
+ if (hour < currentHour) {
+ continue
+ }
+ if (hour === currentHour && currentMinute > 30) {
+ continue
+ }
// 姣忎釜灏忔椂娣诲姞涓や釜閫夐」锛氭暣鐐瑰拰鍗婄偣
options.push({
value: `${hour.toString().padStart(2, '0')}:00`,
diff --git a/src/views/financialManagement/revenueManagement/Modal.vue b/src/views/financialManagement/revenueManagement/Modal.vue
index 245cdf2..7dd6865 100644
--- a/src/views/financialManagement/revenueManagement/Modal.vue
+++ b/src/views/financialManagement/revenueManagement/Modal.vue
@@ -26,7 +26,7 @@
placeholder="璇烽�夋嫨"
clearable
>
- <el-option :label="item.label" :value="item.value" v-for="(item,index) in income_types" :key="index" />
+ <el-option :label="item.label" :value="item.value" v-for="(item,index) in income_types.filter(item => item.value != 3)" :key="index" />
</el-select>
</el-form-item>
<el-form-item label="瀹㈡埛鍚嶇О" prop="customerName">
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 6ded92b..83cf942 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -40,6 +40,7 @@
<el-table
:data="tableData"
border
+ ref="tableRef"
v-loading="tableLoading"
@selection-change="handleSelectionChange"
:row-key="(row) => row.id"
@@ -313,6 +314,7 @@
});
const total = ref(0);
const expandedRowKeys = ref([]);
+const tableRef = ref(null);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const dialogFormVisible = ref(false);
@@ -491,6 +493,7 @@
dialogFormVisible.value = false;
// 閬垮厤浜屾鎵撳紑寮圭獥鏃朵粛鎼哄甫涓婁竴娆＄殑閫夋嫨瀵艰嚧鈥滃鍑轰竴琛�/鑴忔暟鎹��
selectedRows.value = [];
+ tableRef.value?.clearSelection();
};
// 鍒犻櫎鍥炴璁板綍
--
Gitblit v1.9.3