From ceb7e15100a91b99c8be0a64f4c50ade08281f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 十月 2025 11:51:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/operaVisitsReportWindow.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/operaVisitsReportWindow.vue b/admin/src/components/business/operaVisitsReportWindow.vue
index 1884a39..161bfdd 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
@@ -55,7 +55,7 @@
></el-input>
</el-form-item>
<el-form-item label="鍏ュ洯杞﹁締" prop="carNos">
- <el-input v-model="param.carNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
+ <el-input v-model.trim="param.carNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
</el-form-item>
<el-form-item label="闅忚溅浜烘暟" prop="memberNum">
<el-input
@@ -85,7 +85,6 @@
import dayjs from 'dayjs'
import { createVisit, getVisitedVisitReason } from '@/api/business/visits'
export default {
- name: 'OperaVisitsHkWindow',
extends: BaseOpera,
components: {
GlobalWindow,
@@ -206,6 +205,11 @@
if (!valid) {
return
}
+ const { param } = this
+ if(param.carNos){
+ param.carNos = param.carNos.replace(/\s*/g,"")
+ param.carNos = param.carNos.replace(/[\r\n]/g, "")
+ }
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
createVisit({
@@ -220,7 +224,7 @@
this.$emit('close')
})
.catch(e => {
- this.$tip.apiFailed(e)
+
})
.finally(() => {
this.isWorking = false
--
Gitblit v1.9.3