Merge branch 'online' into wxlNew

dist/static/css/chunk-428bf690.8bf03ce3.css

@@ -0,0 +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}.newBand[data-v-63913c24]{display:inline-block;margin-right:10px}.right-code .title[data-v-63913c24]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-63913c24] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-63913c24] .studentInfo .multiple.el-select{width:185px!important}

dist/static/css/chunk-b8cb6a5a.5c164983.css → dist/static/css/chunk-62e45585.359fe3a6.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}.m-container[data-v-142f7ee4]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-142f7ee4]{display:inline-block}
+.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}.m-container[data-v-2ab82041]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-2ab82041]{display:inline-block}

dist/static/css/chunk-7730001e.9cc2d90e.css

@@ -1 +0,0 @@
-.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}.newBand[data-v-ab246fb4]{display:inline-block;margin-right:10px}.right-code .title[data-v-ab246fb4]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-ab246fb4] .studentInfo .el-dialog__body{padding-top:0;padding-bottom:0}[data-v-ab246fb4] .studentInfo .multiple.el-select{width:185px!important}

src/views/studentManager/studentList.vue

@@ -202,6 +202,7 @@
                label-width="100px"
                label-position="right"
                class="studentInfo"
+               :close-on-click-modal='false'
                :visible.sync="studentVisible">
       <el-divider>基本信息</el-divider>
       <el-form :model="studentForm"
@@ -364,6 +365,7 @@ import {
   updateStudent,
   studentHasCourse
 } from "@/api/studentManager";
+import cleanDeep from 'clean-deep'
 import { vaildStudentUrl } from "@/utils/validate";
 import { getEmployeeOrgan, resetPassword2, getTeacher } from "@/api/buildTeam";
 import QRCode from "qrcodejs2";
@@ -682,17 +684,18 @@ export default {
           this.maskName = "修改学员";
 
           this.studentForm = {
-            phone: row.parentsPhone,
-            name: row.username,
-            sex: row.gender,
-            parseName: row.realName,
-            date: row.birthdate,
-            organId: row.organId,
-            nation: row.nation,
-            serviceTag: row.serviceTag,
-            operatingTag: row.operatingTag,
-            teacherId: row.teacherId
+            phone: row.parentsPhone|| null,
+            name: row.username|| null,
+            sex: row.gender|| null,
+            parseName: row.realName|| null,
+            date: row.birthdate|| null,
+            organId: row.organId|| null,
+            nation: row.nation|| null,
+            serviceTag: row.serviceTag|| null,
+            operatingTag: row.operatingTag|| null,
+            teacherId: row.teacherId || null
           }
+       
 
         }
       });

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

@@ -83,7 +83,6 @@
           <el-table-column label="1V1">
             <template slot-scope="scope">
               <el-input type="number"
-                        :disabled="scope.row.courseScheduleType == 'HIGH_ONLINE'"
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.v1"
                         placeholder="请输入课酬">
@@ -91,10 +90,19 @@
               </el-input>
             </template>
           </el-table-column>
+          <el-table-column label="1V2">
+            <template slot-scope="scope">
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.v2"
+                        placeholder="请输入课酬">
+                <template slot="append">元/节</template>
+              </el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="1V3">
             <template slot-scope="scope">
               <el-input type="number"
-                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.v3"
                         placeholder="请输入课酬">
@@ -105,7 +113,6 @@
           <el-table-column label="1V4">
             <template slot-scope="scope">
               <el-input type="number"
-                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.v4"
                         placeholder="请输入课酬">
@@ -116,7 +123,6 @@
           <el-table-column label="1V5">
             <template slot-scope="scope">
               <el-input type="number"
-                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.v5"
                         placeholder="请输入课酬">
@@ -174,9 +180,7 @@
             <el-date-picker v-model.trim="startDate"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            :picker-options="{
-                              firstDayOfWeek:1
-                            }"
+                            :picker-options="pickerOptions"
                             placeholder="选择日期"></el-date-picker>
             <div style="display: inline; color: red; padding-left: 10px;">说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；</div>
           </el-form-item>
