From 2e71de1cec58e26c38cfd40e1997735607412508 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Mon, 6 Sep 2021 11:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project/class.js                      |  38 +++
 src/views/project/AddClass.vue                |  36 ---
 src/views/project/ProjectList.vue             |  23 +-
 src/views/project/ProjectStepForm.vue         | 147 ++++++++++
 src/views/project/classAdd/ClassList.vue      |  65 +++++
 .../project/form/ProjectCourseSelect.vue      |  83 +++---
 src/views/project/form/ProjectForm.vue        | 258 +++++++++---------
 src/views/project/form/ProjectStepForm.vue    |  72 -----
 src/views/project/form/ProjectUnitSelect.vue  |  84 +++---
 9 files changed, 464 insertions(+), 342 deletions(-)
 create mode 100644 src/api/project/class.js
 delete mode 100644 src/views/project/AddClass.vue
 create mode 100644 src/views/project/ProjectStepForm.vue
 create mode 100644 src/views/project/classAdd/ClassList.vue
 delete mode 100644 src/views/project/form/ProjectStepForm.vue

diff --git a/src/api/project/class.js b/src/api/project/class.js
new file mode 100644
index 0000000..cac2709
--- /dev/null
+++ b/src/api/project/class.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+const classApi = {
+    get: '/project/species/get',
+    add: '/project/species/add',
+    del: '/project/species/del',
+    list: '/project/species/pageList'
+}
+
+export function classAdd(params) {
+    return request({
+        url: classApi.add,
+        method: 'post',
+        data: params
+    })
+}
+export function classGet(params) {
+    return request({
+        url: classApi.getDict,
+        method: 'get',
+        params: params
+    })
+}
+export function classDel (params) {
+  return request({
+    url: classApi.get,
+    method: 'delete',
+    data: params
+  })
+}
+export function classList(params) {
+    console.log("------------{}", params)
+    return request({
+        url: classApi.list,
+        method: 'get',
+        params: params
+    })
+}
diff --git a/src/views/project/AddClass.vue b/src/views/project/AddClass.vue
deleted file mode 100644
index 036daba..0000000
--- a/src/views/project/AddClass.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-<div></div>
-</template>
-
-<script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-//例如：import 《组件名称》 from '《组件路径》'
-
-export default {
-//import引入的组件需要注入到对象中才能使用
-components: {},
-props: {},
-data() {
-//这里存放数据
-return {};
-},
-//计算属性 类似于data概念
-computed: {},
-//监控data中的数据变化
-watch: {},
-//方法集合
-methods: {},
-created() {},  //生命周期 - 创建完成（可以访问当前this实例）
-mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
-beforeCreate() {}, //生命周期 - 创建之前
-beforeMount() {}, //生命周期 - 挂载之前
-beforeUpdate() {}, //生命周期 - 更新之前
-updated() {}, //生命周期 - 更新之后
-beforeDestroy() {}, //生命周期 - 销毁之前
-destroyed() {}, //生命周期 - 销毁完成
-activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
-};
-
-</script>
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index d8bd0cc..414113b 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -38,9 +38,9 @@
         <a-button icon="redo" @click="() => (queryParam = {})">重置</a-button>
       </a-space>
 
-      <a-space direction="horizontal">
-        <a-button type="primary" icon="plus" @click="handledCreate()">新建</a-button>
-        <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
+      <a-space class="table-operator" direction="horizontal">
+        <a-button type="primary" icon="plus" @click="$refs.projectStepForm.add1()">新增项目</a-button>
+        <a-button type="primary" icon="minus" @click="handleEdit()">删除项目</a-button>
       </a-space>
 
       <s-table
@@ -67,6 +67,7 @@
           </template>
         </span>
       </s-table>
+      <project-step-form ref="projectStepForm"></project-step-form>
     </a-space>
   </div>
 </template>
@@ -75,16 +76,12 @@
 import moment from 'moment'
 import { STable } from '@/components'
 import { getProjectList } from '@/api/project/project'
