From cd4d5eb9a68fd7fdddd0fb1b0d99d6b2d40c82ef Mon Sep 17 00:00:00 2001
From: Yjhon <hbzgyjh@126.com>
Date: Tue, 8 Mar 2022 18:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=8D=B7=E7=AD=96=E7=95=A5=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E8=B0=83=E6=95=B4,=E4=BA=BA=E5=91=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=B0=83=E6=95=B4,=E7=BB=93=E6=9E=9C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B9=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectStepForm.vue         | 14 +++++------
 src/views/project/form/ProjectPersonForm.vue  |  2 +-
 .../ProjectTestPaperFormationStrategy.vue     | 23 ++++++++-----------
 src/views/project/form/Result.vue             |  4 +++-
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
index 7ea6882..b64d126 100644
--- a/src/views/project/ProjectStepForm.vue
+++ b/src/views/project/ProjectStepForm.vue
@@ -5,7 +5,7 @@
       <a-step title="基本信息" />
       <!-- <a-step title="选择单位" /> -->
       <a-step title="选择课程" />
-      <a-step title="选择人员" />
+      <a-step v-if="this.form.projectType != 0" title="选择人员" />
       <a-step v-if="['2', '4'].includes(form.trainWay)" title="组卷策略" />
       <a-step :title="this.result ? '完成' : '失败'" />
     </a-steps>
@@ -99,12 +99,14 @@ export default {
     saveData() {
       projectAdd(Object.assign({}, this.form)).then(res => {
         if (res.code == 200) {
+          console.log('success');
           this.status = 'success'
-          this.currentTab = 5
+          this.currentTab = 4
         } else {
+          console.log('error');
           this.status = 'error'
           this.result = false
-          this.currentTab = 5
+          this.currentTab = 4
         }
       })
     },
@@ -119,11 +121,7 @@ export default {
         if (childValue) {
           this.form = childValue
         }
-        if(['1','3'].includes(childValue.trainWay) && this.currentTab == 2){
-          this.currentTab += 2
-        } else {
-          this.currentTab += 1
-        }
+        this.currentTab += 1
       }
       console.log('ProjectStepForm表单数据', this.form)
     },
diff --git a/src/views/project/form/ProjectPersonForm.vue b/src/views/project/form/ProjectPersonForm.vue
index 3e14ea0..96a46f7 100644
--- a/src/views/project/form/ProjectPersonForm.vue
+++ b/src/views/project/form/ProjectPersonForm.vue
@@ -14,7 +14,7 @@
         </a-menu>
         <div v-if="this.orgTree != ''">
           <a-tree :treeData="orgTree" v-if="orgTree.length" @select="onSelect" :defaultExpandAll="false" 
-          :defaultExpandedKeys="expandedKeys" :replaceFields="replaceFields" :defaultSelectedKeys="defaultSelectedKeys" showLine="true">
+          :defaultExpandedKeys="expandedKeys" :replaceFields="replaceFields" :defaultSelectedKeys="defaultSelectedKeys" :showLine="true">
             <a-icon slot="switcherIcon" type="down" />
           </a-tree>
         </div>
diff --git a/src/views/project/form/ProjectTestPaperFormationStrategy.vue b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
index f186203..54b7165 100644
--- a/src/views/project/form/ProjectTestPaperFormationStrategy.vue
+++ b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
@@ -4,32 +4,32 @@
       <a-row :gutter="24">
         <a-col :md="10" :sm="12">
           <a-form-model-item label="总分" prop="totalScore">
-            <a-input-number v-model="form.totalScore" :disabled="true" />
+            <a-input-number v-model="form.totalScore" :disabled="true" /> 分
           </a-form-model-item>
         </a-col>
         <a-col :md="14" :sm="12">
           <a-form-model-item label="及格分数" prop="passScore">
-            <a-input-number v-model="form.passScore" :min="1" :max="100" />
+            <a-input-number v-model="form.passScore" :min="1" :max="100" /> 分
           </a-form-model-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :md="10" :sm="12">
           <a-form-model-item label="考试时长" prop="examTime">
-            <a-input-number :min="0" v-model="form.examTime" />
+            <a-input-number :min="0" v-model="form.examTime" /> 分钟
           </a-form-model-item>
         </a-col>
         <a-col :md="14" :sm="12">
           <a-form-model-item label="默认组卷题量" prop="topicNumber">
-            <a-input-number :min="0" v-model="form.topicNumber" />
+            <a-input-number :min="0" v-model="form.topicNumber" /> 题
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row v-if="!['2'].includes(form.trainWay)" :gutter="24">
+      <a-row v-if="form.trainWay == 4" :gutter="24">
         <h4>考试开启条件：</h4>
         <a-col :md="10" :sm="12">
           <a-form-model-item label="学时时长" prop="examOpenCondition">
-            <a-input-number :min="0" v-model="form.examOpenCondition" />
+            <a-input-number :min="0" v-model="form.examOpenCondition" /> 学时
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -86,13 +86,10 @@ export default {
       formItemLayout: { labelCol: { span: 4 }, wrapperCol: { span: 14 } },
       rules: {
         totalScore: [{ required: true, message: '请输入组卷总分', trigger: 'blur' }],
-        trainClass: [{ required: true, message: '请选择培训分类', trigger: 'blur' }],
-        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-        trainClass: [{ required: true, message: '请选择培训分类', trigger: 'blur' }],
-        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-        trainClass: [{ required: true, message: '请选择培训分类', trigger: 'blur' }],
-        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-        trainClass: [{ required: true, message: '请选择培训分类', trigger: 'blur' }]
+        passScore: [{ required: true, message: '请输入及格分数', trigger: 'blur' }],
+        examTime: [{ required: true, message: '请输入考试时长', trigger: 'blur' }],
+        topicNumber: [{ required: true, message: '请输入默认组卷题量', trigger: 'blur' }],
+        examOpenCondition: [{ required: true, message: '请输入学时时长', trigger: 'blur' }]
       },
       columns: [
         { title: '序号', key: 'i', dataIndex: 'i', width: 70, scopedSlots: { customRender: 'serial' } },
diff --git a/src/views/project/form/Result.vue b/src/views/project/form/Result.vue
index 9bc50be..d3e8f59 100644
--- a/src/views/project/form/Result.vue
+++ b/src/views/project/form/Result.vue
@@ -53,7 +53,9 @@ export default {
     },
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created() {
+    console.log('result page init ok!')
+  },
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {},
   // 生命周期 - 创建之前