@@ -282,6 +286,7 @@ export default {
           courseScheduleType: "HIGH_ONLINE",
           // salaryRuleJson: { 3: 0, 4: 0, 5: 0 },
           v1: 0,
+          v2: 0,
           v3: 0,
           v4: 0,
           v5: 0,
@@ -295,6 +300,7 @@ export default {
           courseScheduleType: "MUSIC_NETWORK",
           // salaryRuleJson: { 3: 0, 4: 0, 5: 0 },
           v1: 0,
+          v2: 0,
           v3: 0,
           v4: 0,
           v5: 0,
@@ -321,7 +327,8 @@ export default {
       pickerOptions: {
         disabledDate (time) {
           return time.getTime() > Date.now();
-        }
+        },
+        firstDayOfWeek: 1
       }
     };
   },
@@ -460,7 +467,7 @@ export default {
         rows.forEach(c => {
           if (item.courseScheduleType == c.courseScheduleType) {
             item.checked = true;
-            let tempJson = c.salaryRuleJson ? JSON.parse(c.salaryRuleJson) : { 3: 0, 4: 0, 5: 0 }
+            let tempJson = c.salaryRuleJson ? JSON.parse(c.salaryRuleJson) : { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 }
             // console.log(tempJson)
             smallResult.push({
               mainTeacher30MinSalary: c.mainTeacher30MinSalary,
@@ -469,6 +476,7 @@ export default {
               assistantTeacher90MinSalary: c.assistantTeacher90MinSalary,
               salaryRuleJson: tempJson,
               v1: tempJson[1] ? tempJson[1] : 0,
+              v2: tempJson[2] ? tempJson[2] : 0,
               v3: tempJson[3] ? tempJson[3] : 0,
               v4: tempJson[4] ? tempJson[4] : 0,
               v5: tempJson[5] ? tempJson[5] : 0,
@@ -513,14 +521,14 @@ export default {
           });
           let temps = []
           this.teamSmallTable.forEach(item => {
-            if (item.v1 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
+            if (item.v1 < 0 || item.v2 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
               this.$message.error("输入课酬不能为负数");
               checkStatus = false;
               return;
             }
             temps.push({
               courseScheduleType: item.courseScheduleType,
-              salaryRuleJson: JSON.stringify({ 1: Number(item.v1), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
+              salaryRuleJson: JSON.stringify({ 1: Number(item.v1), 2: Number(item.v2), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
               assistantTeacher30MinSalary: 0,
               assistantTeacher90MinSalary: 0,
               mainTeacher30MinSalary: 0,

src/views/teamBuild/components/teamSoundMoney.vue

@@ -279,6 +279,8 @@
     </div>
     <el-dialog title="乐团预览"
                :visible.sync="previewVisible"
+               :close-on-click-modal="false"
+               @close="onPreviewClose"
                width="450px">
       <div class="reductionWrap1 reductionWrap">
         <header style="background:#14928A;color:#fff">乐团缴费</header>
@@ -365,7 +367,7 @@
                 </div>
                 <div class="o_bd">{{ con.shopName }}</div>
                 <span class="o_ft">
-                  <del>原价:￥{{ con.mode.price }}</del>
+                  <del>原价:￥{{ con.mode.marketPrice }}</del>
                   现价:￥{{ (con.mode.price - con.mode.GROUP).toFixed(2) }}
                 </span>
               </div>
@@ -377,7 +379,9 @@
                     <span>配置参数</span>
                   </div>
                   <div class="content">
-                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    <template v-for="(goods, index) in lookPreviewRow.goodsList">
+                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    </template>
                   </div>
                 </div>
               </div>
@@ -392,8 +396,7 @@
                 <div class="o_bd">{{ con.shopName }}</div>
                 <template>
                   <span class="o_ft">
-                    <del>减免金额:￥{{ con.mode.LEASE }}</del>
-                    押金:￥{{ (con.mode.depositFee - con.mode.LEASE).toFixed(2) }}
+                    押金:￥{{ (con.mode.depositFee).toFixed(2) }}
                   </span>
                 </template>
               </div>
@@ -405,7 +408,10 @@
                     <span>配置参数</span>
                   </div>
                   <div class="content">
-                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    <!-- <p>{{ lookPreviewRow.goodsList[index].specification }}</p> -->
+                    <template v-for="(goods, index) in lookPreviewRow.goodsList">
+                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    </template>
                   </div>
                 </div>
               </div>
@@ -420,7 +426,7 @@
                 <div class="o_bd">{{ con.shopName }}</div>
                 <template>
                   <span class="o_ft">
-                    <del>原价:￥{{ con.mode.price }}</del>
+                    <del>原价:￥{{ con.mode.marketPrice }}</del>
                     免费领用
                   </span>
                 </template>
@@ -433,7 +439,10 @@
                     <span>配置参数</span>
                   </div>
                   <div class="content">
-                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    <!-- <p>{{ lookPreviewRow.goodsList[index].specification }}</p> -->
+                    <template v-for="(goods, index) in lookPreviewRow.goodsList">
+                      <p :key="goods.id" v-if="con.id == goods.id">{{ lookPreviewRow.goodsList[index].specification }}</p>
+                    </template>
                   </div>
                 </div>
               </div>
@@ -557,10 +566,14 @@
             <del>原价</del>
             <del>￥{{ orderInfo.marketPrice }}</del>
           </div>
-          <!-- <div class="couponprice markerprice" v-if="orderInfo.couponPrice > 0">
-            <span>优惠</span>
-            <span>￥{{ orderInfo.couponPrice }}</span>
-          </div>-->
+          <!-- <div class="needprice markerprice">
+            <p>现价</p>
+            <p>￥{{ orderInfo.groupPurchasePrice }}</p>
+          </div> -->
+          <!-- <div class="needprice markerprice" v-if="orderInfo.couponPrice > 0">
+            <p>优惠</p>
+            <p>￥{{ orderInfo.couponPrice }}</p>
+          </div> -->
           <div class="needprice grouopprice">
             <span>仅需支付</span>
             <span>￥{{ orderInfo.amount }}</span>
@@ -573,7 +586,6 @@
               <img class="logo"
                    src="@/assets/images/mycard.png"
                    alt />
-              还需支付：
               <span>￥{{ needPrice }}</span>
             </p>
           </div>
@@ -634,6 +646,7 @@
             <div class="item">
               <el-input style="width:80%"
                         type="number"
+                        disabled
                         @mousewheel.native.prevent
                         @input="deposiInput(item)"
                         v-model.trim="item.mode.LEASE"></el-input>
@@ -717,7 +730,8 @@ export default {
         goodsGroupIds: null,
         goodsIds: null,
         contractGoodsIds: null, // 选中所有商品ID
-        couponPrice: 0 //
+        couponPrice: 0, //
+        groupPurchasePrice: 0
       }, // 金额列表，金额计算
       needPrice: 0
     };
@@ -799,7 +813,6 @@ export default {
             findMusicGroupSubjectInfo({ musicGroupId: this.teamid }).then(
               res => {
                 if (res.code == 200) {
-                  // console.log(res.data)
                   this.activeSoundList = res.data.musicGroupSubjectPlans.map(
                     item => {
                       let fangshi = [];
@@ -814,6 +827,7 @@ export default {
                           let isGROUP = false;
                           let depositFee = sub.depositFee;
                           let price = sub.price;
+                          let marketPrice = sub.goodsList[0].marketPrice;
                           if (sub.kitGroupPurchaseTypeJson) {
                             let expectJson = JSON.parse(
                               sub.kitGroupPurchaseTypeJson
@@ -841,7 +855,6 @@ export default {
                               isGROUP = true;
                             }
                           }
-
                           fangshi.push({
                             shopName: sub.name,
                             id: sub.goodsIdList,
@@ -851,6 +864,7 @@ export default {
                               LEASE: LEASE || 0,
                               depositFee: depositFee || 0, // 保证金
                               price: price || 0, // 团购价
+                              marketPrice: marketPrice || 0, // 商品原价
                               isFREE: isFREE,
                               isGROUP: isGROUP,
                               isLEASE: isLEASE
@@ -1087,7 +1101,7 @@ export default {
     },
     // 添加教辅
     addMark (row) {
-      row.markList.push({ name: "", goods: [], price: "" });
+      row.markList.push({ name: "", goods: [], price: "", marketPrice: 0 });
     },
     // 删除教辅
     removeMartItem (row, index) {
@@ -1224,7 +1238,8 @@ export default {
                 type: "ACCESSORIES",
                 goodsIdList: mark.goods.join(","),
                 name: mark.name,
-                price: mark.price
+                price: mark.price,
+                marketPrice: mark.marketPrice
               };
               obj.musicGroupSubjectGoodsGroups.push(some);
             }
@@ -1327,7 +1342,8 @@ export default {
                 type: "ACCESSORIES",
                 goodsIdList: mark.goods.join(","),
                 name: mark.name,
-                price: mark.price
+                price: mark.price,
+                marketPrice: mark.marketPrice
               };
               obj.musicGroupSubjectGoodsGroups.push(some);
             }
@@ -1445,6 +1461,7 @@ export default {
                   LEASE: 0,
                   depositFee: 1500, // 保证金
                   price: row.goodsList[i].groupPurchasePrice, // 团购价
+                  marketPrice: row.goodsList[i].marketPrice, // 原价
                   isFREE: false,
                   isGROUP: false,
                   isLEASE: false
@@ -1483,6 +1500,7 @@ export default {
     lookPreview (row) {
       this.lookPreviewRow = row;
       this.previewVisible = true;
+      this.calcPrice()
     },
     onAuxiliarie (item) {
       // 辅件切换状态
@@ -1500,6 +1518,15 @@ export default {
       // 重新计算金额
       this.calcPrice();
     },
+    onPreviewClose() {
+       this.lookPreviewRow.fangshi.forEach(item => {
+        item.checked = false;
+      });
+
+      this.lookPreviewRow.markList.forEach(item => {
+        item.checked = false;
+      })
+    },
     calcPrice () {
       let amount = 0,
         marketPrice = 0,
@@ -1565,7 +1592,7 @@ export default {
               amount += parseFloat(item.mode.price);
               couponPrice = parseFloat(item.mode.GROUP);
             }
-            marketPrice += parseFloat(amount + couponPrice);
+            marketPrice += parseFloat(item.mode.marketPrice);
             // item.id ? goodsGroupIds[item.id] : null
             // if (item.id) {
             //   goodsGroupIds[item.id] = item.kitType;
@@ -1580,8 +1607,11 @@ export default {
         this.lookPreviewRow.markList.forEach(item => {
           if (item.checked) {
             amount += parseFloat(item.price);
-            marketPrice += parseFloat(item.price);
-
+            let tempPrice = 0
+            item.goods.forEach(item => {
+              tempPrice += this.getAccessoryPrice(item)
+            })
+            marketPrice += parseFloat(tempPrice);
             // if (item.goodsList && item.goodsList.length > 0) {
             //   item.goodsList.forEach(childGoods => {
             //     marketPrice += parseFloat(childGoods.marketPrice);
@@ -1611,6 +1641,7 @@ export default {
       //     // contractGoodsIds += ',' + item.id
       //   });
       // }
+      let tempGroupPurchasePrice = amount || 0
       // 判断减去优惠金额，是否大于0(这里有可能出现负数)
       if (amount - couponPrice >= 0) {
         amount = Number((amount - couponPrice).toFixed(2));
@@ -1633,12 +1664,24 @@ export default {
       this.orderInfo = {
         amount: Number(amount.toFixed(2)),
         marketPrice: Number(marketPrice.toFixed(2)),
+        groupPurchasePrice: Number(tempGroupPurchasePrice.toFixed(2)),
         couponPrice: couponPrice,
         goodsGroupIds: goodsGroupIds,
         goodsIds: goodsIds.join(","),
         contractGoodsIds: contractGoodsIds
       };
-    }
+    },
+    getAccessoryPrice (val) {
+      const lookPreviewRow = this.lookPreviewRow
+      if (lookPreviewRow && lookPreviewRow.markChioseList) {
+        for (let i in lookPreviewRow.markChioseList) {
+          if (lookPreviewRow.markChioseList[i].id == val) {
+            return lookPreviewRow.markChioseList[i].marketPrice;
+          }
+        }
+      }
+      return 0;
+    },
   },
   filters: {
     AccessoryName (val, lookPreviewRow) {
@@ -1739,6 +1782,7 @@ export default {
       if (!val) {
         this.orderInfo = {
           marketPrice: 0,
+          groupPurchasePrice: 0,
           amount: 0, // 现价总金额
           goodsGroupIds: null,
           goodsIds: null,

src/views/vipClass/vipList.vue

@@ -332,7 +332,7 @@ export default {
         }
       });
       // 获取活动方案
-      vipGroupActivity({ organId: this.organId }).then(res => {
+      vipGroupActivity({ organId: this.organId, rows: 9999 }).then(res => {
         if (res.code == 200) {
           this.activeList = res.data.rows;
         }