1226 15:24

111

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

@@ -180,6 +180,14 @@ export default {
       vipList: []
     }
   },
+  created () {
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
+  },
   mounted () {
     this.__init()
   },
@@ -317,7 +325,7 @@ export default {
               this.$message.success('保存成功')
 
               // if(this.$route.query.type == 'create') {
-              this.$router.push('/business/teacherList')
+              this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
               // }
             }
           })

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

@@ -323,6 +323,14 @@ export default {
       }
     }
   },
+  created () {
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
+  },
   mounted () {
     this.__init()
   },
@@ -399,14 +407,14 @@ export default {
         })
       }
     },
-    joinArray(value, type) {
+    joinArray (value, type) {
       if (!type) {
-          type = ' '
+        type = ' '
       }
       if (typeof value == 'object' && value != null) {
-          return value.join(type)
+        return value.join(type)
       } else {
-          return value
+        return value
       }
     },
     onSubmit (formName) {
@@ -419,7 +427,7 @@ export default {
             teacherUpdate(this.topForm).then(res => {
               if (res.code == 200) {
                 // this.$emit('onTeacher')
-                this.$router.push('/business/teacherList')
+                this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
               }
               this.messageTips('修改', res)
             })
@@ -433,7 +441,7 @@ export default {
                 if (permission('/teacherAdd/salarySeting')) {
                   this.$emit('onTeacher', res.data)
                 } else {
-                  this.$router.push('/business/teacherList')
+                  this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
                 }
 
               }
@@ -477,7 +485,7 @@ export default {
       this.$refs[formName].resetFields()
     },
     onCancel () {
-      this.$router.push('/business/teacherList')
+      this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
     }
   }
 }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -299,7 +299,18 @@ export default {
       checkfor: {},
       teamStatus: '',
       teamid: '',
-      isNullFangshi: true
+      isNullFangshi: true,
+      Fsearch: null,
+      Frules: null,
+    }
+  },
+  created () {
+    // 判断是否带缓存参数
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
     }
   },
   methods: {
@@ -531,7 +542,7 @@ export default {
           createTeam(obj).then(res => {
             if (res.code == 200) {
               // 成功 跳转到乐团报名详情
-              this.$router.push({ path: '/business/teamDetail' })
+              this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
             }
           })
         }).catch(() => { })
@@ -611,7 +622,7 @@ export default {
           updateSubjectInfo(obj).then(res => {
             if (res.code == 200) {
               this.$message.success('提交成功')
-              this.$router.push({ path: '/business/teamDetail' })
+              this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
             }
           })
         }).catch(() => { })
@@ -627,7 +638,7 @@ export default {
         auditSuccess({ musicGroupId: this.teamid }).then(res => {
           if (res.code == 200) {
             this.$message.success('审核通过')
-            this.$router.push({ path: '/business/teamDetail' })
+            this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
           }
         })
       }).catch(() => { })
@@ -648,7 +659,7 @@ export default {
           auditFailed({ musicGroupId: this.teamid, memo: value }).then(res => {
             if (res.code == 200) {
               this.$message.success('已拒绝')
-              this.$router.push({ path: '/business/teamDetail' })
+              this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
             }
           })
         }

src/views/teamBuild/signupList.vue

@@ -20,10 +20,10 @@
                @click="payStart"
                v-permission="'musicGroup/openPay'"
                v-if="status=='APPLY'">开始缴费</div>
+          <!-- v-if="status=='PAY'" -->
           <div class='newBand'
                v-permission="'musicGroup/found'"
-               @click="onGoHome"
-               v-if="status=='PAY'">确认开团</div>
+               @click="onGoHome">确认开团</div>
           <div class='newBand'
                v-permission="'musicGroup/extensionPayment'"
                @click="extendPaymentStatus = true"

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

@@ -239,11 +239,20 @@ export default {
         count: [{ required: true, message: '请输入排课数量', trigger: 'blur' }],
         timer: [{ required: true, message: '请选择开课时间', trigger: 'blur' }]
       },
