From 3dd41875f8a623bda069ab4f9c1e2fd6c757c44e Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 17:06:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/components/Interview/InterviewAdd.vue | 22 +++++++++++++++++-----
PAMapp/pages/agentInfo/_agentNo.vue | 11 +++++++----
PAMapp/components/Interview/InterviewMsg.vue | 4 ++++
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 3a7ded0..511920e 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -5,8 +5,9 @@
<span>{{interviewRecord.lastModifiedDate | formatDate}} ��</span>
</div>
<el-row class="mdTxt mb-10">
- <el-col :xs="16" :sm="20" v-if="interviewId">蝝赤����</el-col>
- <el-col :xs="16" :sm="20" class="required" v-else>蝝赤����</el-col>
+ <el-col :xs="16" :sm="20">
+ <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
+ </el-col>
<el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
<span
v-if="!isEdit"
@@ -27,12 +28,12 @@
></DateTimePicker>
</template>
<template v-else>
- <div class="mdTxt lighter mt-20">
+ <div class="fs-20 mt-20">
{{formatInterviewDate}}
</div>
</template>
- <div class="mdTxt mb-10 mt-30">蝝赤蝝����</div>
+ <div class="mdTxt mb-10 mt-30" :class="{'required': !interviewId || isEdit}">蝝赤蝝����</div>
<template v-if="!interviewId || isEdit">
<el-input
type="textarea"
@@ -44,7 +45,7 @@
</el-input>
</template>
<template v-else>
- <div class="mdTxt lighter mt-20">
+ <div class="fs-20 mt-20">
{{content}}
</div>
</template>
@@ -250,5 +251,16 @@
font-size: 20px;
}
}
+.required {
+ position: relative;
+
+ &::before {
+ content: '*';
+ position: absolute;
+ color: #FF0000;
+ transform: translate(-12px, 0);
+ z-index: 5;
+ }
+ }
</style>
diff --git a/PAMapp/components/Interview/InterviewMsg.vue b/PAMapp/components/Interview/InterviewMsg.vue
index 17837dc..be4a0b9 100644
--- a/PAMapp/components/Interview/InterviewMsg.vue
+++ b/PAMapp/components/Interview/InterviewMsg.vue
@@ -62,6 +62,9 @@
@appointmentStore.Action
updateAppointmentDetail!: (id: number) => Appointment;
+ @appointmentStore.Action
+ getMyAppointmentList!: () => Promise<Appointment[]>;
+
@PropSync('isVisible')
dialogVisible!: boolean;
@@ -103,6 +106,7 @@
appointmentService.informAppointment(appointmentInformation).then((_) => {
this.isShowSuccessAlert = true ;
this.updateAppointmentDetail(this.client.id);
+ this.getMyAppointmentList();
});
}
diff --git a/PAMapp/pages/agentInfo/_agentNo.vue b/PAMapp/pages/agentInfo/_agentNo.vue
index 17a3b3d..5b948c9 100644
--- a/PAMapp/pages/agentInfo/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/_agentNo.vue
@@ -146,7 +146,7 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField icon="comment" label="�犖��艙">
+ <UiField icon="comment" label="�犖��艙" class="agent-info-textarea">
{{ agentInfo.concept }}
</UiField>
</el-row>
@@ -154,7 +154,7 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField icon="school" label="�犖��">
+ <UiField icon="school" label="�犖��" class="agent-info-textarea">
<span>
{{ agentInfo.experiences }}
</span>
@@ -164,7 +164,7 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField icon="trophy" label="敺��風">
+ <UiField icon="trophy" label="敺��風" class="agent-info-textarea">
{{ agentInfo.awards }}
</UiField>
</el-row>
@@ -332,5 +332,8 @@
.pam-field{
display: flex;
}
-
+.agent-info-textarea{
+ word-break: break-all;
+ word-wrap: break-word;
+}
</style>
--
Gitblit v1.8.0