From a4ed1960f28be6da1ce7175eb709255b1ae2bdaa Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Fri, 10 Sep 2021 18:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=80=89=E6=8B=A9=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectStepForm.vue         |   3 +-
 src/views/project/form/ProjectCourseList.vue  | 119 ++++++++++++++
 .../project/form/ProjectCourseSelect.vue      | 145 ++++++++----------
 src/views/project/form/ProjectForm.vue        |   1 -
 src/views/project/form/ProjectUnitSelect.vue  |   6 +-
 5 files changed, 188 insertions(+), 86 deletions(-)
 create mode 100644 src/views/project/form/ProjectCourseList.vue

diff --git a/src/views/project/ProjectStepForm.vue b/src/views/project/ProjectStepForm.vue
index 7596177..812d0cd 100644
--- a/src/views/project/ProjectStepForm.vue
+++ b/src/views/project/ProjectStepForm.vue
@@ -32,7 +32,7 @@
 <script>
 import Step1 from './form/ProjectForm'
 import Step2 from './form/ProjectUnitSelect'
-import Step3 from './form/ProjectCourseSelect'
+import Step3 from './form/ProjectCourseList'
 
 export default {
   components: {
@@ -82,6 +82,7 @@ export default {
     },
     //上一步
     prevStep () {
+      console.log("返回上一步")
       if (this.currentTab > 0) {
         this.currentTab -= 1
       }
diff --git a/src/views/project/form/ProjectCourseList.vue b/src/views/project/form/ProjectCourseList.vue
new file mode 100644
index 0000000..724f00d
--- /dev/null
+++ b/src/views/project/form/ProjectCourseList.vue
@@ -0,0 +1,119 @@
+<template>
+  <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="$refs.CourseSelect.edit({})">添加课程</a-button>
+      </a-space>
+
+      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData">
+        <span slot="serial" slot-scope="text, record, index">
+          {{ index + 1 }}
+        </span>
+        <span slot="action" slot-scope="text, record">
+          <template>
+            <a-button type="primary" @click="$refs.table.refresh(true)">课程预览</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)">题库预览</a-button>
+            <a-button type="primary" @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" @click="toPrep"> 上一步 </a-button>
+      </a-form-model-item>
+    </a-space>
+    <project-course-select ref="CourseSelect"></project-course-select>
+  </a-form-model>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+//例如：import 《组件名称》 from '《组件路径》'
+import { STable } from '@/components'
+import ProjectCourseSelect from './ProjectCourseSelect.vue'
+
+export default {
+  //import引入的组件需要注入到对象中才能使用
+  components: {
+    STable,
+    ProjectCourseSelect,
+  },
+  props: {},
+  data() {
+    //这里存放数据
+    return {
+      form: this.$form.createForm(this, { name: 'project' }),
+      totalHours: 0, //总课时
+      totalLearnHours: 0, //总学时
+      totalTopicNum: 0, //题目数量
+      //查询数据
+      queryParam: {},
+      // 表头
+      columns: [
+        { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
+        { title: '课程编号', dataIndex: 'courseNo', key: 'courseNo' },
+        { title: '课程名称', dataIndex: 'courseName', key: 'courseName' },
+        { title: '课时', dataIndex: 'courseHours', key: 'courseHours', customRender: (text) => text + '分' },
+        { title: '学时要求', dataIndex: 'learnHours', key: 'learnHours', customRender: (text) => text + '分' },
+        { title: '题量', dataIndex: 'topicNumber', key: 'projectName' },
+        { title: '项目名称', dataIndex: 'projectName', key: 'projectName' },
+        {
+          title: '操作',
+          width: 200,
+          align: 'center',
+          scopedSlots: { customRender: 'action' },
+        },
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: (parameter) => {
+        return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
+          return res
+        })
+      },
+    }
+  },
+  //计算属性 类似于data概念
+  computed: {},
+  //监控data中的数据变化
+  watch: {},
+  //方法集合
+  methods: {
+    toNext() {
+      console.log('ProjectCourseSelect-toNext', this.form)
+      const {
+        form: { validateFields },
+      } = this
+      // 先校验，通过表单校验后，才进入下一步
+      validateFields((err, values) => {
+        if (!err) {
+          this.$emit('nextStep')
+        }
+      })
+    },
+    toPrep() {
+      console.log('toPrep', this.form)
+      this.$emit('prevStep', this.form)
+    },
+  },
+
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  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/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index 3f8a5d0..5d53107 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -1,85 +1,41 @@
 <template>
-  <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"
-      >
-        <span slot="serial" slot-scope="text, record, index">
-          {{ index + 1 }}
-        </span>
-        <span slot="action" slot-scope="text, record" >
-          <template>
-            <a-button type="primary" @click="$refs.table.refresh(true)">课程预览</a-button>
-            <a-button type="primary" @click="$refs.table.refresh(true)">题库预览</a-button>
-            <a-button type="primary" @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>
+  <a-modal
+    :title="modalTitle"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :destroyOnClose="true"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-layout>
+      <a-layout-sider>
+        <a-menu v-model="current" mode="horizontal">
+          <a-menu-item key="mail"> <a-icon type="mail" />系统课程</a-menu-item>
+          <a-menu-item key="app"> <a-icon type="appstore" />自制课程</a-menu-item>
+        </a-menu>
+      </a-layout-sider>
+      <a-layout>
+        <a-layout-content>Content</a-layout-content>
+      </a-layout>
+    </a-layout>
+  </a-modal>
 </template>
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 //例如：import 《组件名称》 from '《组件路径》'
-import { STable } from '@/components'
 
 export default {
   //import引入的组件需要注入到对象中才能使用
-  components: {
-    STable,
-  },
+  components: {},
   props: {},
   data() {
     //这里存放数据
     return {
-      form: this.$form.createForm(this, { name: 'project' }),
-      totalHours: 0, //总课时
-      totalLearnHours: 0, //总学时
-      totalTopicNum: 0, //题目数量
-      //查询数据
-      queryParam: {},
-      // 表头
-      columns: [
-        { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
-        { title: '课程编号', dataIndex: 'courseNo', key: 'courseNo' },
-        { title: '课程名称', dataIndex: 'courseName', key: 'courseName' },
-        { title: '课时', dataIndex: 'courseHours', key: 'courseHours', customRender: (text) => text + '分' },
-        { title: '学时要求', dataIndex: 'learnHours', key: 'learnHours', customRender: (text) => text + '分' },
-        { title: '题量', dataIndex: 'topicNumber', key: 'projectName' },
-        { title: '项目名称', dataIndex: 'projectName', key: 'projectName' },
-        {
-          title: '操作',
-          width: 200,
-          align: 'center',
-          scopedSlots: { customRender: 'action' },
-        },
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: (parameter) => {
-        return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
-          return res
-        })
-      },
+      visible: false,
+      confirmLoading: false,
+      current: ['mail'],
     }
   },
   //计算属性 类似于data概念
@@ -88,22 +44,25 @@ export default {
   watch: {},
   //方法集合
   methods: {
-    toNext() {
-      console.log('ProjectCourseSelect-toNext', this.form)
-      const {
-        form: { validateFields },
-      } = this
-      // 先校验，通过表单校验后，才进入下一步
-      validateFields((err, values) => {
-        if (!err) {
-          this.$emit('nextStep')
-        }
-      })
+    // 编辑打开页面初始化
+    edit(record) {
+      console.log(record)
+      this.modalTitle = '选择课程'
+      this.visible = true
+      this.formLoading = false
+    },
+    handleCancel() {
+      console.log('课程选择关闭')
+      this.visible = false
+      this.formLoading = false
+    },
+    handleSubmit() {
+      console.log('课程选择提交了')
+      this.visible = false
+      this.formLoading = false
     },
   },
-
-  //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
+  created() {}, //生命周期 - 创建完成（可以访问当前this实例）
   mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -115,4 +74,24 @@ export default {
 }
 </script>
 <style scoped>
+#components-layout-demo-basic {
+  text-align: center;
+}
+#components-layout-demo-basic .ant-layout-sider {
+  background: #3ba0e9;
+  color: #fff;
+  line-height: 150px;
+}
+#components-layout-demo-basic .ant-layout-content {
+  background: rgba(16, 142, 233, 1);
+  color: #fff;
+  min-height: 1100px;
+  line-height: 120px;
+}
+#components-layout-demo-basic > .ant-layout {
+  margin-bottom: 48px;
+}
+#components-layout-demo-basic > .ant-layout:last-child {
+  margin: 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/project/form/ProjectForm.vue b/src/views/project/form/ProjectForm.vue
index d8bce82..106ac5d 100644
--- a/src/views/project/form/ProjectForm.vue
+++ b/src/views/project/form/ProjectForm.vue
@@ -112,7 +112,6 @@
       <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>
diff --git a/src/views/project/form/ProjectUnitSelect.vue b/src/views/project/form/ProjectUnitSelect.vue
index 21f585e..3f4e8e0 100644
--- a/src/views/project/form/ProjectUnitSelect.vue
+++ b/src/views/project/form/ProjectUnitSelect.vue
@@ -38,7 +38,7 @@
     </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-button style="margin-left: 10px" @click="toPrep">上一步</a-button>
     </a-form-model-item>
   </a-form-model>
 </template>
@@ -140,6 +140,10 @@ export default {
         }
       })
     },
+    toPrep() {
+      console.log('toPrep', this.form)
+      this.$emit('prevStep',this.form)
+    },
     onChange(targetKeys) {
       console.log('Target Keys:', targetKeys)
       this.targetKeys = targetKeys