Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

This commit is contained in:
lpq
2023-02-22 20:39:54 +08:00

View File

@@ -68,14 +68,14 @@
</div> </div>
<span style="margin-right: 3px">选择试卷</span> <span style="margin-right: 3px">选择试卷</span>
</div> </div>
<s-test v-model:id="formData.examinationTestId" v-model:name="formData.examinationTestName"> <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
<div class="btnbox"> <div class="btnbox">
<button class="xkbtn" style="margin:0"> <button class="xkbtn" style="margin:0">
{{ formData.examinationTestId ? "重选" : "选择" }}试卷 {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
</button> </button>
</div> </div>
</s-test> </s-test>
<div v-if="formData.examinationTestId"> <div v-if="formData.examinationPaperId">
<a-tag closable color="processing" @close="delTag" :closeIcon="true"> <a-tag closable color="processing" @close="delTag" :closeIcon="true">
<span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span> <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
</a-tag> </a-tag>
@@ -328,7 +328,7 @@ const props = defineProps({
const visible = ref(false) const visible = ref(false)
const initValue = { const initValue = {
examinationName: '', examinationName: '',
examinationTestId: '', examinationPaperId: '',
examinationStartTime: '', examinationStartTime: '',
examinationEndTime: '', examinationEndTime: '',
examinationDuration: '', examinationDuration: '',
@@ -349,7 +349,7 @@ const innerRule = {
message: '请输入考试名称', message: '请输入考试名称',
}, },
], ],
examinationTestId: [ examinationPaperId: [
{ {
required: true, required: true,
message: '请输入选择试卷', message: '请输入选择试卷',
@@ -451,7 +451,7 @@ function openDrawer(i, row) {
} }
const delTag = () => { const delTag = () => {
formData.value.examinationTestId = ''; formData.value.examinationPaperId = '';
formData.value.examinationTestName = ''; formData.value.examinationTestName = '';
} }