项目Form调整

src/views/project/ProjectStepForm.vue

@@ -3,7 +3,7 @@
   <a-card :bordered="false" :title="title">
     <a-steps class="steps" :current="currentTab">
       <a-step title="基本信息" />
-      <a-step title="选择单位" />
+      <!-- <a-step title="选择单位" /> -->
       <a-step title="选择课程" />
       <a-step title="选择人员" />
       <a-step v-if="['2', '4'].includes(form.trainWay)" title="组卷策略" />
@@ -12,11 +12,11 @@
     <div class="content">
       <!-- <keep-alive exclude="result"> -->
       <step1 v-if="currentTab === 0" :projectForm="form" @nextStep="nextStep" @close="close" @setFormType="setFormType"/>
-      <step2 v-if="currentTab === 1" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" @executeSave="executeSave"/>
+      <!-- <step2 v-if="currentTab === 1" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" @executeSave="executeSave"/> -->
-      <step3 v-if="currentTab === 2" :projectForm="form" :courseChange="courseChange" @nextStep="nextStep" @prevStep="prevStep" />
+      <step3 v-if="currentTab === 1" :projectForm="form" :courseChange="courseChange" @nextStep="nextStep" @prevStep="prevStep" />
-      <step4 v-if="currentTab === 3" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" />
+      <step4 v-if="currentTab === 2" :projectForm="form" @nextStep="nextStep" @prevStep="prevStep" @executeSave="executeSave" @executeIssue="executeIssue"  />
-      <step5 v-if="currentTab === 4" :projectForm="form" @prevStep="prevStep" @executeSave="executeSave" @executeIssue="executeIssue" />
+      <step5 v-if="currentTab === 3" :projectForm="form" @prevStep="prevStep" @executeSave="executeSave" @executeIssue="executeIssue" />
-      <result v-if="currentTab === 5" :projectForm="form" @prevStep="prevStep" :projectSaveStatus="status" @close="close" />
+      <result v-if="currentTab === 4" :projectForm="form" @prevStep="prevStep" :projectSaveStatus="status" @close="close" />
       <!-- </keep-alive> -->
     </div>
   </a-card>
@@ -25,7 +25,7 @@
 <script>
 //页面
 import Step1 from './form/ProjectForm'
-import Step2 from './form/ProjectUnitSelect'
+// import Step2 from './form/ProjectUnitSelect'
 import Step3 from './form/ProjectCourseList'
 import Step4 from './form/ProjectPersonForm'
 import step5 from './form/ProjectTestPaperFormationStrategy'
@@ -37,7 +37,7 @@ import { projectAdd, getProjectDetail } from '@/api/project/project'
 export default {
   components: {
     Step1,
-    Step2,
+    // Step2,
     Step3,
     Step4,
     step5,
@@ -119,8 +119,12 @@ export default {
         if (childValue) {
           this.form = childValue
         }
+        if(['1','3'].includes(childValue.trainWay) && this.currentTab == 2){
+          this.currentTab += 2
+        } else {
           this.currentTab += 1
         }
+      }
       console.log('ProjectStepForm表单数据', this.form)
     },
     //上一步

src/views/project/form/ProjectCourseList.vue

@@ -2,7 +2,7 @@
   <a-card class="coures" :bordered="false" title="项目课程信息">
     <a-space direction="vertical" style="width: 100%">
       <a-space direction="horizontal">
-        <span>总课时：{{ form.totalCourseHours }}H , 总学时要求：{{ form.totalLearnHours }}H , 总题目数量：{{ form.totalTopicNumber }} </span>
+        <span>总课时：{{ form.totalCourseHours }} , 总学时要求：{{ form.totalLearnHours }} , 总题目数量：{{ form.totalTopicNumber }} </span>
         课程名:
         <a-input v-model="queryParam.courseName" style="width: 100%" />
         <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
@@ -109,8 +109,8 @@ export default {
         { title: '序号', key: 'id', dataIndex: 'id', width: 60, scopedSlots: { customRender: 'serial' } },
         { title: '课程编号', dataIndex: 'courseCode', key: 'courseCode' },
         { title: '课程名称', dataIndex: 'courseName', key: 'courseName' },
-        { title: '课时', dataIndex: 'courseHours', key: 'courseHours', customRender: (text) => text + 'H' },
+        { title: '课时', dataIndex: 'courseHours', key: 'courseHours' }, // customRender: (text) => text + 'H'
-        { title: '学时要求', dataIndex: 'learnHours', key: 'learnHours', customRender: (text) => text + 'H' },
+        { title: '学时要求', dataIndex: 'learnHours', key: 'learnHours' }, //, customRender: (text) => text + 'H'
         { title: '题量', dataIndex: 'topicNumber', key: 'topicNumber' },
         { title: '操作', width: 200, align: 'center', scopedSlots: { customRender: 'action' } },
       ], // 表头

src/views/project/form/ProjectForm.vue

@@ -43,13 +43,13 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="人员类型" prop="personType">
               <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> -->
           <!-- 时间选择器呢 -->
           <a-col :span="24">
             <a-form-model-item v-if="['1', '3' ,'4'].includes(form.trainWay)" label="培训时间" style="margin-bottom: 0">
@@ -151,7 +151,7 @@ export default {
         trainClass: [{ required: true, message: '请选择培训分类', trigger: 'blur' }],
         trainType: [{ required: true, message: '请选择培训类型', trigger: 'blur' }],
         trainWay: [{ required: true, message: '请选择培训方式', trigger: 'biur' }],
-        personType: [{ required: true, message: '请选择人员类型', trigger: 'blur' }],
+        // personType: [{ required: true, message: '请选择人员类型', trigger: 'blur' }],
         trainSdate: [{ required: true, message: '请输入培训开始时间', trigger: 'change' }],
         trainEdate: [{ required: true, message: '请输入培训结束时间', trigger: 'change' }],
         practiceSdate: [{ required: true, message: '请输入练习开始时间', trigger: 'change' }],
@@ -175,7 +175,7 @@ export default {
         this.$emit('setFormType',this.form.trainWay)
       })
     }
