From ce573bba85409da80602a76f6f7e08f6ddf56ecc Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期五, 06 五月 2022 18:07:34 +0800
Subject: [PATCH] Fixed#138609 顧問端_約訪通知內容中 手機和email 中要有分隔線
---
PAMapp/components/Interview/InterviewMsg.vue | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewMsg.vue b/PAMapp/components/Interview/InterviewMsg.vue
index 3a51fea..bb25cf7 100644
--- a/PAMapp/components/Interview/InterviewMsg.vue
+++ b/PAMapp/components/Interview/InterviewMsg.vue
@@ -17,26 +17,15 @@
></DateTimePicker>
</div>
- <div class="send-msg-nav mt-10" style="justify-content: flex-start; align-items: center">
- <div class="mdTxt">��摰�</div>
- <div class="ml-10">
- <label for="addContactInfo" style="color: #ED1B2E; font-size: 18px; cursor: pointer">
- <input
- style="display: none"
- type="checkbox"
- id="addContactInfo"
- @click="interviewContent.addContactInfo = !interviewContent.addContactInfo"
- value="addContactInfo">
- <i class="pr-5" :class="interviewContent.addContactInfo ?'icon-checkbox-1': 'icon-checkbox'"></i>銝�雿萄�蝜怨���
- </label>
- </div>
+ <div class="send-msg-nav mt-10" style="justify-content: flex-start; align-items: center ;">
+ <div class="mdTxt">�隞��摰�</div>
</div>
<el-input
type="textarea"
- :autosize="true"
- placeholder="蝝赤�"
+ placeholder="隢撓��摰�"
resize="none"
+ rows="2"
v-model="interviewContent.customContent">
</el-input>
@@ -44,14 +33,23 @@
<div class="mdTxt">��汗��摰�</div>
</div>
- <el-input
+ <!-- <el-input
type="textarea"
:autosize="true"
placeholder="��汗蝝赤�"
resize="none"
:disabled="true"
- v-model="interviewTxt">
- </el-input>
+ v-model="interviewTxt"> -->
+ <!-- </el-input> -->
+ <div class="interviewContent">
+ <div style="padding:10px;line-height:25px">
+ <i class="content">�憟踝��靽���像����憿批�{loginConsultant.name}}嚗��������</i><br/>
+ <el-input type="textarea" :placeholder="'\{{ 憒����������ㄐ憿舐內 }}'" resize="none" v-model="interviewContent.customContent" readonly autosize="true" ></el-input><br/>
+ <i class="content">{{client.phone ||defaultValue ? ("�����銝膩������蝜�"+ "\n" + (this.interviewContent.formattedInterviewTime || "(撠����赤��挾)")): ""}}</i><br/>
+ <i class="content">隞乩����閰梯�Ⅳ/Email嚗{loginConsultant.phoneNumber || '撠���閰梯�Ⅳ'}} / {{loginConsultant.email || '撠���� Email'}}</i><br/>
+ <i class="content">�甇斗���靘選����蝜恬�����</i>
+ </div>
+ </div>
<div class="msg-dialog-btn">
<el-button @click="addInterview" :disabled="isBtnDisabled">���</el-button>
@@ -125,7 +123,7 @@
const targetDate = new Date(this.interviewContent.interviewTime);
this.interviewContent.formattedInterviewTime = `${targetDate.getFullYear()}撟�${targetDate.getMonth() + 1}���${targetDate.getDate()}� ${targetDate.getHours()}���${targetDate.getMinutes()}��;
}
- this.interviewTxt = this.interviewContent.customContent + "\n" + ( this.client.phone || this.defaultValue ? ("�����銝膩������蝜�"+ "\n" + (this.interviewContent.formattedInterviewTime || "(撠����赤��挾)")): "") + "\n" +"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + (this.loginConsultant.phoneNumber || '(撠���閰梯�Ⅳ)') + "\n" + (this.loginConsultant.email|| '撠���� Email') + "\n" +"�甇斗���靘選����蝜恬�����";
+ this.interviewTxt = "�憟踝��靽���像����憿批��"+this.loginConsultant.name+"嚗��������"+"\n"+this.interviewContent.customContent+ "\n" ��+ ( this.client.phone || this.defaultValue ? ("�����銝膩������蝜�"+ "\n" + (this.interviewContent.formattedInterviewTime || "(撠����赤��挾)")): "") + "\n" +"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + (this.loginConsultant.phoneNumber || '(撠���閰梯�Ⅳ)') + "\n" + (this.loginConsultant.email|| '撠���� Email') + "\n" +"�甇斗���靘選����蝜恬�����";
} else {
this.interviewTxt = this.interviewContent.customContent;
}
@@ -141,7 +139,7 @@
//////////////////////////////////////////////////////////////////////
mounted() {
- this.interviewContent.customContent = `�憟踝��靽���像����憿批��${this.loginConsultant.name}嚗�������;
+ this.interviewContent.customContent ='';
}
addInterview() {
@@ -204,6 +202,7 @@
padding:10px;
text-align: justify;
font-weight: 600;
+
}
.msg-dialog-btn{
margin-top: 30px;
@@ -215,5 +214,38 @@
flex-direction: column;
align-items: center;
}
+
+ .interviewContent {
+ border: 1px solid #D0D0CE;
+ border-radius: 4px;
+ overflow-y: auto;
+ height: 180px;
+ background-color:#F8F9FA;
+ textarea {
+ outline:none !important;
+ border: none;
+ background-color:transparent;
+ color: red;
+ }
+ ::placeholder {
+ color: red;
+ }
+ }
+ .content{
+ font-size: 18px;
+ font-weight: bold;
+ color: #CCCCCC;
+ }
+
+ .el-input__inner {
+ border:1px solid #707070;
+ border-radius:4px;
+ }
+ .interview-other-msg {
+ max-height: 80px;
+ overflow-y: auto;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ }
}
</style>
--
Gitblit v1.8.0