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 | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 722db75..511920e 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" class="required">蝝赤����</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>
@@ -250,17 +252,15 @@
}
}
.required {
- position: relative;
- transform: translateX(10px);
+ position: relative;
- &::before {
- content: '*';
- font-size: 15px;
- font-weight: bold;
- position: absolute;
- color: #FF0000;
- transform: translateX(-10px);
- z-index: 5;
+ &::before {
+ content: '*';
+ position: absolute;
+ color: #FF0000;
+ transform: translate(-12px, 0);
+ z-index: 5;
+ }
}
-}
+
</style>
--
Gitblit v1.8.0