-import ProjectForm from '@/views/project/form/ProjectForm'
-import router from '@/router/index.js'
+import projectStepForm from './ProjectStepForm'
 
 export default {
-  name: 'ProjectList',
-  props: {},
   components: {
     STable,
-    ProjectForm,
-    router,
+    projectStepForm,
   },
   data() {
     return {
@@ -153,10 +150,10 @@ export default {
   methods: {
     // 增
     handledCreate() {
-      return this.$router.push(
-        // {name: 'ProjectForm'}
-        { path: 'project/project/add' }
-      )
+      // return this.$router.push(
+      //   // {name: 'ProjectForm'}
+      //   { path: 'project/project/add' }
+      // )
       // router.push()
     },
 
diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
new file mode 100644
index 0000000..89ee36e
--- /dev/null
+++ b/src/views/project/ProjectStepForm.vue
@@ -0,0 +1,147 @@
+<template>
+
+  <a-modal
+    :title="modalTitle"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :destroyOnClose="true"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <!-- PageHeader 第二种使用方式 (v-slot) -->
+    <a-card :bordered="false">
+      <a-steps class="steps" :current="currentTab">
+        <a-step title="基本信息" />
+        <a-step title="选择单位" />
+        <a-step title="选择课程" />
+        <a-step title="选择人员" />
+        <a-step title="完成" />
+      </a-steps>
+      <div class="content">
+        <step1 v-if="currentTab === 0" @nextStep="nextStep"/>
+        <step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep"/>
+        <step3 v-if="currentTab === 2" @nextStep="nextStep" @prevStep="prevStep"/>
+        <step4 v-if="currentTab === 3" @nextStep="nextStep" @prevStep="prevStep"/>
+        <step5 v-if="currentTab === 4" @prevStep="prevStep" @finish="finish"/>
+      </div>
+    </a-card>
+  </a-modal>
+</template>
+
+<script>
+import Step1 from './form/ProjectForm'
+import Step2 from './form/ProjectUnitSelect'
+import Step3 from './form/ProjectCourseSelect'
+
+export default {
+  components: {
+    Step1,
+    Step2,
+    Step3,
+  },
+  data () {
+    return {
+      currentTab: 0,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      modalTitle: '新增项目',
+      visible: false,
+      confirmLoading: false,
+      menuTreeData: [],
+      componentShow: true,
+      componentDisabled: false,
+      componentRequired: true,
+      routerRequired: true,
+      routerShow: true,
+      pidShow: true,
+      permissionShow: true,
+      permissionRequired: true,
+      formLoading: true,
+      type: '',
+      form: this.$form.createForm(this),
+    }
+  },
+  methods: {
+    // 新增打开页面初始化
+      add1 (type) {
+        this.modalTitle = "新增菜单"
+        this.visible = true
+
+        // // 默认选中菜单项，并初始化
+        // this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: '1' })
+        // this.meneTypeFunc('1')
+
+        // // 默认选中的单选框
+        // this.form.getFieldDecorator('visible', { initialValue: true })
+        
+        // // 默认加载菜单树
+        // this.getMenuTree()
+
+        this.formLoading = false
+      },
+      // 编辑打开页面初始化
+      edit (record) {
+        this.modalTitle = "编辑菜单"
+        this.visible = true
+
+        // // 默认选中菜单项，并初始化
+        // this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: record.type.toString() })
+        // this.meneTypeFunc(record.type.toString())
+      
+        // // 默认选中的单选框
+        // // eslint-disable-next-line no-unused-vars
+        // const visibleDef = false
+        // // eslint-disable-next-line eqeqeq
+        // if (record.visible == 1) {
+        //   this.visibleDef = true
+        // }
+        // this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: this.visibleDef })
+        
+        // setTimeout(() => {
+        //    this.setMenuItem(record)
+        //    // 默认加载菜单树
+        //    this.getMenuTree()
+        // }, 100)
+        
+        this.formLoading = false
+      },
+
+    // handler
+    //下一步
+    nextStep () {
+      if (this.currentTab < 5) {
+        this.currentTab += 1
+      }
+    },
+    //上一步
+    prevStep () {
+      if (this.currentTab > 0) {
+        this.currentTab -= 1
+      }
+    },
+    finish () {
+      this.currentTab = 0
+    },
+    handleSubmit() {
+        
+    },
+    handleCancel() {
+      this.visible = false;
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .steps {
+    max-width: 750px;
+    margin: 16px auto;
+  }
+</style>
diff --git a/src/views/project/classAdd/ClassList.vue b/src/views/project/classAdd/ClassList.vue
new file mode 100644
index 0000000..8c7e439
--- /dev/null
+++ b/src/views/project/classAdd/ClassList.vue
@@ -0,0 +1,65 @@
+<template>
+  <page-header-wrapper title="新增种类">
+    <a-button type="primary" icon="rollback" @click="returnNext">返回</a-button>
+    <a-table ref="table" size="default" rowKey="id" :columns="columns" :data="dataTable" bordered>
+      <span slot="serial" slot-scope="text, record, index">
+        {{ index + 1 }}
+      </span>
+      <span slot="action" slot-scope="text, record">
+        <template>
+          <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
+            <a-button @click="() => handleDetail(record)">删除</a-button>
+          </a-popconfirm>
+        </template>
+      </span>
+    </a-table>
+  </page-header-wrapper>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { classDel, classList } from '@/api/project/class'
+
+export default {
+  data() {
+    return {
+      // 加载数据方法 必须为 Promise 对象
+      dataTable:  (parameter) => {
+        return classList(Object.assign(parameter, this.queryParam)).then((res) => {
+          return res
+        })
+      },
+      columns: [
+        { title: '序号', key: 'id', dataIndex: 'id', width: 80, scopedSlots: { customRender: 'serial' } },
+        { title: '项目种类名称', dataIndex: 'value', key: 'value' },
+        {
+          title: '操作',
+          width: 200,
+          align: 'center',
+          scopedSlots: { customRender: 'action' },
+        },
+      ],
+    }
+  },
+  components: {
+    STable,
+    classDel,
+    classList
+  },
+  methods: {
+    handledDel(){
+      classDel(Object.assign(parameter,params)).then((res) => {
+        if(res.code == 200){
+          return $this.$message = '操作成功';
+        }
+      })
+    },
+    returnNext(){
+
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/project/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index 8d6824f..08aee42 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -1,49 +1,42 @@
 <template>
-  <div>
-    <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" :layout="vertical">
-      <a-space direction="vertical" style="width: 100%">
-        <a-space direction="horizontal">
-          <span>总课时：{{ totalHours }}, 总学时要求：{{ totalLearnHours }}, 总题目数量：{{ totalTopicNum }} </span>
-          课程名:
-          <a-input v-model="queryParam.projectName" style="width: 100%" />
-          <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
-          <a-button icon="select" @click="() => (queryParam = {})">添加课程</a-button>
-        </a-space>
-        <s-table
-          ref="table"
-          size="default"
-          rowKey="id"
-          :columns="columns"
-          :data="loadData"
-          :rowSelection="options.rowSelection"
-        >
-          <span slot="serial" slot-scope="text, record, index">
-            {{ index + 1 }}
-          </span>
-          <!--  slot-scope="text, record" -->
-          <span slot="action">
-            <template>
-              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">课程预览</a-button>
-              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">题库预览</a-button>
-              <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">必选题设置</a-button>
-              <!-- <a href="javascript:;" @click="handleEdit(record)">修改</a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
-              <a href="javascript:;">删除</a>
-            </a-popconfirm>
-            <a-divider type="vertical" />
-            <a href="javascript:;" @click="handleDetail(record)">详情</a>
-            <a-divider type="vertical" /> -->
-            </template>
-          </span>
-        </s-table>
-        <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
-          <a-button type="primary" @click="toNext"> 下一步 </a-button>
-          <a-button style="margin-left: 10px"> 取消 </a-button>
-        </a-form-model-item>
+  <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" :layout="vertical">
+    <a-space direction="vertical" style="width: 100%">
+      <a-space direction="horizontal">
+        <span>总课时：{{ totalHours }}, 总学时要求：{{ totalLearnHours }}, 总题目数量：{{ totalTopicNum }} </span>
+        课程名:
+        <a-input v-model="queryParam.projectName" style="width: 100%" />
+        <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
+        <a-button icon="select" @click="() => (queryParam = {})">添加课程</a-button>
       </a-space>
-    </a-form-model>
-  </div>
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :rowSelection="options.rowSelection"
+      >
+        <span slot="serial" slot-scope="text, record, index">
+          {{ index + 1 }}
+        </span>
+        <!--  slot-scope="text, record" -->
+        <span slot="action">
+          <template>
+            <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">课程预览</a-button>
+            <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">题库预览</a-button>
+            <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">必选题设置</a-button>
+            <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
+              <a-button type="primary" @click="$refs.table.refresh(true)">删除</a-button>
+            </a-popconfirm>
+          </template>
+        </span>
+      </s-table>
+      <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
+        <a-button type="primary" @click="toNext"> 下一步 </a-button>
+        <a-button style="margin-left: 10px"> 取消 </a-button>
+      </a-form-model-item>
+    </a-space>
+  </a-form-model>
 </template>
 
 <script>
@@ -60,7 +53,7 @@ export default {
   data() {
     //这里存放数据
     return {
-      form: {},
+      form: this.$form.createForm(this),
       totalHours: 0, //总课时
       totalLearnHours: 0, //总学时
       totalTopicNum: 0, //题目数量
diff --git a/src/views/project/form/ProjectForm.vue b/src/views/project/form/ProjectForm.vue
index 6a4c936..076bd45 100644
--- a/src/views/project/form/ProjectForm.vue
+++ b/src/views/project/form/ProjectForm.vue
@@ -1,141 +1,135 @@
 <template>
-  <!-- <page-header-wrapper :title="新增项目"> -->
-  <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" :layout="vertical">
-    <a-row :gutter="24">
-      <a-col :md="24" :sm="24">
-        <a-form-model-item label="项目名称">
-          <a-input
-            v-model="form.projectName"
-            v-decorator="[
-              'projectName',
-              {
-                rules: [{ required: true, message: '项目名称为必填' }],
-              },
-            ]"
-          />
-        </a-form-model-item>
-      </a-col>
-    </a-row>
-    <a-row>
-      <a-col :span="12">
-        <a-form-model-item label="培训种类">
-          <a-select v-model="form.trainClass" placeholder="--请选择--">
-            <a-select-option value="shanghai"> Zone one </a-select-option>
-          </a-select>
-          <a-button type="primary" @click="createClass"> 新增种类 </a-button>
-        </a-form-model-item>
-      </a-col>
-      <a-col :span="12">
-        <a-form-model-item label="培训类型">
-          <a-select v-model="form.trainType" placeholder="--请选择--">
-            <a-select-option value="1"> 必修课 </a-select-option>
-            <a-select-option value="2"> 选修课 </a-select-option>
-          </a-select>
-        </a-form-model-item>
-      </a-col>
-      <a-col :span="12">
-        <a-form-model-item label="培训方式">
-          <a-select v-model="form.trainWay" placeholder="--请选择--">
-            <a-select-option value="1"> 培训 </a-select-option>
-            <a-select-option value="2"> 考试 </a-select-option>
-            <a-select-option value="3"> 培训-练习 </a-select-option>
-            <a-select-option value="4"> 培训-练习-考试 </a-select-option>
-          </a-select>
-        </a-form-model-item>
-      </a-col>
-      <a-col :span="12">
-        <a-form-model-item label="人员类型">
-          <a-select v-model="form.personType" placeholder="--请选择--">
-            <a-select-option v-for="item in personType" :key="item.value"> {{ item.name }} </a-select-option>
-          </a-select>
-        </a-form-model-item>
-      </a-col>
-      <!-- 时间选择器呢 -->
-      <a-col :span="24">
-        <a-form-item label="培训时间" style="margin-bottom: 0">
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.trainSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+    <!-- <page-header-wrapper :title="新增项目">  
+    v-decorator="['form.XXX', { rules: [{ required: true, message: '项目名称为必填' }] }]"-->
+    <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol" layout="horizontal">
+      <a-row :gutter="24">
+        <a-col :md="24" :sm="24">
+          <a-form-model-item label="项目名称">
+            <a-input v-model="form.projectName" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :md="24" :sm="24">
+          <a-form-model-item label="培训种类">
+            <a-select v-model="form.trainClass" placeholder="--请选择--">
+              <a-select-option value="shanghai"> 参数待替换 </a-select-option>
+            </a-select>
+            <a-button type="primary" @click="createClass"> 新增种类 </a-button>
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item label="培训类型">
+            <a-select v-model="form.trainType" placeholder="--请选择--">
+              <a-select-option value="1"> 必修课 </a-select-option>
+              <a-select-option value="2"> 选修课 </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item label="培训方式">
+            <a-select v-model="form.trainWay" placeholder="--请选择--">
+              <a-select-option value="1"> 培训 </a-select-option>
+              <a-select-option value="2"> 考试 </a-select-option>
+              <a-select-option value="3"> 培训-练习 </a-select-option>
+              <a-select-option value="4"> 培训-练习-考试 </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item label="人员类型">
+            <a-select v-model="form.personType" placeholder="--请选择--">
+              <a-select-option v-for="item in personType" :key="item.value"> {{ item.name }} </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <!-- 时间选择器呢 -->
+        <a-col :span="24">
+          <a-form-item label="培训时间" style="margin-bottom: 0">
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.trainSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
+            <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.trainEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
           </a-form-item>
-          <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.trainEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+        </a-col>
+        <!-- 时间选择器 -->
+        <a-col :span="24">
+          <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="练习时间" style="margin-bottom: 0">
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.practiceSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
+            <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.practiceEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
           </a-form-item>
-        </a-form-item>
-      </a-col>
-      <!-- 时间选择器 -->
-      <a-col :span="24">
-        <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="练习时间" style="margin-bottom: 0">
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.practiceSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+        </a-col>
+        <!-- 时间选择器 -->
+        <a-col :span="24">
+          <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="考试时间" style="margin-bottom: 0">
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.examSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
+            <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
+              <a-date-picker v-model="form.examEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
+            </a-form-item>
           </a-form-item>
-          <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.practiceEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
-          </a-form-item>
-        </a-form-item>
-      </a-col>
-      <!-- 时间选择器 -->
-      <a-col :span="24">
-        <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="考试时间" style="margin-bottom: 0">
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.examSdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
-          </a-form-item>
-          <span :style="{ display: 'inline-block', width: '24px', textAlign: 'center' }"> - </span>
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
-            <a-date-picker v-model="form.examEdate" style="width: 100%" valueFormat="YYYY-MM-DD HH:mm:ss" />
-          </a-form-item>
-        </a-form-item>
-      </a-col>
+        </a-col>
 
-      <!-- 考试次数 -->
-      <a-col :span="24">
-        <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="考试次数" style="margin-bottom: 0">
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
-            <a-input-number v-model="form.examNumber" :min="0" style="width: 100%" />
+        <!-- 考试次数 -->
+        <a-col :span="24">
+          <a-form-item v-if="['2', '3', '4'].includes(form.trainWay)" label="考试次数" style="margin-bottom: 0">
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
+              <a-input-number v-model="form.examNumber" :min="0" style="width: 100%" />
+            </a-form-item>
+            <span> 补考次数: </span>
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
+              <a-input-number v-model="form.resitNumber" :min="0" style="width: 100%" />
+            </a-form-item>
+            <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
+              <a-button type="primary" @click="randomResit"> 随机补考 </a-button>
+            </a-form-item>
           </a-form-item>
-          <span> 补考次数: </span>
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
-            <a-input-number v-model="form.resitNumber" :min="0" style="width: 100%" />
-          </a-form-item>
-          <a-form-item :style="{ display: 'inline-block', width: 'calc(30% - 1px)' }">
-            <a-button type="primary" @click="javascript;"> 随机补考 </a-button>
-          </a-form-item>
-        </a-form-item>
-      </a-col>
+        </a-col>
 
-      <a-col :span="24">
-        <a-form-model-item label="模拟考试" v-if="['2', '3', '4'].includes(form.trainWay)">
-          <a-radio-group v-model="form.mockExam">
-            <a-radio value="1"> 允许 </a-radio>
-            <a-radio value="0"> 不允许 </a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-      </a-col>
-      <a-col :span="24">
-        <a-form-model-item label="备注">
-          <a-input v-model="form.remark" type="textarea" />
-        </a-form-model-item>
-      </a-col>
-      <a-col :span="24">
-        <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
-          <a-button type="primary" @click="toNext"> 下一步 </a-button>
-          <a-button style="margin-left: 10px"> 取消 </a-button>
-        </a-form-model-item>
-      </a-col>
-    </a-row>
-  </a-form-model>
+        <a-col :span="24">
+          <a-form-model-item label="模拟考试" v-if="['2', '3', '4'].includes(form.trainWay)">
+            <a-radio-group v-model="form.mockExam">
+              <a-radio value="1"> 允许 </a-radio>
+              <a-radio value="0"> 不允许 </a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item label="备注">
+            <a-input v-model="form.remark" type="textarea" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
+            <a-button type="primary" @click="toNext"> 下一步 </a-button>
+            <a-button style="margin-left: 10px" @click="toNext"> 上一步 </a-button>
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+    </a-form-model>
   <!-- </page-header-wrapper> -->
 </template>
 <script>
 import { dictGet } from '@/api/project/project'
 
+
 export default {
   data() {
     return {
       labelCol: { span: 4 },
       wrapperCol: { span: 14 },
-      form: this.$form.createForm(this),
       personType: [],
+      form: this.$form.createForm(this),
     }
   },
   components: {
@@ -161,7 +155,7 @@ export default {
               name: r.name,
             })
           })
-          console.log("----------------",this.personType)
+          console.log('----------------', this.personType)
         }
       })
     },
@@ -170,19 +164,17 @@ export default {
     //下一步，跳转页面带上from对象
     toNext() {
       console.log('toNext', this.form)
-      const {
-        form: { validateFields },
-      } = this
-      // 先校验，通过表单校验后，才进入下一步
-      validateFields((err, values) => {
-        if (!err) {
-          this.$emit('nextStep')
-        }
-      })
+      this.$emit('nextStep', this.form)
+    },
+
+    createClass() {
+      console.log('-------createClass--------')
+    },
+
+    //范回一个随机数
+    randomResit() {
+      this.form.resitNumber = Math.floor(Math.random() * (5 - 1) + 1)
     },
-    createClass(){
-      console.log("-------createClass--------")
-    }
   },
 }
 </script>
diff --git a/src/views/project/form/ProjectStepForm.vue b/src/views/project/form/ProjectStepForm.vue
deleted file mode 100644
index 745058b..0000000
--- a/src/views/project/form/ProjectStepForm.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <page-header-wrapper>
-    <!-- PageHeader 第二种使用方式 (v-slot) -->
-    <template v-slot:content>
-      将一个冗长或用户不熟悉的表单任务分成多个步骤，指导用户完成。
-    </template>
-    <a-card :bordered="false">
-      <a-steps class="steps" :current="currentTab">
-        <a-step title="基本信息" />
-        <a-step title="选择单位" />
-        <a-step title="选择课程" />
-        <a-step title="选择人员" />
-        <a-step title="完成" />
-      </a-steps>
-      <div class="content">
-        <step1 v-if="currentTab === 0" @nextStep="nextStep"/>
-        <step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep"/>
-        <step2 v-if="currentTab === 2" @nextStep="nextStep" @prevStep="prevStep"/>
-        <step2 v-if="currentTab === 3" @nextStep="nextStep" @prevStep="prevStep"/>
-        <step3 v-if="currentTab === 4" @prevStep="prevStep" @finish="finish"/>
-      </div>
-    </a-card>
-  </page-header-wrapper>
-</template>
-
-<script>
-import Step1 from './ProjectForm'
-import Step2 from './ProjectUnitSelect.vue'
-import Step3 from './ProjectCourseSelect.vue'
-
-export default {
-  name: 'StepForm',
-  components: {
-    Step1,
-    Step2,
-    Step3,
-  },
-  data () {
-    return {
-      currentTab: 0,
-      // form
-      form: null,
-    }
-  },
-  methods: {
-
-    // handler
-    //下一步
-    nextStep () {
-      if (this.currentTab < 5) {
-        this.currentTab += 1
-      }
-    },
-    //上一步
-    prevStep () {
-      if (this.currentTab > 0) {
-        this.currentTab -= 1
-      }
-    },
-    finish () {
-      this.currentTab = 0
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .steps {
-    max-width: 750px;
-    margin: 16px auto;
-  }
-</style>
diff --git a/src/views/project/form/ProjectUnitSelect.vue b/src/views/project/form/ProjectUnitSelect.vue
index 9101380..cecb7b8 100644
--- a/src/views/project/form/ProjectUnitSelect.vue
+++ b/src/views/project/form/ProjectUnitSelect.vue
@@ -1,49 +1,47 @@
 <template>
-  <page-header-wrapper title="请选择受训单位">
-    <a-form-model :model="form">
-      <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
-        <a-button type="primary" @click="toNext"> 下一步 </a-button>
-        <a-button style="margin-left: 10px"> 取消 </a-button>
-      </a-form-model-item>
+  <a-form-model :model="form">
 
-      <!-- showSearch -->
-      <!-- height: '500px',overflowY: 'auto' -->
+    <!-- showSearch -->
+    <!-- height: '500px',overflowY: 'auto' -->
 
-      <a-transfer
-        class="tree-transfer"
-        :data-source="dataSource"
-        :titles="['全部单位列表', '已经选中单位']"
-        :target-keys="targetKeys"
-        :render="(item) => item.title"
-        :operations="['选  中', '取  消']"
-        :show-select-all="true"
-        :filter-option="filterOption"
-        @change="onChange"
-      >
-        <template slot="children" slot-scope="{ props: { direction, selectedKeys }, on: { itemSelect } }">
-          <!--  checkStrictly -->
-          <a-tree
-            v-if="direction === 'left'"
-            blockNode
-            checkable
-            defaultExpandAll
-            :checkedKeys="[...selectedKeys, ...targetKeys]"
-            :treeData="treeData"
-            @check="
-              (_, props) => {
-                onChecked(_, props, [...selectedKeys, ...targetKeys], itemSelect)
-              }
-            "
-            @select="
-              (_, props) => {
-                onChecked(_, props, [...selectedKeys, ...targetKeys], itemSelect)
-              }
-            "
-          />
-        </template>
-      </a-transfer>
-    </a-form-model>
-  </page-header-wrapper>
+    <a-transfer
+      class="tree-transfer"
+      :data-source="dataSource"
+      :titles="['全部单位列表', '已经选中单位']"
+      :target-keys="targetKeys"
+      :render="(item) => item.title"
+      :operations="['选  中', '取  消']"
+      :show-select-all="true"
+      :filter-option="filterOption"
+      @change="onChange"
+    >
+      <template slot="children" slot-scope="{ props: { direction, selectedKeys }, on: { itemSelect } }">
+        <!--  checkStrictly -->
+        <a-tree
+          v-if="direction === 'left'"
+          blockNode
+          checkable
+          defaultExpandAll
+          :checkedKeys="[...selectedKeys, ...targetKeys]"
+          :treeData="treeData"
+          @check="
+            (_, props) => {
+              onChecked(_, props, [...selectedKeys, ...targetKeys], itemSelect)
+            }
+          "
+          @select="
+            (_, props) => {
+              onChecked(_, props, [...selectedKeys, ...targetKeys], itemSelect)
+            }
+          "
+        />
+      </template>
+    </a-transfer>
+    <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
+      <a-button type="primary" @click="toNext"> 下一步 </a-button>
+      <a-button style="margin-left: 10px"> 取消 </a-button>
+    </a-form-model-item>
+  </a-form-model>
 </template>