Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/student/studentRight-form.vue

@@ -42,11 +42,11 @@
         <div class="detail-travel">
           <div class="detail_first">
             <q-tabs v-model="ckedTab" dense align="left" class="text-teal" style="margin-bottom:20px;">
-              <q-tab name="1" label="记录" />
-              <q-tab name="2" label="操作" />
-              <q-tab name="3" label="订单" />
-              <q-tab name="4" label="合同" />
-              <q-tab v-if="!baseObj.noEdit" name="5" label="服务人员" />
+              <q-tab :name="1" label="记录" />
+              <q-tab :name="2" label="操作" />
+              <q-tab :name="3" label="订单" />
+              <q-tab :name="4" label="合同" />
+              <q-tab v-if="!baseObj.noEdit" :name="5" label="服务人员" />
             </q-tabs>
             <div class="operate_Content" style="flex:1;">
               <div class="detail_Main">
@@ -162,13 +162,13 @@
       //选中的选项卡
       checkType: {
         type: Number,
-        default: 0
+        default: null
       }
     },
     data() {
       return {
         persistent: true,
-        ckedTab: "1",
+        ckedTab: 1,
         secondType: 1,
         visitList: [{
             Name: "到访",
@@ -214,16 +214,6 @@
       this.queryStuInfo();
       this.userInfo = this.getLocalStorage();
     },
-    watch: {
-      checkType: {
-        handler(val) {
-          if (val && val > 0) {
-            this.ckedTab = val;
-          }
-        },
-        deep: true
-      },
-    },
     mounted() {
       this.baseObj = this.saveObj;
       this.baseObj.IsHaveCurseManager = false;
@@ -235,6 +225,9 @@
         });
       }
       this.getEmployeeList();
+      if(this.checkType&&this.checkType>0){
+        this.ckedTab = this.checkType;
+      }
     },
     methods: {
       callUserHandler() {