diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
index a4ffb11..ef1e316 100644
--- a/src/views/project/ProjectStepForm.vue
+++ b/src/views/project/ProjectStepForm.vue
@@ -16,7 +16,13 @@
       <step2 v-if="currentTab === 1" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
       <step3 v-if="currentTab === 2" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
       <step4 v-if="currentTab === 3" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
-      <step5 v-if="currentTab === 4" :projectForm="form" @prevStep="prevStep" @executeSave="executeSave" @executeIssue="executeIssue" />
+      <step5
+        v-if="currentTab === 4"
+        :projectForm="form"
+        @prevStep="prevStep"
+        @executeSave="executeSave"
+        @executeIssue="executeIssue"
+      />
       <result v-if="currentTab === 5" :projectForm="form" @prevStep="prevStep" :projectSaveStatus="status" />
       <!-- </keep-alive> -->
     </div>
@@ -64,7 +70,8 @@ export default {
       confirmLoading: false,
       type: '',
       form: {
-        trainWay: '1',
+        trainWay: '2',
+        totalScore: '100',
       },
       result: true,
       status: '',
@@ -108,7 +115,9 @@ export default {
     nextStep(childValue) {
       console.log('进入下一步', childValue)
       if (this.currentTab < 5) {
-        this.form = childValue
+        if (childValue) {
+          this.form = childValue
+        }
         this.currentTab += 1
       }
       console.log('ProjectStepForm表单数据', this.form)
@@ -117,7 +126,9 @@ export default {
     prevStep(childValue) {
       console.log('返回上一步', childValue)
       if (this.currentTab > 0) {
-        this.form = childValue
+        if (childValue) {
+          this.form = childValue
+        }
         this.currentTab -= 1
       }
       console.log('ProjectStepForm表单数据', this.form)
diff --git a/src/views/project/form/ProjectTestPaperFormationStrategy.vue b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
index 8fb748c..a4ab1ae 100644
--- a/src/views/project/form/ProjectTestPaperFormationStrategy.vue
+++ b/src/views/project/form/ProjectTestPaperFormationStrategy.vue
@@ -1,12 +1,52 @@
 <template>
   <div>
-    <a-card :bordered="false">
-      <p>hahahahhahahahahhahahah</p>
-    </a-card>
+    <a-form-model :model="form" v-bind="formItemLayout">
+      <a-card :bordered="false" title="组卷策略信息">
+        <a-row :gutter="24">
+          <a-col :md="10" :sm="12">
+            <a-form-model-item label="总分">
+              <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="及格分">
+              <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="考试时长">
+              <a-input-number v-model="form.examTime" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="14" :sm="12">
+            <a-form-model-item label="默认组卷题量">
+              <a-input-number v-model="form.topicNumber" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <h4>考试开启条件：</h4>
+          <a-col :md="10" :sm="12">
+            <a-form-model-item label="学时时长">
+              <a-input-number v-model="form.examOpenCondition" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-card>
 
-    <a-card :bordered="false">
-      <p>ppppppsdapppsdapppp</p>
-    </a-card>
+      <a-card :bordered="false" title="组卷策略详情">
+        <a-table :columns="columns" :data-source="tableData" bordered>
+          <template slot="topicNum" slot-scope="text, record">
+            <a-input-number style="margin: -5px 0" v-model="record.topicNum" />
+          </template>
+          <template slot="topicScore" slot-scope="text, record">
+            <a-input-number style="margin: -5px 0" v-model="record.topicScore" />
+          </template>
+        </a-table>
+      </a-card>
+    </a-form-model>
     <a-button type="primary" @click="toSave">保 存</a-button>
     <a-button type="primary" @click="toIssue">发 布</a-button>
     <a-button type="primary" @click="toPrev">上一步</a-button>
@@ -16,6 +56,16 @@
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 // 例如：import 《组件名称》 from '《组件路径》'
+const renderContent = (value, row, index) => {
+  const obj = {
+    children: value,
+    attrs: {},
+  }
+  if (index === 4) {
+    obj.attrs.colSpan = 0
+  }
+  return obj
+}
 
 export default {
   // import引入的组件需要注入到对象中才能使用
@@ -23,12 +73,75 @@ export default {
   props: {
     projectForm: {
       type: Object,
-    }
+    },
   },
   data() {
     // 这里存放数据
     return {
       form: this.projectForm,
+      formItemLayout: { labelCol: { span: 4 }, wrapperCol: { span: 14 } },
+      columns: [
+        { title: '序号', key: 'i', dataIndex: 'i', width: 70, scopedSlots: { customRender: 'serial' } },
+        {
+          title: '题目类型',
+          dataIndex: 'topicType',
+          key: 'topicType',
+          customRender: (text, record, index) => {
+            if (text == 1) return '单选题'
+            if (text == 2) return '多选题'
+            if (text == 3) return '判断题'
+          },
+        },
+        { title: '总题量', dataIndex: 'totalNum', key: 'totalNum' },
+        {
+          title: '考试题量',
+          dataIndex: 'topicNum',
+          width: 100,
+          key: 'topicNum',
+          scopedSlots: { customRender: 'topicNum' },
+        },
+        {
+          title: '单题分值',
+          dataIndex: 'topicScore',
+          width: 100,
+          key: 'topicScore',
+          scopedSlots: { customRender: 'topicScore' },
+        },
+        {
+          title: '总分',
+          dataIndex: 'totalScore',
+          customRender: (value,row,index) => {
+            return { children: value, attrs: { rowSpan: index == 0 ? 3 : 0 }}
+          },
+        },
+      ],
+      tableData: this.projectForm.testPaperTactics || 
+      [
+        {
+          i : 1,
+          topicType: 1,
+          totalNum: 20,
+          topicNum: 0,
+          topicScore: 0,
+          totalScore: 100,
+        },
+        {
+          i : 2,
+          topicType: 2,
+          totalNum: 20,
+          topicNum: 0,
+          topicScore: 0,
+          totalScore: 100,
+        },
+        {
+          i : 3,
+          topicType: 3,
+          totalNum: 20,
+          topicNum: 0,
+          topicScore: 0,
+          totalScore: 100,
+        },
+      ],
     }
   },
   // 计算属性 类似于data概念
@@ -38,11 +151,20 @@ export default {
   // 方法集合
   methods: {
     //保存
-    toSave() { this.$emit('executeSave'), this.form },
+    toSave() {
+      this.form.testPaperTactics = this.tableData
+      this.$emit('executeSave', this.form)
+    },
     //发布
-    toIssue(){ this.$emit("executeIssue"), this.form },
+    toIssue() {
+      this.form.testPaperTactics = this.tableData
+      this.$emit('executeIssue', this.form)
+    },
     //上一步
-    toPrev() { this.$emit('prevStep'), this.form },
+    toPrev() {
+      this.form.testPaperTactics = this.tableData
+      this.$emit('prevStep', this.form)
+    },
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
   created() {},