no message

src/components/school/student/transfer-order/order-form.vue

@@ -324,6 +324,17 @@
           class="col-6 q-py-sm"
           label="市场人员"
         />
+        <q-input
+          v-if="stuData.StuList[0].STTeacherId>0"
+          filled
+          stack-label
+          disable
+          :dense="false"
+          maxlength="10"
+          v-model="stuData.StuList[0].STTeacherName"
+          class="col-6 q-py-sm"
+          label="协助老师"
+        />
         <q-input
           filled
           stack-label
@@ -447,7 +458,8 @@ export default {
         EnterId: 0, //市场人员
         //  NormalCommission:'',//正常返佣金额
         //  RenewCommission:"",// 预计返佣金额
-        ScrollSchoolId: -1
+        ScrollSchoolId: -1,
+        HelpEnterId:0,//协助老师id:STTeacherId AssistType =4 表示老师
       },
       newSchoolList: [],
       EnterName: "", //市场人员
@@ -472,6 +484,11 @@ export default {
     if (this.saveObj && this.saveObj.CourseId) {
       this.OrderMsg.CourseId = this.saveObj.CourseId;
     }
+    // 判断是否续费协助老师赋值
+    
+    if (this.stuData.StuList[0].IsRenewGuest!=1){
+      this.OrderMsg.HelpEnterId = this.stuData.StuList[0].STTeacherId;
+    }
     this.getOrderSEList();
     this.getEmployee(0);
     this.getEmployee(2);
@@ -498,7 +515,9 @@ export default {
         if (res.Code == 1) {
           res.Data.map(e => {
             if (e.AssistType == 4) {
-              // this.OrderMsg.HelpEnterId = e.AssistId;
+              if(this.stuData.StuList[0].IsRenewGuest==1){
+                this.OrderMsg.HelpEnterId = e.AssistId;
+              }
               this.HelpEnterDisable = true;
             }
             if (e.AssistType == 2) {

src/components/stuMan/eventsCalendar.vue

@@ -290,11 +290,8 @@
             <el-date-picker
             style="width:190px"
               v-model="date"
-              type="date"
+              type="month"
               :clearable="false"
-              value-format="yyyy-MM-d"
-              :picker-options="pickerOptions"
-              :editable="false"
               placeholder="选择日期"
               @change="getList"
             >
@@ -394,7 +391,9 @@ export default {
   },
   methods: {
     eventName(item){
-        const { href } = this.$router.resolve({path:'/stuMan/activeList',query:{'ActivityName':item}})
+        const { href } = this.$router.resolve({path:'/sale/activityList',
+          query:{'ActivityName':item}
+        })
         window.open(href, '_blank');
     },
     // 获取活动日历

src/pages/sale/activityList.vue

@@ -355,6 +355,9 @@
       if (this.$route.query && this.$route.query.Id) {
         this.msg.Id = this.$route.query.Id
       }
+      if(this.$route.query&&this.$route.query.ActivityName){
+        this.msg.ActivityName = this.$route.query.ActivityName
+      }
       this.getList();
       this.getActiveTypeList();
     },