1030 16:42

dist/static/css/chunk-204ca53a.f12c9081.css → dist/static/css/chunk-077dc7dc.a963028e.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-7b298e1a]{font-size:14px}.btnList[data-v-7b298e1a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7b298e1a]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-7067e685]{font-size:14px}.btnList[data-v-7067e685]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7067e685]{margin-right:15px}

src/api/buildTeam.js

@@ -313,8 +313,9 @@ export function checkCourse (data) {
 // /web-server/musicGroup/get/{id}
 export function getTeamDetail (data) {
   return request({
-    url: `/web-server/musicGroup/get/${data}`,
+    url: `/web-server/musicGroup/get/`,
     method: 'get',
+    params: data
   })
 }
 
@@ -487,4 +488,13 @@ export function openPayment (data) {
     method: 'POST',
     data
   })
+}
+
+// 发放清单
+export function getTeamDetailList (data) {
+  return request({
+    url: `/web-server/order/getMusicalList`,
+    method: 'get',
+    params: data
+  })
 }

src/router/index.js

@@ -153,6 +153,8 @@ export const asyncRoutes = {
   studentSignin: () => import('@/views/teamDetail/components/studentSignin'),
   // 班级调整
   resetClass: () => import('@/views/teamDetail/components/resetClass'),
+  // 发放清单
+  teamDetailedList: () => import('@/views/teamDetail/teamDetailedList')
 
 
 }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -295,16 +295,19 @@
     </div>
     <div class="btnWrap">
       <div class="nextBtn"
+           v-if="teamStatus=='乐团修改'"
            @click="resetSubmit">
         修改
       </div>
       <div class="nextBtn"
-           @click="gotoNext(1)">
+           @click="gotoNext(1)"
+           v-if="teamStatus=='newTeam'">
         下一步
       </div>
       <div class="nextBtn"
+           v-if="teamStatus=='teamList'"
            @click="gotoNext(2)">
-        下二步
+        下一步
       </div>
     </div>
     <!-- <div class="baseRight">
@@ -434,7 +437,7 @@ export default {
     }
   },
   created () {
-    // 分为3种   1.resetTeam 乐团修改
+    // 分为3种  this.teamStatus 1.resetTeam 乐团修改
     //          2. newTeam  新建乐团
     //          3.teamList 跨团修改
     let year = new Date().getFullYear();

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

@@ -482,6 +482,7 @@ export default {
         }
         for (let j in this.classCardList) {
           if (this.classCardList[j].classDate == this.activeTime) {
+            console.log(this.classCardList[j].classDate, this.activeTime)
             this.classCardList.splice(j, 1);
           }
         }
@@ -616,6 +617,7 @@ export default {
       workOut({ musicGroupID: this.teamid, courseSchedules: this.classCardList }).then(res => {
         if (res.code == 200) {
           this.$message.success('恭喜您排课成功')
+          this.classCardList = [];
         }
       })
     },

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

@@ -227,7 +227,7 @@ export default {
     })
     // 获取乐团老师
     // findMusicGroupClassTeacher({ musicGroupId: this.teamid }).then()
