From cee4aba1b46454f3220d0408694dd734705ac6fc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 30 十月 2026 08:44:59 +0800
Subject: [PATCH] fix: 请假和出差详情缺失时间
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 50 +++++++++++++++++++++++++
src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue | 35 +++++++++++++++++
2 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index cc5f303..a3c5157 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -53,6 +53,30 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="isLeaveApproval">
+ <el-col :span="24">
+ <el-form-item label="璇峰亣鏃堕棿锛�">
+ <el-input :model-value="leaveDateRange"
+ disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="isBusinessTripApproval">
+ <el-col :span="24">
+ <el-form-item label="鍑哄樊鏃堕棿锛�">
+ <el-input :model-value="tripTimeRange"
+ disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="isBusinessTripApproval">
+ <el-col :span="24">
+ <el-form-item label="鍑哄樊鍦扮偣锛�">
+ <el-input :model-value="form.location || '--'"
+ disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠�"鏌ョ湅璇︽儏瀵硅瘽妗�"鍐呭缁撴瀯锛� -->
<div v-if="isQuotationApproval"
@@ -373,6 +397,8 @@
const isQuotationApproval = computed(() => Number(props.approveType) === 6);
const isPurchaseApproval = computed(() => Number(props.approveType) === 5);
const isDeliveryApproval = computed(() => Number(props.approveType) === 7);
+ const isBusinessTripApproval = computed(() => Number(props.approveType) === 3);
+ const isLeaveApproval = computed(() => Number(props.approveType) === 2);
const data = reactive({
form: {
@@ -384,6 +410,30 @@
});
const { form } = toRefs(data);
+ // 鍑哄樊鏃堕棿鏍煎紡鍖�
+ const formatTripDateTime = value => {
+ if (!value) return "--";
+ return String(value).replace("T", " ").slice(0, 16);
+ };
+ const tripTimeRange = computed(() => {
+ const start = formatTripDateTime(form.value.startDateTime);
+ const end = formatTripDateTime(form.value.endDateTime);
+ if (start === "--" && end === "--") return "--";
+ return `${start} 鑷� ${end}`;
+ });
+
+ // 璇峰亣鏃ユ湡鏍煎紡鍖�
+ const formatLeaveDate = value => {
+ if (!value) return "--";
+ return String(value).replace("T", " ").slice(0, 10);
+ };
+ const leaveDateRange = computed(() => {
+ const start = formatLeaveDate(form.value.startDate);
+ const end = formatLeaveDate(form.value.endDate);
+ if (start === "--" && end === "--") return "--";
+ return `${start} 鑷� ${end}`;
+ });
+
// 鑺傜偣鏍囬
const getNodeTitle = (index, len) => {
if (index === len - 1) return "缁撴潫";
diff --git a/src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue b/src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue
index 1625ef1..95a5865 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue
@@ -13,6 +13,15 @@
<el-descriptions-item label="鎶ラ攢閲戦" v-if="Number(props.approveType) === 4">
{{ form.price }}
</el-descriptions-item>
+ <el-descriptions-item label="璇峰亣鏃堕棿" v-if="isLeaveApproval">
+ {{ leaveDateRange }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊鏃堕棿" v-if="isBusinessTripApproval">
+ {{ tripTimeRange }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊鍦扮偣" v-if="isBusinessTripApproval">
+ {{ form.location || '--' }}
+ </el-descriptions-item>
</el-descriptions>
<!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠�"鏌ョ湅璇︽儏瀵硅瘽妗�"鍐呭缁撴瀯锛� -->
<div v-if="isQuotationApproval"
@@ -339,6 +348,8 @@
const isQuotationApproval = computed(() => Number(props.approveType) === 6);
const isPurchaseApproval = computed(() => Number(props.approveType) === 5);
const isDeliveryApproval = computed(() => Number(props.approveType) === 7);
+ const isBusinessTripApproval = computed(() => Number(props.approveType) === 3);
+ const isLeaveApproval = computed(() => Number(props.approveType) === 2);
const data = reactive({
form: {
@@ -350,6 +361,30 @@
});
const { form } = toRefs(data);
+ // 鍑哄樊鏃堕棿鏍煎紡鍖�
+ const formatTripDateTime = value => {
+ if (!value) return "--";
+ return String(value).replace("T", " ").slice(0, 16);
+ };
+ const tripTimeRange = computed(() => {
+ const start = formatTripDateTime(form.value.startDateTime);
+ const end = formatTripDateTime(form.value.endDateTime);
+ if (start === "--" && end === "--") return "--";
+ return `${start} 鑷� ${end}`;
+ });
+
+ // 璇峰亣鏃ユ湡鏍煎紡鍖�
+ const formatLeaveDate = value => {
+ if (!value) return "--";
+ return String(value).replace("T", " ").slice(0, 10);
+ };
+ const leaveDateRange = computed(() => {
+ const start = formatLeaveDate(form.value.startDate);
+ const end = formatLeaveDate(form.value.endDate);
+ if (start === "--" && end === "--") return "--";
+ return `${start} 鑷� ${end}`;
+ });
+
// 鑺傜偣鏍囬
const getNodeTitle = (index, len) => {
if (index === len - 1) return "缁撴潫";
--
Gitblit v1.9.3