-    this.fetchTemplateData()
+    // this.fetchTemplateData()
     this.getTrainClass()
   },
   methods: {
@@ -184,21 +184,21 @@ export default {
       this.$emit('close')
     },
     //获取字典值，人员类型
-    fetchTemplateData() {
+    // fetchTemplateData() {
-      let formData = { dictionaryCode:'0005'}
+    //   let formData = { dictionaryCode:'0005'}
-      dictionaryDropDown(formData).then(res => {
+    //   dictionaryDropDown(formData).then(res => {
-        console.log(res)
+    //     console.log(res)
-        if (res.code == 200) {
+    //     if (res.code == 200) {
-          const result = res.data
+    //       const result = res.data
-          result.forEach(r => {
+    //       result.forEach(r => {
-            this.personType.push({
+    //         this.personType.push({
-              value: r.value,
+    //           value: r.value,
-              name: r.name
+    //           name: r.name
-            })
+    //         })
-          })
+    //       })
-        }
+    //     }
-      })
+    //   })
-    },
+    // },
 
     //获取培训种类列表
     getTrainClass() {

src/views/project/form/ProjectPersonForm.vue

@@ -8,15 +8,13 @@
     </template> -->
     <a-row type="flex" justify="center" align="top">
       <a-col :span="4" id="tree">
-        <a-page-header title="单位列表" sub-title="" />
+        <a-menu v-model="menuKey" mode="horizontal" @select="menuChack">
+          <a-menu-item key="unit">部门列表</a-menu-item>
+          <a-menu-item key="group">项目列表</a-menu-item>
+        </a-menu>
         <div v-if="this.orgTree != ''">
-          <a-tree
+          <a-tree :treeData="orgTree" v-if="orgTree.length" @select="onSelect" :defaultExpandAll="false" 
-            :treeData="orgTree"
+          :defaultExpandedKeys="expandedKeys" :replaceFields="replaceFields" :defaultSelectedKeys="defaultSelectedKeys" showLine="true">
-            v-if="orgTree.length"
-            @select="onSelect"
-            :defaultExpandAll="false"
-            :defaultExpandedKeys="expandedKeys"
-            :replaceFields="replaceFields">
             <a-icon slot="switcherIcon" type="down" />
           </a-tree>
         </div>
@@ -29,19 +27,19 @@
               <a-form-item label="姓名">
                 <a-input v-model="queryParam.name" placeholder="请输入姓名" />
               </a-form-item>
-              <a-form-item label="人员类型">
+              <!-- <a-form-item label="人员类型">
                 <a-select default-value="0" style="width: 120px">
                   <a-select-option value="0"> - 全 部 - </a-select-option>
                   <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>
-              </a-form-item>
+              </a-form-item> -->
               <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
               <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
             </a-row>
           </a-form>
-          <s-table ref="table" :columns="columns" :data="loadData" :rowKey="(record) => record.id" :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows, onChange: onSelectChange }">
+          <s-table ref="table" :columns="columns" :data="loadData" :rowKey="(record) => record.id" :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows, onChange: onSelectChange, onSelect: tableOnSelect ,onSelectAll: tableAllSelected }">
             <span slot="serial" slot-scope="text, record, index">
               {{ index + 1 }}
             </span>
@@ -59,7 +57,9 @@
     </a-row>
     <a-col :span="24" style="text-align: center;">
       <a-button type="primary" size="default" @click="toPrev" style="margin-right: 8px;">上一步</a-button>
-      <a-button type="primary" size="default" @click="toNext">下一步</a-button>
+      <a-button v-if="['2','4'].includes(form.trainWay)" type="primary" size="default" @click="toNext">下一步</a-button>
+      <a-button v-if="['1','3'].includes(form.trainWay)" type="primary" size="default" @click="toSaveOrIssue('save')" style="margin-right: 8px;">保存</a-button>
+      <a-button v-if="['1','3'].includes(form.trainWay)" type="primary" size="default" @click="toSaveOrIssue('issue')">发布</a-button>
     </a-col>
   </a-card>
 </template>
@@ -90,10 +90,11 @@ export default {
       form: this.projectForm,
       // 查询参数
       queryParam: { orgType: 1 },
+      menuKey: ['unit'], //默认选择部门列表
       replaceFields: { children: 'children', title: 'name', key: 'id', value: 'id' },
       expandedKeys: [],
+      defaultSelectedKeys:[], //tree默认选中的key
       autoExpandParent: true,
-      expandedKeys: [],
       selectedRowKeys: [],
       selectedRows: this.projectForm.projectPersonLists || [],
       orgTree: [],
@@ -139,6 +140,41 @@ export default {
       this.$emit('prevStep', this.form)
     },
 
+    // 保存 && 发布
+    toSaveOrIssue(type) {
+      this.form.projectPersonLists = this.selectedRows
+      this.form.personIds = this.selectedRowKeys
+      console.log('toSaveOrIssue - type', type)
+      if (this.form.personIds.length > 0) {
+        console.log('进来了')
+        if (type != 'issue') {
+          console.log('save')
+          this.form.projectStatus = 1
+          this.$emit('executeSave', this.form)
+        } else {
+          console.log('issue')
+          this.form.projectStatus = 2
+          this.$emit('executeIssue', this.form)
+        }
+      } else {
+        this.$message.warning('培训人员不能为空')
+      }
+    },
+
+    /** 切换table后触发 */
+    menuChack() {
+      if (this.menuKey == 'unit') {
+        this.orgType = 2  //初始化部门树
+      } else {
+        this.orgType = 1  //初始化项目树
+      }
+      this.defaultSelectedKeys = [];
+      this.queryParam.orgType = this.orgType;
+      this.queryParam.orgId = null;
+      this.getOrgTree();
+      this.$refs.table.refresh();
+    },
+
     /** 表格行选中后触发 */
     onSelectChange(selectedRowKeys, selectedRows) {
       console.log('selectedRowKeys changed: ', selectedRowKeys)
@@ -147,6 +183,28 @@ export default {
       this.selectedRows = this.unique([...this.selectedRows, ...selectedRows])
     },
 
+    /** table取消勾选 */
+    tableOnSelect(record, selected, selectedRows, nativeEvent) {
+      if (!selected) { //取消勾选操作
+        let keys = this.selectedRowKeys.filter(item => item != record.id);
+        let rows = this.selectedRows.filter(item => item.id != record.id);
+
+        this.selectedRows = rows;
+        this.selectedRowKeys = keys;
+      }
+    },
+    /** table取消全选 */
+    tableAllSelected(selected, selectedRows, changeRows) {
+      if (!selected) { //取消勾选操作
+        let exKeys = changeRows.map(value => { return value.id })
+        let keys = this.selectedRowKeys.filter(item => { return !exKeys.includes(item) });
+        let rows = this.selectedRows.filter(item => { return !exKeys.includes(item.id) });
+
+        this.selectedRows = rows;
+        this.selectedRowKeys = keys;
+      }
+    },
+
     // 对象去重
     unique(arr) {
       const res = new Map()
@@ -207,14 +265,18 @@ export default {
     async getOrgTree() {
       await orgList({ orgType: this.orgType }).then((res) => {
         this.treeLoading = false
-        if (!res.code === 200 || !res.data.length) {
+        // if (!res.code === 200 || !res.data.length) {
-          return
+        //   return
-        }
+        // }
         this.expandedKeys = []
         this.orgTree = listToTree(res.data, [], rootParentId)
         this.orgId = this.orgTree[0].id
         // 默认展开
         this.orgTree.forEach(item => {
+          if(this.defaultSelectedKeys.length < 1) {
+            this.defaultSelectedKeys.push(item.id)
+            console.log('this.defaultSelectedKeys',this.defaultSelectedKeys)
+          }
           this.expandedKeys.push(item.id)
         })
       })