-    getTeamDetail(this.teamid).then(res => {
+    getTeamDetail({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
         this.topForm.improventClassesNum = res.data.improventClassesNum;
       }
@@ -280,7 +280,9 @@ export default {
     },
     gotoNext () {
       addHighClass(this.tableList).then(res => {
-
+        if (res.code == 200) {
+          this.$message.success('恭喜您创建成功')
+        }
       })
     }
   },

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

@@ -1,6 +1,6 @@
 <template>
   <div class='salary-container'>
-    <el-form :inline="true"
+    <!-- <el-form :inline="true"
              :model="searchForm">
       <el-form-item label="课酬结算标准">
         <el-select v-model="searchForm.salary"
@@ -11,7 +11,7 @@
                      value="GRADIENT_SALARY"></el-option>
         </el-select>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <div class="tableWrap"
          v-if='searchForm.salary == "TEACHER_DEFAULT"'>
       <el-table :data="defaultTableList"
@@ -121,7 +121,7 @@
   </div>
 </template>
 <script>
-import { findMusicGroupClassTeacherSalary, setClassGroupTeacherSalary } from '@/api/buildTeam'
+import { findMusicGroupClassTeacherSalary, setClassGroupTeacherSalary, getTeamDetail } from '@/api/buildTeam'
 import { format } from 'path'
 export default {
   props: {
@@ -137,25 +137,43 @@ export default {
       },
       defaultTableList: [],
       gradientTableList: [],
-      subList: []
+      subList: [],
+      isok: true
     }
   },
   mounted () {
-    // 获取默认老师列表 类型为默认
-    // GRADIENT_SALARY
-    findMusicGroupClassTeacherSalary({ musicGroupId: this.teamid, type: 'TEACHER_DEFAULT' }).then(res => {
+    getTeamDetail({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
-        this.defaultTableList = res.data;
+        this.searchForm.salary = res.data.settlementType;
+        if (this.searchForm.salary == 'TEACHER_DEFAULT') {
+          findMusicGroupClassTeacherSalary({ musicGroupId: this.teamid, type: 'TEACHER_DEFAULT' }).then(res => {
+            if (res.code == 200) {
+              this.defaultTableList = res.data;
+              this.changeSalary(this.searchForm.salary);
+            }
+          })
+        } else if (this.searchForm.salary == 'GRADIENT_SALARY') {
+          findMusicGroupClassTeacherSalary({ musicGroupId: this.teamid, type: 'GRADIENT_SALARY' }).then(res => {
+            if (res.code == 200) {
+              this.gradientTableList = res.data;
+              this.changeSalary(this.searchForm.salary);
+            }
+          })
+        }
       }
     })
+    // 获取乐团收费类型
+
+    // 获取默认老师列表 类型为默认
+    // GRADIENT_SALARY
+
     // 类型为梯度
-    findMusicGroupClassTeacherSalary({ musicGroupId: this.teamid, type: 'GRADIENT_SALARY' }).then(res => {
-      if (res.code == 200) {
-        this.gradientTableList = res.data;
-      }
-    })
+
   }, methods: {
     gotoNext () {
+      if (!this.isok) {
+        this.$message.error('有老师未设置默认课酬,请设置后再试')
+      }
       if (this.searchForm.salary == 'TEACHER_DEFAULT') {
         // 组件默认课酬
         for (let i in this.defaultTableList) {
@@ -195,9 +213,11 @@ export default {
 
       if (val == 'TEACHER_DEFAULT') {
         for (let i in this.defaultTableList) {
+
           for (let j in this.defaultTableList[i].classGroupTeacherMapperList) {
-            if (this.defaultTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList.length <= 0) {
+            if (this.defaultTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList.length <= 0 || this.defaultTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList) {
               this.$message.error('还有老师课酬未确认')
+              this.isok = false;
               return
             }
           }
@@ -206,8 +226,9 @@ export default {
       } else if (val == 'GRADIENT_SALARY') {
         for (let i in this.gradientTableList) {
           for (let j in this.gradientTableList[i].classGroupTeacherMapperList) {
-            if (!this.gradientTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList.length <= 0) {
+            if (this.gradientTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList.length <= 0 || this.gradientTableList[i].classGroupTeacherMapperList[j].teacherDefaultMusicGroupSalaryList) {
               this.$message.error('还有老师课酬未确认')
+              this.isok = false;
               return
             }
           }

src/views/teamDetail/teamDetailedList.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="m-container">
+    <h2>发放清单</h2>
+    <!-- <div class="headWrap">
+      <div class="left">
+        <div class="headItem">
+          <p>乐团名称:<span>12345</span></p>
+        </div>
+        <div class="headItem">
+          <p>生成时间:<span>12345</span></p>
+        </div>
+        <div class="headItem">
+          <p>确认人:<span>12345</span></p>
+        </div>
+      </div>
+      <div class="right">
+      </div>
+    </div> -->
+    <div class="m-core">
+      <div class="tableWrap">
+        <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data='tableList'>
+          <el-table-column label="商品编号"
+                           prop='sn'
+                           align="center"
+                           width="160px">
+          </el-table-column>
+          <el-table-column label="商品名称"
+                           align="center"
+                           prop='name'
+                           width="160px">
+          </el-table-column>
+          <el-table-column label="商品类型"
+                           align="center"
+                           prop='type'
+                           width="160px">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.type | shopType }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="具体型号"
+                           align="center"
+                           prop='specification'
+                           width="160px">
+          </el-table-column>
+          <el-table-column label="数量统计"
+                           align="center"
+                           prop='sellCount'>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getTeamDetailList } from '@/api/buildTeam'
+export default {
+  data () {
+    return {
+      teamid: '',
+      tableList: [],
+    }
+  },
+  mounted () {
+    this.teamid = this.$route.query.id;
+    getTeamDetailList({ musicGroupId: this.teamid }).then(res => {
+      if (res.code == 200) {
+        this.tableList = res.data;
+      }
+    })
+  },
+}
+</script>
+
+<style lang="scss">
+</style>

src/views/teamDetail/teamList.vue

@@ -70,7 +70,8 @@
                            align='center'
                            label="乐团名称">
           </el-table-column>
-          <el-table-column align='center' width="200px"
+          <el-table-column align='center'
+                           width="200px"
                            prop="schoolName"
                            max-width='274'
                            label="学校名称">
@@ -133,7 +134,8 @@
                 <el-button type="text"
                            v-if="scope.row.status == 'PREPARE'">小班课设置</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status == 'PREPARE'">发放清单</el-button>
+                           v-if="scope.row.status == 'PREPARE'"
+                           @click="gotodetailList(scope.row)">发放清单</el-button>
                 <el-button type="text"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
                 <el-button type="text">启动</el-button>
@@ -339,6 +341,10 @@ export default {
         obj.name = arr[i].name;
         this.passed.push(obj)
       }
+    },
+    gotodetailList (row) {
+      // row.id
+      this.$router.push({ path: '/business/teamDetailedList', query: { id: row.id } })
     }
   },
   watch: {

vue.config.js

@@ -16,11 +16,11 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // 
-// let target = 'http://192.168.3.27:8000' // 箭河
+let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**