From 0d1ab8fb8791a211f2b7d4a09918cd6e4d29ea95 Mon Sep 17 00:00:00 2001
From: Yjhon <hbzgyjh@126.com>
Date: Wed, 23 Feb 2022 11:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4,=E7=BB=84=E5=8D=B7=E7=AD=96=E7=95=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetail.vue                       | 8 ++++----
 .../project/form/ProjectTestPaperFormationStrategy.vue    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/project/ProjectDetail.vue b/src/views/project/ProjectDetail.vue
index f027b31..51c8e80 100644
--- a/src/views/project/ProjectDetail.vue
+++ b/src/views/project/ProjectDetail.vue
@@ -9,9 +9,9 @@
         <a-descriptions-item label="培训类型">{{projectBasicInfo.trainType == 1 ? '必修课':'选修课'}}</a-descriptions-item>
         <a-descriptions-item label="培训种类">{{projectBasicInfo.trainClassName}}</a-descriptions-item>
         <a-descriptions-item label="培训方式">{{projectBasicInfo.trainWayName}}</a-descriptions-item>
-        <a-descriptions-item label="培训时间">{{projectBasicInfo.trainSdate + ' - ' + projectBasicInfo.trainEdate}}</a-descriptions-item>
-        <a-descriptions-item label="练习时间">{{projectBasicInfo.practiceSdate + ' - ' + projectBasicInfo.practiceEdate}}</a-descriptions-item>
-        <a-descriptions-item label="考试时间">{{projectBasicInfo.examSdate + ' - ' + projectBasicInfo.examEdate}}</a-descriptions-item>
+        <a-descriptions-item v-if="projectBasicInfo.trainSdate != null" label="培训时间">{{projectBasicInfo.trainSdate + ' - ' + projectBasicInfo.trainEdate}}</a-descriptions-item>
+        <a-descriptions-item v-if="projectBasicInfo.practiceSdate != null" label="练习时间">{{projectBasicInfo.practiceSdate + ' - ' + projectBasicInfo.practiceEdate}}</a-descriptions-item>
+        <a-descriptions-item v-if="projectBasicInfo.examSdate != null" label="考试时间">{{projectBasicInfo.examSdate + ' - ' + projectBasicInfo.examEdate}}</a-descriptions-item>
         <a-descriptions-item label="考试次数">{{projectBasicInfo.examNumber + '次'}}</a-descriptions-item>
         <a-descriptions-item label="模拟考试">{{projectBasicInfo.mockExam == 1 ? '允许':'不允许'}}</a-descriptions-item>
         <a-descriptions-item label="备注">{{projectBasicInfo.remark}}</a-descriptions-item>
@@ -63,7 +63,7 @@ export default {
       personColumns: [ //人员列
         { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
         { title: '姓名', dataIndex: 'name', key: 'name' },
-        { title: '受训角色', dataIndex: 'role', key: 'role', },
+        // { title: '受训角色', dataIndex: 'role', key: 'role', },
         { title: '单位信息', key: 'company', dataIndex: 'company', },
         { title: '部门信息', dataIndex: 'department', key: 'department', },
       ],
diff --git a/src/views/project/form/ProjectTestPaperFormationStrategy.vue b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
index d9e176d..59e132e 100644
--- a/src/views/project/form/ProjectTestPaperFormationStrategy.vue
+++ b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
@@ -25,7 +25,7 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row v-if="!['2'].includes(form.trainWay)" :gutter="24">
         <h4>考试开启条件：</h4>
         <a-col :md="10" :sm="12">
           <a-form-model-item label="学时时长" prop="examOpenCondition">
@@ -69,6 +69,7 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 // 例如：import 《组件名称》 from '《组件路径》'
 import { getQuestionNumByCourseIds } from '@/api/course/question/question'
+import Item from '@/components/AvatarList/Item'
 
 export default {
   // import引入的组件需要注入到对象中才能使用
@@ -158,13 +159,13 @@ export default {
   methods: {
     //保存
     toSave() {
-      this.form.testPaperTactics = this.tableData;
+      this.form.testPaperTactics = this.tableData.filter((Item) => {return Item.topicNum && Item.topicScore});
       this.form.projectStatus = 1
       this.$emit('executeSave', this.form)
     },
     //发布
     toIssue() {
-      this.form.testPaperTactics = this.tableData
+      this.form.testPaperTactics = this.tableData.filter((Item) => {return Item.topicNum && Item.topicScore});
       this.form.projectStatus = 2
       this.$emit('executeIssue', this.form)
     },