19:59

提交测试

src/views/resetTeaming/components/resetSound.vue

@@ -238,12 +238,14 @@
             <div class="item">
               <el-input style="width:80%"
                         @mousewheel.native.prevent
+                        v-model="item.mode.price"
                         type="number"
                         disabled></el-input>
             </div>
             <div class="item">
               <el-input style="width:80%"
                         @mousewheel.native.prevent
+                        @input='groupInput(item)'
                         type="number"
                         v-model="item.mode.GROUP"></el-input>
             </div>
@@ -266,6 +268,7 @@
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
+                        @input='deposiInput(item)'
                         v-model="item.mode.LEASE"></el-input>
             </div>
 
@@ -354,7 +357,7 @@ export default {
                 let isLEASE = false
                 let isGROUP = false
                 let depositFee = sub.depositFee
-                // let price = sub.price
+                let price = sub.price
                 if (sub.kitGroupPurchaseTypeJson) {
                   let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
                   if (expectJson && expectJson.hasOwnProperty("FREE")) {
@@ -379,8 +382,8 @@ export default {
                     'FREE': FREE || 0,
                     'GROUP': GROUP || 0,
                     'LEASE': LEASE || 0,
-                    'depositFee': depositFee || 0, // 保证金
-                    // 'price': price || 0,// 团购价
+                    'depositFee': depositFee || 1500, // 保证金
+                    'price': price,
                     'isFREE': isFREE,
                     'isGROUP': isGROUP,
                     'isLEASE': isLEASE,
@@ -484,10 +487,12 @@ export default {
           })
           let kitGroupPurchaseTypeJson = ''
           let depositFee;
+          let price
           active.fangshi.forEach(fs => {
             if (fs.id == zl) {
 
               depositFee = fs.mode.depositFee
+              price = fs.mode.price
               let types = {}
 
               if (fs.mode.isFREE) {
@@ -510,7 +515,7 @@ export default {
             name: goodsItem.name,
             kitGroupPurchaseTypeJson,
             depositFee,
-            price: goodsItem.groupPurchasePrice
+            price
           }
           obj.musicGroupSubjectGoodsGroups.push(some);
         })
@@ -617,7 +622,7 @@ export default {
           for (let j in row.zhonglei) {
 
             if (row.goodsList[i].id == row.zhonglei[j]) {
-
+              console.log(row.goodsList[i].groupPurchasePrice)
               row.fangshi.push({
                 shopName: row.goodsList[i].name,
                 id: row.goodsList[i].id,
@@ -625,8 +630,8 @@ export default {
                   'FREE': 0,
                   'GROUP': 0,
                   'LEASE': 0,
-                  'depositFee': 0, // 保证金
-                  'price': 0,// 团购价
+                  'depositFee': 1500, // 保证金
+                  'price': row.goodsList[i].groupPurchasePrice,// 团购价
                   'isFREE': false,
                   'isGROUP': false,
                   'isLEASE': false,
@@ -647,6 +652,17 @@ export default {
           this.reductionVisible = false
         }
       }
+    },
+    groupInput (item) {
+      if (item.mode.price - item.mode.GROUP < 0) {
+        item.mode.GROUP = item.mode.price
+      }
+    },
+    deposiInput (item) {
+      if (item.mode.depositFee - item.mode.LEASE < 0) {
+        item.mode.LEASE = item.mode.depositFee
+      }
+
     }
 
   }, filters: {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -451,13 +451,14 @@ export default {
     }
   },
   created () {
-    this.init();
+
 
   },
   activated () {
     this.init()
   },
   mounted () {
+    this.init();
     // 获取分部下的员工
 
   },
@@ -548,8 +549,23 @@ export default {
           }
         })
       } else {
-
-        this.$refs['topinfo'].resetFields()
+        this.topFrom = {
+          type: '', // 收费类型
+          section: '', //所属分部
+          school: '', // 合作单位
+          teacher: '', // 教务老师
+          name: '', //乐团名称
+          boss: '', // 运营主管
+          time: '', // 报名截止时间
+          startClass: [], // 招生年级起始
+          address: '', // 教学地点
+          salary: '', // 收费模式
+          head: '',
+          isClass: false, //是否为课堂课
+          startTime: '',
+          ownershipType: 'OWN' // 合作机构类型
+        },
+          this.$refs['topinfo'].resetFields()
       }
       // 1.获取各个选项卡的数据内容
       // getSection({ 'delFlag': 0, 'rows': 1000 }).then(res => {

src/views/teamBuild/components/teamSoundMoney.vue

@@ -360,13 +360,15 @@
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
+                        v-model="item.mode.price"
                         disabled></el-input>
             </div>
             <div class="item">
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
-                        v-model="item.mode.GROUP"></el-input>
+                        v-model="item.mode.GROUP"
+                        @input='groupInput(item)'></el-input>
             </div>
           </div>
 
@@ -386,6 +388,7 @@
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
+                        @input='deposiInput(item)'
                         v-model="item.mode.LEASE"></el-input>
             </div>
 
@@ -405,7 +408,7 @@
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
-                        v-model="item.mode.FREE"></el-input>
+                        disabled></el-input>
             </div>
 
           </div>
@@ -510,7 +513,7 @@ export default {
                       let isLEASE = false
                       let isGROUP = false
                       let depositFee = sub.depositFee
-                      // let price = sub.price
+                      let price = sub.price
                       if (sub.kitGroupPurchaseTypeJson) {
                         let expectJson = JSON.parse(sub.kitGroupPurchaseTypeJson);
 
@@ -537,7 +540,7 @@ export default {
                           'GROUP': GROUP || 0,
                           'LEASE': LEASE || 0,
                           'depositFee': depositFee || 0, // 保证金
-                          // 'price': price || 0,// 团购价
+                          'price': price || 0,// 团购价
                           'isFREE': isFREE,
                           'isGROUP': isGROUP,
                           'isLEASE': isLEASE,
@@ -796,10 +799,11 @@ export default {
               }
             })
             let kitGroupPurchaseTypeJson = ''
-            let depositFee;
+            let depositFee, price;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {
                 depositFee = fs.mode.depositFee
+                price = fs.mode.price
                 let types = {}
                 if (fs.mode.isFREE) {
                   types.FREE = fs.mode.FREE
@@ -818,7 +822,7 @@ export default {
               type: 'INSTRUMENT',
               goodsIdList: zl,
               name: goodsItem.name,
-              price: goodsItem.groupPurchasePrice,
+              price,
               kitGroupPurchaseTypeJson,
               depositFee
             }
@@ -854,7 +858,7 @@ export default {
             // kitGroupPurchaseType: active.fangshi,
             subName: active.sound,
             subjectId: active.id,
-            depositFee// depositFee  只有租赁才有
+            // depositFee// depositFee  只有租赁才有
           }
           obj.musicGroupSubjectPlans.push(item);
         })
@@ -892,10 +896,11 @@ export default {
               }
             })
             let kitGroupPurchaseTypeJson = ''
-            let depositFee;
+            let depositFee, price;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {
                 depositFee = fs.mode.depositFee
+                price = fs.mode.price
                 let types = {}
 
                 if (fs.mode.isFREE) {
@@ -918,7 +923,7 @@ export default {
               name: goodsItem.name,
               kitGroupPurchaseTypeJson,
               depositFee,
-              price: goodsItem.groupPurchasePrice
+              price
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
           })
@@ -953,7 +958,7 @@ export default {
             // kitGroupPurchaseType: active.fangshi,
             subName: active.sound,
             subjectId: active.id,
-            depositFee: depositFee // depositFee  只有租赁才有
+            // depositFee: depositFee // depositFee  只有租赁才有
           }
           obj.musicGroupSubjectPlans.push(item);
         })
@@ -1029,7 +1034,6 @@ export default {
           for (let j in row.zhonglei) {
 
             if (row.goodsList[i].id == row.zhonglei[j]) {
-
               row.fangshi.push({
                 shopName: row.goodsList[i].name,
                 id: row.goodsList[i].id,
@@ -1037,8 +1041,8 @@ export default {
                   'FREE': 0,
                   'GROUP': 0,
                   'LEASE': 0,
-                  'depositFee': 0, // 保证金
-                  'price': 0,// 团购价
+                  'depositFee': 1500, // 保证金
+                  'price': row.goodsList[i].groupPurchasePrice,// 团购价
                   'isFREE': false,
                   'isGROUP': false,
                   'isLEASE': false,
@@ -1059,6 +1063,17 @@ export default {
           this.reductionVisible = false
         }
       }
+    },
+    groupInput (item) {
+      if (item.mode.price - item.mode.GROUP < 0) {
+        item.mode.GROUP = item.mode.price
+      }
+    },
+    deposiInput (item) {
+      if (item.mode.depositFee - item.mode.LEASE < 0) {
+        item.mode.LEASE = item.mode.depositFee
+      }
+
     }
   },
   filters: {
@@ -1089,7 +1104,7 @@ export default {
           str += `免费:减免金额${val[i].mode['FREE']}\n`
         }
         if (val[i].mode.isGROUP) {
-          str += `团购:减免金额${val[i].mode['GROUP']}\n`
+          str += `团购:团购价${val[i].mode['price']},减免金额${val[i].mode['GROUP']}\n`
         }
         if (val[i].mode.isLEASE) {
           str += `租赁:${val[i].mode.depositFee},减免金额${val[i].mode['FREE']}\n`

src/views/teamDetail/teamCourseList.vue

@@ -14,9 +14,9 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.schoolId"
-                    clearable
-                    filterable
-                    placeholder="请选择教学点">
+                     clearable
+                     filterable
+                     placeholder="请选择教学点">
             <el-option v-for="(item, index) in schoolList"
                        :key="index"
                        :value="item.id"
@@ -167,10 +167,15 @@
                            label="指导老师">
           </el-table-column>
 
-          <!-- <el-table-column align='center'
-                          prop="subTeacherName"
-                          label="助教老师">
-          </el-table-column> -->
+          <el-table-column align='center'
+                           label="详情">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text"
+                           @click="lookDetail(scope.row)">详情</el-button>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="rules.total"
                     :page.sync="rules.page"
@@ -239,7 +244,7 @@ export default {
 
     // 获取教学点
     getSchool().then(res => {
-      if(res.code == 200) {
+      if (res.code == 200) {
         this.schoolList = res.data
       }
     })
@@ -314,6 +319,9 @@ export default {
           this.rules.total = res.data.total;
         }
       })
+    },
+    lookDetail (row) {
+      console.log(row)
     }
   }
 }