From a1e663eeb588f419b1622ca07b23fb9d44292ee9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/operaVisitsReportWindow.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/business/operaVisitsReportWindow.vue b/admin/src/components/business/operaVisitsReportWindow.vue
index 1884a39..d45b176 100644
--- a/admin/src/components/business/operaVisitsReportWindow.vue
+++ b/admin/src/components/business/operaVisitsReportWindow.vue
@@ -10,7 +10,7 @@
<el-form :model="param" ref="paramRef" :rules="rules">
<div class="title_tip">璁垮棰勭害</div>
<el-form-item label="琚浜�" prop="startTime">
- {{ userInfo.realname }} {{ userInfo.company.companyNamePath }}
+ {{ userInfo.realname }} <template v-if="userInfo.company && userInfo.company.companyNamePath">{{ userInfo.company.companyNamePath }}</template>
</el-form-item>
<el-form-item label="鍏ュ洯鏃堕棿" prop="starttime">
<el-date-picker
@@ -85,7 +85,6 @@
import dayjs from 'dayjs'
import { createVisit, getVisitedVisitReason } from '@/api/business/visits'
export default {
- name: 'OperaVisitsHkWindow',
extends: BaseOpera,
components: {
GlobalWindow,
@@ -220,7 +219,7 @@
this.$emit('close')
})
.catch(e => {
- this.$tip.apiFailed(e)
+
})
.finally(() => {
this.isWorking = false
--
Gitblit v1.9.3