-      organId: ''
+      organId: '',
+      Fsearch: null,
+      Frules: null,
     }
   },
   created () {
     this.organId = sessionStorage.getItem('createTeamOrgnId') || null
+    // 判断是否带缓存参数
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
   },
   mounted () {
     // 获取乐团声部
@@ -367,7 +376,7 @@ export default {
         return;
       }
       if (!this.permission('/teamSetting/salarySet')) {
-        this.$router.push({ path: '/business/teamDetail' })
+        this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
       } else {
         this.$emit('gotoNav', 4)
       }
@@ -395,7 +404,7 @@ export default {
               this.$message.success('恭喜您创建成功')
 
               if (!this.permission('/teamSetting/salarySet')) {
-                this.$router.push({ path: '/business/teamDetail' })
+                this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
               } else {
                 this.$emit('gotoNav', 4)
               }

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

@@ -154,7 +154,18 @@ export default {
       gradientTableList: [],
       subList: [],
       isok: true,
-      hasDate: false
+      hasDate: false,
+      Fsearch: null,
+      Frules: null,
+    }
+  },
+  created () {
+    // 判断是否带缓存参数
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
     }
   },
   mounted () {
@@ -242,7 +253,7 @@ export default {
         if (res.code == 200) {
           this.subList = [];
           this.$message.success('恭喜您设置成功');
-          this.$router.push({ path: '/business/teamDetail' })
+          this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
         }
       }).catch(res => {
         this.$message.error('提交失败')

src/views/teamDetail/components/studentList.vue

@@ -100,6 +100,10 @@
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="学员编号"
+                         width="120px;"
+                         prop="userId">
+        </el-table-column>
         <el-table-column label="学员姓名"
                          width="120px;"
                          prop="realName">
@@ -788,10 +792,10 @@ export default {
         snapClass: [], --> */
 
           let maskForm = this.maskForm
-          // if (!maskForm.signClass && !maskForm.mixClass) {
-          //   this.$message.error('必须加入一个单机班或合奏班')
-          //   return;
-          // }
+          if (!maskForm.signClass && !maskForm.mixClass && !maskForm.snapClass && !maskForm.highClass) {
+            this.$message.error('该学生必须加入一个班级')
+            return;
+          }
           let snapClassIds;
 
           maskForm.snapClass ? snapClassIds = maskForm.snapClass.join(',') : snapClassIds = null

src/views/teamDetail/teamDetailedList.vue

@@ -57,9 +57,17 @@
     </div>
     <div class="btnWrap"
          style="margin-top:20px;">
-      <el-button type="primary" v-if="tableList.length > 0" v-permission="'order/musicalListExport'" @click="musicalListExport">发放清单导出</el-button>
-      <el-button type="primary" v-if="tableList.length > 0" v-permission="'order/musicalListDetailExport'" @click="musicalListDetailExport">分发清单导出</el-button>
-      <el-button type="warning okBtn" v-permission="'order/verifyMusicalList'" @click="okDetailList">确认</el-button>
+      <el-button type="primary"
+                 v-if="tableList.length > 0"
+                 v-permission="'order/musicalListExport'"
+                 @click="musicalListExport">发放清单导出</el-button>
+      <el-button type="primary"
+                 v-if="tableList.length > 0"
+                 v-permission="'order/musicalListDetailExport'"
+                 @click="musicalListDetailExport">分发清单导出</el-button>
+      <el-button type="warning okBtn"
+                 v-permission="'order/verifyMusicalList'"
+                 @click="okDetailList">确认</el-button>
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>
@@ -106,11 +114,11 @@ export default {
       }).then(() => {
         verifyMusicalList({ musicGroupId: this.teamid }).then(res => {
           if (res.code == 200) {
-            this.$router.push({ path: '/business/teamDetail' })
+            this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
           }
         })
-      }).catch(() => {})
-      
+      }).catch(() => { })
+
     },
     musicalListExport () { // 报表导出
       let url = '/api-web/order/musicalListExport'
@@ -120,7 +128,7 @@ export default {
       const options = {
         method: 'POST',
         headers: {
-          'Authorization': getToken() 
+          'Authorization': getToken()
         },
         data: qs.stringify(data),
         url,
@@ -130,24 +138,24 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-       }).then(() => {
-         axios(options).then(res => {
-           let blob = new Blob([res.data], {
-               // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-               type: 'application/vnd.ms-excel;charset=utf-8'
-               //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-           })
-           let objectUrl = URL.createObjectURL(blob)
-           let link = document.createElement("a")
-           let nowTime = new Date()
-           let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
-           let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
-           link.href = objectUrl
-           link.setAttribute("download", fname)
-           document.body.appendChild(link)
-           link.click()
-         })
-       }).catch(() => {})
+      }).then(() => {
+        axios(options).then(res => {
+          let blob = new Blob([res.data], {
+            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+            type: 'application/vnd.ms-excel;charset=utf-8'
+            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+          })
+          let objectUrl = URL.createObjectURL(blob)
+          let link = document.createElement("a")
+          let nowTime = new Date()
+          let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
+          let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
+          link.href = objectUrl
+          link.setAttribute("download", fname)
+          document.body.appendChild(link)
+          link.click()
+        })
+      }).catch(() => { })
     },
     musicalListDetailExport () { // 报表导出
       let url = '/api-web/order/musicalListDetailExport'
@@ -157,7 +165,7 @@ export default {
       const options = {
         method: 'POST',
         headers: {
-          'Authorization': getToken() 
+          'Authorization': getToken()
         },
         data: qs.stringify(data),
         url,
@@ -167,24 +175,24 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-       }).then(() => {
-         axios(options).then(res => {
-           let blob = new Blob([res.data], {
-               // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-               type: 'application/vnd.ms-excel;charset=utf-8'
-               //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-           })
-           let objectUrl = URL.createObjectURL(blob)
-           let link = document.createElement("a")
-           let nowTime = new Date()
-           let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
-           let fname = this.$route.query.id + '-' + ymd + '分发清单' //下载文件的名字
-           link.href = objectUrl
-           link.setAttribute("download", fname)
-           document.body.appendChild(link)
-           link.click()
-         })
-       }).catch(() => {})
+      }).then(() => {
+        axios(options).then(res => {
+          let blob = new Blob([res.data], {
+            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+            type: 'application/vnd.ms-excel;charset=utf-8'
+            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+          })
+          let objectUrl = URL.createObjectURL(blob)
+          let link = document.createElement("a")
+          let nowTime = new Date()
+          let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
+          let fname = this.$route.query.id + '-' + ymd + '分发清单' //下载文件的名字
+          link.href = objectUrl
+          link.setAttribute("download", fname)
+          document.body.appendChild(link)
+          link.click()
+        })
+      }).catch(() => { })
     }
   },
 }