shilipojs 2 роки тому
батько
коміт
a2b0c353b9

+ 15 - 20
src/views/career/subject/subjectChoice.vue

@@ -91,10 +91,6 @@
         type: String,
         default: ''
       },
-      year: {
-        type: Number,
-        default: 0
-      },
       readonly: {
         type: Boolean,
         default: false
@@ -182,7 +178,6 @@
     created() {
       this.selected.sciences[0] = this.course0 ? [this.course0] : []
       this.selected.sciences[1] = this.course1? this.course1.split(',') :[]
-      this.selected.years = this.year ?  this.year : this.form.years[0]
       if(this.course0 && this.course1) this.httpGetXkcxList()
       this.getYears();
       this.getUniversity();
@@ -193,7 +188,7 @@
       getYears() {
         xkcxYears().then((res) => {
           this.form.years = res.data || [];
-          this.selected.years = this.selected.years ||  this.form.years[0]
+          this.selected.years  = this.form.years[0]
         });
       },
       // 取其他条件清单
@@ -371,18 +366,18 @@
     margin-right: 10px;
   }
 }
-.radioInput02 {
-  display: flex;
-  align-items: center;
-  .radiaTitle {
-    display: inline-block;
-    width: 130px;
-    font-size: 14px;
-    text-align: right;
-    margin-top: 2px;
-  }
-  .el-input--medium .el-input__inner {
-    border-radius: 50px;
-  }
-}
+//.radioInput02 {
+//  display: flex;
+//  align-items: center;
+//  .radiaTitle {
+//    display: inline-block;
+//    width: 130px;
+//    font-size: 14px;
+//    text-align: right;
+//    margin-top: 2px;
+//  }
+//  .el-input--medium .el-input__inner {
+//    border-radius: 50px;
+//  }
+//}
 </style>

+ 2 - 4
src/views/system/user/profile/components/choose-subject-dialog.vue

@@ -8,7 +8,7 @@
     :close-on-click-modal="false"
     width="70%"
   >
-    <subject-choice :course0="course0" :course1="course1" :year="year" :readonly="readonly"></subject-choice>
+    <subject-choice :course0="course0" :course1="course1" :readonly="readonly"></subject-choice>
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel">确 定</el-button>
       </span>
@@ -38,7 +38,6 @@ export default {
     return {
       dialogVisible: false,
       course0: '',
-      year: '',
       course1: ''
     }
   },
@@ -47,9 +46,8 @@ export default {
       console.log('res')
       this.cancel()
     },
-    open(course0, course1, year) {
+    open(course0, course1) {
       this.dialogVisible = true
-      this.year = year || ''
       this.course0 = course0
       this.course1 = course1
     },