From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/components/Interview/InterviewAdd.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index cb0f122..145c41f 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -5,18 +5,20 @@
<span>{{interviewRecord.lastModifiedDate | formatDate}} ��</span>
</div>
<el-row class="mdTxt mb-10">
- <el-col :xs="16" :sm="20">蝝赤����</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"
- class="mr-10 text--primary text--underline cursor--pointer"
+ class="mr-10 text--primary cursor--pointer"
@click="showCancelPopUp = true"
- >��</span>
+ ><i class="icon-delet"></i></span>
<span
v-if="!isEdit"
- class="text--primary text--underline cursor--pointer"
+ class="text--primary cursor--pointer"
@click="isEdit = !isEdit"
- >蝺刻摩</span>
+ ><i class="icon-edit"></i></span>
</el-col>
</el-row>
<template v-if="!interviewId || isEdit">
@@ -26,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"
@@ -43,7 +45,7 @@
</el-input>
</template>
<template v-else>
- <div class="mdTxt lighter mt-20">
+ <div class="fs-20 mt-20">
{{content}}
</div>
</template>
@@ -77,7 +79,7 @@
@closePopUp="closePopup">
<div class="text--center mdTxt">{{confirmTxt}}嚗�</div>
<div class="text--center mdTxt">蝡���赤�嚗�</div>
- <div class="text--center mt-30" style="display:flex">
+ <div class="text--center mt-30 confirm-btn">
<el-button @click="closePopup">�����</el-button>
<el-button @click="showInterviewMsgPopup = true" type="primary">���赤�</el-button>
</div>
@@ -86,6 +88,7 @@
<InterviewMsg
:isVisible.sync="showInterviewMsgPopup"
:client="appointmentDetail"
+ :defaultValue="interviewTime"
@closeDialog="closePopup"
></InterviewMsg>
</div>
@@ -248,4 +251,19 @@
font-size: 20px;
}
}
+.required {
+ position: relative;
+
+ &::before {
+ content: '*';
+ position: absolute;
+ color: #FF0000;
+ transform: translate(-12px, 0);
+ z-index: 5;
+ }
+ }
+.confirm-btn{
+ display: flex;
+ justify-content: center;
+}
</style>
--
Gitblit v1.8.0