Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/views/journal/leaveOperation.vue

@@ -33,7 +33,8 @@
              class="header"
              alt="">
         <div class="info">
-          <h2>{{ showMessage.user.username }}<span class="phone">【{{ showMessage.user.phone }}】</span>
+          <h2>{{ showMessage.user.username }}
+            <!-- <span class="phone">【{{ showMessage.user.phone }}】</span> -->
             <el-tag v-if="showMessage.status == 'PASS'" type="success" effect="plain">已处理</el-tag>
             <el-tag v-if="showMessage.status == 'REJECT'" type="danger" effect="plain">已拒绝</el-tag>
           </h2>

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -127,8 +127,8 @@
                 </el-row>
                 <el-row>
                     <el-col :span="12">
-                    <el-form-item label="专业技能" prop="subjectId" :label-width="formLabelWidth">
-                        <el-select multiple v-model="topForm.subjectId" placeholder="专业技能">
+                    <el-form-item label="专业技能" prop="subjectIds" :label-width="formLabelWidth">
+                        <el-select multiple v-model="topForm.subjectIds" placeholder="专业技能">
                             <el-option-group
                             v-for="group in subjectList"
                             :key="group.label" 
@@ -166,6 +166,14 @@
                     </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="12">
+                    <el-form-item label="" :label-width="formLabelWidth">
+                        <!-- <el-input v-model="topForm.certificateType"></el-input> -->
+                        <el-checkbox v-model="topForm.isSupportCourseScheduleRewardsRules">适用VIP分部活动</el-checkbox>
+                    </el-form-item>
+                    </el-col>
+                </el-row>
                 <el-form-item>
                     <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
                     <el-button @click="onReSet('form')">重置</el-button>
@@ -223,11 +231,12 @@ export default {
             graduateSchool: null,
             email: null,
             educationBackground: null,
-            subjectId: [],
+            subjectIds: [],
             isProbationPeriod: null,
             technicalTitles: null,
             certificateType: null,
-            certificateNum: null
+            certificateNum: null,
+            isSupportCourseScheduleRewardsRules: true
         },
         rules: {
             realName: [{ required: true, message: '请输入姓名', trigger: 'blur'}, 
@@ -238,7 +247,7 @@ export default {
             isProbationPeriod: [{ required: true, message: '请选择人事状态', trigger: 'change' }],
             organId: [{ required: true, message: '请选择所属分部', trigger: 'change' }],
             phone: [{ required: true, validator: validPhone, trigger: 'blur' }],
-            subjectId: [{ required: true, type: 'array', message: '请选择专业技能', trigger: 'change' }]
+            subjectIds: [{ required: true, type: 'array', message: '请选择专业技能', trigger: 'change' }]
         }
     }
   },
@@ -302,11 +311,12 @@ export default {
                     graduateSchool: result.graduateSchool,
                     email: result.email,
                     educationBackground: result.educationBackground,
-                    subjectId: result.subjectId ? result.subjectId.split(',') : null,
+                    subjectIds: result.subjectId ? result.subjectId.split(',') : null,
                     technicalTitles: result.technicalTitles,
                     certificateType: result.certificateType,
                     certificateNum: result.certificateNum,
-                    isProbationPeriod: result.isProbationPeriod
+                    isProbationPeriod: result.isProbationPeriod,
+                    isSupportCourseScheduleRewardsRules: result.isSupportCourseScheduleRewardsRules
                 }
                 this.teacherSchools = result.teacherSchools.length > 0 ? result.teacherSchools.join(',') : ''
             })
@@ -316,7 +326,7 @@ export default {
         this.$refs[formName].validate(valid => {
             if(valid) {
                 this.topForm.flowOrganRange = this.topForm.flowOrganRange.join(',')
-                this.topForm.subjectId = this.topForm.subjectId.join(',')
+                this.topForm.subjectId = this.topForm.subjectIds.join(',')
                 if(this.pageType == 'update') {
                     this.topForm.id = this.teacherId
                     teacherUpdate(this.topForm).then(res => {
@@ -351,7 +361,7 @@ export default {
       } else {
         console.log(res)
         console.log(this.topForm)
-        this.topForm.subjectId = this.topForm.subjectId.split(',')
+        this.topForm.subjectIds = this.topForm.subjectIds.split(',')
         this.$message.error(res.msg)
       }
     },
@@ -370,7 +380,7 @@ export default {
             graduateSchool: null,
             email: null,
             educationBackground: null,
-            subjectId: [],
+            subjectIds: [],
             technicalTitles: null,
             certificateType: null,
             certificateNum: null,

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -3,7 +3,7 @@
     <h2>
       <el-page-header @back="onCancel" content="基础技能班报名详情"></el-page-header>
       <!-- <div class='squrt'></div>  -->
-      <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span>
+      <!-- <span @click="onCreateQRCode" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer; ">查看报名连接</span> -->
       <span @click="onApply" style="font-size: 16px; padding-left: 20px; font-weight: 400;cursor: pointer;">开启报名</span>
     </h2>
     <div class='m-core'>
@@ -125,7 +125,7 @@
 <script>
 import { highClassGroups, teamSoundStudent, resetHighClass, pushMessage } from '@/api/buildTeam'
 import { getClassAllStudent, addStudents, removeStudents } from '@/api/studentManager'
-import QRCode from 'qrcodejs2'
+// import QRCode from 'qrcodejs2'
 export default {
   data () {
     return {
@@ -176,26 +176,26 @@ export default {
         }).catch(() => { })
       
     },
-    onCreateQRCode () { // 生成报名二维码
-      this.qrcodeStatus = true
-      let id = this.$route.query.id
-      let teamName = this.$route.query.name
-      if (this.qrcodes) {
-        this.qrcodes = false
-        setTimeout(() => {
-          this.qrcode = new QRCode('qrcode', {
-            width: 200,
-            height: 200,
-            colorDark: '#000000',
-            colorLight: '#ffffff',
-            correctLevel: QRCode.CorrectLevel.H
-          })
-          this.qrcode.makeCode('http://mstudev.dayaedu.com/#/smallLogin?musicGroupId=' + id)
-          this.codeUrl = 'http://mstudev.dayaedu.com/#/smallLogin?musicGroupId=' + id
-        }, 500)
-      }
+    // onCreateQRCode () { // 生成报名二维码
+    //   this.qrcodeStatus = true
+    //   let id = this.$route.query.id
+    //   let teamName = this.$route.query.name
+    //   if (this.qrcodes) {
+    //     this.qrcodes = false
+    //     setTimeout(() => {
+    //       this.qrcode = new QRCode('qrcode', {
+    //         width: 200,
+    //         height: 200,
+    //         colorDark: '#000000',
+    //         colorLight: '#ffffff',
+    //         correctLevel: QRCode.CorrectLevel.H
+    //       })
+    //       this.qrcode.makeCode('http://mstudev.dayaedu.com/#/smallLogin?musicGroupId=' + id)
+    //       this.codeUrl = 'http://mstudev.dayaedu.com/#/smallLogin?musicGroupId=' + id
+    //     }, 500)
+    //   }
 
-    },
+    // },
     getList () {
       highClassGroups({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {