Merge branch 'contentManagerTemp' into dev

src/views/arrearage-students/index.vue

@@ -220,9 +220,11 @@ export default {
   mounted() {
     const { query } = this.$route
     if (query.organId) {
-      console.log(query.organId)
       this.searchForm.organIds = [Number(query.organId)]
     }
+    if(query.result) {
+      this.searchForm.eduTeacherId = Number(query.result)
+    }
     getCooperation({ rows: 1000 }).then((res) => {
       this.cooperations = res.data.rows
     })

src/views/categroyManager/insideSetting/staffManager.vue

@@ -404,7 +404,7 @@ export default {
     onBranchCheckAll () {
       this.form.organIdLists = []
 
-      this.selects.branchs.forEach(item => {
+      this.organList.forEach(item => {
         this.form.organIdLists.push(item.id)
       })
     },

src/views/main/abnormal/index.vue

@@ -155,6 +155,11 @@ export default {
       if(errorType[item[0].errorType] && !this.permission(errorType[item[0].errorType].permission)) {
         return
       }
+
+      // 单独对未缴费学员数
+      if(item[0].errorType == 'STUDENT_NOT_PAYMENT') {
+        item[0].query['result'] = item[0].result ? (item[0].result || []).join(',') : undefined
+      }
       new Searchs().removeByKey(item[0].url)
       this.$router.push({
         path: item[0].url,

src/views/main/constant.js

@@ -100,6 +100,9 @@ export const errorType = {
     url: '/studentManager/ArrearageStudents',
     permission: '/ArrearageStudents',
     always: true,
+    query: {
+      
+    }
   },
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '申请退团学员数',

src/views/repairManager/repairList.vue

@@ -117,6 +117,8 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+           <!-- v-permission="'studentRepair/export'" -->
+          <el-button @click="onExport" type="primary">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -426,6 +428,9 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSoundTree } from "@/api/buildTeam";
+import { Export } from '@/utils/downLoadFile'
+import qs from 'qs'
+import { getTimes } from "@/utils";
 import {
   findAllTechnician,
   studentRepairList,
@@ -573,6 +578,15 @@ export default {
         }
       });
     },
+    onExport() {
+      const {timer, ...rest} = this.searchForm
+      Export(this, {
+        url: '/api-web/studentRepair/export',
+        fileName: '维修单.xlsx',
+        method: 'post',
+        params: qs.stringify({ ...rest, ...getTimes(timer, ["startTime", "endTime"]) })
+      }, '您确定导出维修单列表?')
+    }
   },
   watch: {
     repairVisible(val) {

src/views/teamBuild/signupList.vue

@@ -75,9 +75,6 @@
             延长报名
           </div>
           <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
-          <div class="newBand" @click="onCreateQRCode('rePayment')">
-            报名链接（无乐器）
-          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
@@ -111,6 +108,9 @@
           >
             合并学员
           </div>
+          <div class="newBand" style="background-color: #f97215; border: 1px solid #f97215;" @click="onCreateQRCode('rePayment')">
+            报名链接（无乐器）
+          </div>
         </div>
       </div>
       <el-dialog