保存志愿

src/api/webApi/professlib.js

@@ -75,3 +75,11 @@ export function getVoluntaryMarjors(data) {
     data:data,
   })
 }
+// 保存志愿
+export function saveZhiyuan(data) {
+  return request({
+    url: 'front/syzy/zytb/save',
+    method: 'post',
+    data:data,
+  })
+}

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -25,7 +25,6 @@
       <el-button plain  @click="toReport">查看记录</el-button>
       <el-button type="primary" @click="toBackPage"  :disabled="currentStep == 0">上一步</el-button>
       <el-button type="primary" @click="next" v-if="currentStep <= 1">下一步</el-button>
-      <el-button type="primary" @click="save" v-if="currentStep > 1">保存志愿</el-button>
     </div>
   </div>
 </template>

src/views/career/zhiyuan/components/recommend.vue

@@ -84,7 +84,7 @@
             </div>
           </div>
           <div class="btn">
-            <el-button style="width: 100%;height: 30px"  type="primary">保存志愿表</el-button>
+            <el-button style="width: 100%;height: 30px"  type="primary" @click="save">保存志愿表</el-button>
           </div>
         </div>
       </transition>
@@ -94,7 +94,7 @@
 <script>
 import FilterForm from '@/views/career/components/FilterForm';
 import ZhiyuanList from '@/views/career/zhiyuan/components/zhiyuan-list';
-import { allMajor,getRecommendVoluntary,getVoluntaryMarjors,getVoluntaryHeaders } from '@/api/webApi/professlib'
+import { allMajor,getRecommendVoluntary,getVoluntaryMarjors,getVoluntaryHeaders,saveZhiyuan } from '@/api/webApi/professlib'
 export default {
   props: {
     formSubject: {
@@ -150,6 +150,15 @@ export default {
       handler(){
         this.getList()
       }
+    },
+    selectedList:{
+      deep:true,
+      handler(selectedList){
+        const index= selectedList.findIndex(item => { return item.majors.filter(major =>{ return  major.selected }).length <= 0 })
+        if(index != -1) {
+          this.selectedList.splice(index,1)
+        }
+      }
     }
   },
   computed: {
@@ -203,6 +212,42 @@ export default {
     },
   },
   methods: {
+    save(){
+      const wishes = this.selectedList.map(item =>{
+        return {
+          universityId:item.university.id,
+          collegeCode: item.recruitPlan.collegeCode,
+          code:item.university.code,
+          name:item.university.name,
+          majors:item.majors.filter(major => {return major.selected}).map(major=> {
+            return {
+              id: major.id,
+              code: major.marjorBelongs,
+              name: major.marjorName,
+            }
+          })
+        }
+      })
+      const data = {
+        batch: this.batch.batch,
+        detail:{
+          batch:{
+            batch:this.batch.batch,
+            name:this.batch.name,
+            recommand: true,
+            scores:[],
+            wishes:wishes,
+          },
+          mode:`${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
+          score:this.batch.score1
+        },
+        id: 0,
+        name: ''
+      }
+      saveZhiyuan(data).then(res =>{
+        console.log(res)
+      })
+    },
     apply(item,index) {
       //  有无院校  ？
       const codeFlag = this.selectedList.find(item => item.recruitPlan.collegeCode == this.rows[index].recruitPlan.collegeCode)
@@ -211,7 +256,6 @@ export default {
         this.selectedList.push(this.rows[index])
       }
       item.selected = !item.selected
-
     },
     deleteMajor(major){
       major.selected = false
@@ -265,7 +309,22 @@ export default {
           item.majors = []
           return item
         })
-        this.rows = rows
+        // 回显
+        if(this.selectedList.length) {
+           this.rows = rows.map(row => {
+           const flagIndex =  this.selectedList.findIndex(selected => {
+              return selected.recruitPlan.collegeCode == row.recruitPlan.collegeCode
+            })
+            if(flagIndex == -1) {
+              return row
+            }else {
+              return this.selectedList[flagIndex]
+            }
+          })
+        } else {
+          this.rows = rows
+        }
+
       })
     },
     getVoluntaryMarjors(item) {

src/views/career/zhiyuan/components/zhiyuan-list.vue

@@ -11,6 +11,8 @@
                 <p class="mb10 f-9b f12">{{ row.enrollRatioText }}</p>
                 <p>
                   <el-tag type="success">冲</el-tag>
+<!--                  <el-tag type="success">稳</el-tag>-->
+<!--                  <el-tag type="success">保</el-tag>-->
                 </p>
               </div>
             </template>
@@ -79,7 +81,9 @@
           <p class="mb10"><span class="f18">{{ row.enrollRatio }}</span>%</p>
           <p class="mb10 f-9b f12">{{ row.enrollRatioText }}</p>
           <p>
-            <el-tag type="success">冲</el-tag>
+            <el-tag type="danger" v-if="row.pickType == 0">冲</el-tag>
+            <el-tag type="warning" v-if="row.pickType == 1">稳</el-tag>
+            <el-tag type="success" v-if="row.pickType == 2">保</el-tag>
           </p>
         </div>
       </template>
@@ -90,7 +94,7 @@
           <p class="mb5 f-9b f12">{{ row.university.features.split(',').join(' ') }}</p>
           <p class="mb5 f-9b f12">{{ row.university.location }} {{ row.university.cityName }}
             排名{{ row.university.ranking }}</p>
-          <p class="f-9b f12">代码 {{ row.recruitPlan.collegeCode }}</p>
+<!--          <p class="f-9b f12">代码 {{ row.recruitPlan.collegeCode }}</p>-->
         </div>
       </template>
       <template #t2="{row}">