Merge branch 'test' into 02/24resetMain

dist/static/css/chunk-40ceed25.be36587f.css

@@ -1 +0,0 @@
-.form[data-v-224fd063]{margin-top:30px}.infoTitle[data-v-224fd063]{font-weight:400;margin-top:30px;font-size:18px}[data-v-224fd063] label{font-weight:400}

dist/static/css/chunk-411c8e25.b1e2840e.css

@@ -1 +0,0 @@
-.titleCell[data-v-bfd11f1c]{display:inline-block}

dist/static/css/chunk-4f182e50.0d038495.css

@@ -0,0 +1 @@
+.titleCell[data-v-a1a4f8f2]{display:inline-block}.tableWrap[data-v-a1a4f8f2]{margin-top:20px}.qrcode[data-v-a1a4f8f2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-a1a4f8f2]{width:200px;height:200px;margin:0 auto}.code-url[data-v-a1a4f8f2]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

dist/static/css/chunk-71b02bbe.99206a1f.css

@@ -0,0 +1 @@
+.form[data-v-2ee38580]{margin-top:30px}.infoTitle[data-v-2ee38580]{font-weight:400;margin-top:30px;font-size:18px}[data-v-2ee38580] label{font-weight:400}

dist/static/css/chunk-7d7a7235.61f6aaa5.css

@@ -0,0 +1 @@
+.titleCell[data-v-b659e418]{display:inline-block}

dist/static/css/chunk-8d1b782a.066f3bf7.css

@@ -1 +0,0 @@
-.titleCell[data-v-c6ad76fc]{display:inline-block}.tableWrap[data-v-c6ad76fc]{margin-top:20px}.qrcode[data-v-c6ad76fc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-c6ad76fc]{width:200px;height:200px;margin:0 auto}.code-url[data-v-c6ad76fc]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

src/views/2021memeberActionManager/index.vue

@@ -39,7 +39,7 @@
           >
         </el-form-item>
         <el-form-item>
-          <auth auths='export/countCloudTeacherActive'>
+          <auth auths="export/countCloudTeacherActive">
             <el-button type="primary" @click="onExport">导出</el-button>
           </auth>
         </el-form-item>
@@ -61,8 +61,8 @@
         购买人数：{{ head.buyNum | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        购买率：{{ head.buyScale }}%
-        <i style="width: 10px; display: inline-block"></i>
+        <!-- 购买率：{{ head.buyScale }}%
+        <i style="width: 10px; display: inline-block"></i> -->
 
         目标总金额：{{ head.targetAmount | moneyFormat }}元<i
           style="width: 10px; display: inline-block"
@@ -73,9 +73,9 @@
         目标购买人数：{{ head.targetNum }}元<i
           style="width: 10px; display: inline-block"
         ></i>
-        总人数：{{ head.totalNum }}元<i
+        <!-- 总人数：{{ head.totalNum }}元<i
           style="width: 10px; display: inline-block"
-        ></i>
+        ></i> -->
       </div>
       <div class="tableWrap">
         <el-table
@@ -88,11 +88,12 @@
             order: 'descending',
           }"
         >
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="targetNum"
             label="排名"
-          ></el-table-column>
+          ></el-table-column> -->
+          <el-table-column   align="center" label="排名" type="index" width="50"> </el-table-column>
           <el-table-column
             align="center"
             prop="organName"
@@ -152,7 +153,7 @@
               <div>{{ scope.row.avgBuyAmount }}元</div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="totalNum"
             sortable="custom"
@@ -180,8 +181,8 @@
             <template slot-scope="scope">
               <div>{{ scope.row.totalNum }}人</div>
             </template>
-          </el-table-column>
-          <el-table-column
+          </el-table-column> -->
+          <!-- <el-table-column
             align="center"
             prop="buyScale"
             sortable="custom"
@@ -207,7 +208,7 @@
             <template slot-scope="scope">
               <div>{{ scope.row.buyScale }}%</div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="targetNum"
@@ -218,7 +219,7 @@
               <div class="titleCell">
                 <span>目标人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">各分部目标人数之和</div>
+                  <div slot="content">进行中非会员乐团-已上乐团课小于等于4节学员-非本活动购买会员-弦乐声部学员</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -245,7 +246,7 @@
               <div class="titleCell">
                 <span>目标达成率</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">各分部目标人数之和</div>
+                  <div slot="content">该分部实际交易成功人数 / 目标人数*100%</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="

src/views/couponManager/couponUpdate.vue

@@ -133,10 +133,10 @@
         <el-col style="width: 395px" v-if="form.effectiveType == 'DAYS'">
           <el-form-item
             prop="deadline"
-            :rules="[{ required: true, message: '请选择有效期天数' }]"
+            :rules="[{ required: true, message: '请输入有效期天数' }]"
           >
             <span style="color: #606266"
-              >有效期天数
+              ><span style="color:#F56C6C">*</span>有效期天数
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">自领取之日起多少天有效</div>
                 <i
@@ -155,7 +155,7 @@
             :rules="[{ required: true, message: '请选择有效期' }]"
           >
             <span style="color: #606266"
-              >有效期
+              ><span style="color:#F56C6C">*</span>有效期
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">优惠券可使用时间段</div>
                 <i
@@ -180,7 +180,7 @@
       <el-row :gutter="20">
         <el-col style="width: 395px">
           <el-form-item
-            label="库存总量"
+            label="库存总量(-1为不限制)"
             prop="stockCount"
             :rules="[{ required: true, message: '请输入库存总量' }]"
           >
@@ -191,7 +191,7 @@
         </el-col>
         <el-col style="width: 395px">
           <el-form-item
-            label="预警值"
+            label="预警值(-1为不限制)"
             prop="warningStockNum"
             :rules="[{ required: true, message: '请输入预警值' }]"
           >
@@ -206,7 +206,8 @@
             :rules="[{ required: true, message: '请输入领取上限' }]"
           >
             <span style="color: #606266"
-              >领取上限
+              >
+              <span style="color:#F56C6C">*</span> 领取上限
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">用户可领取最大张数</div>
                 <i
@@ -226,7 +227,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col style="width: 395px">
-          <el-form-item label="领取时间" prop="getTime">
+          <el-form-item label="领取时间" prop="getTime"  :rules="[{ required: true, message: '请输入领取时间' }]">
             <el-date-picker
               style="width: 100%"
               v-model="form.getTime"
@@ -304,7 +305,8 @@ export default {
     changeEffectiveType() {
       // this.form.effectiveTime = [];
       this.$set(this.form,'effectiveTime',[])
-      this.form.deadline = "";
+      this.$set(this.form,'deadline',null)
+      // this.form.deadline = "";
     },
     onCancel() {
       this.$router.push("/couponManager");

src/views/couponManager/index.vue

@@ -66,7 +66,6 @@
           style="width: 100%"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
-
         >
           <el-table-column
             align="center"
@@ -262,19 +261,36 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="stockCount" label="总库存">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.stockCount == -1 ? "不限制" : scope.row.stockCount
+                }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
-            prop="stockCount"
-            label="总库存"
-          ></el-table-column>
+            prop="warningStockNum"
+            label="领取数量"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.consumeNum }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="warningStockNum"
-            label="剩余库存"
+            label="库存预警值"
           >
-            <template slot-scope="scope">
+              <template slot-scope="scope">
               <div>
-                {{ scope.row.stockCount - scope.row.consumeNum }}
+                {{
+                  scope.row.warningStockNum == -1 ? "不限制" : scope.row.stockCount
+                }}
               </div>
             </template>
           </el-table-column>
@@ -294,24 +310,24 @@
             <template slot-scope="scope">
               <div>
                 <auth auths="sysCoupon/updateCoupon">
-                <!-- <el-button type="text" @click="gotoDetail(scope.row)"
+                  <!-- <el-button type="text" @click="gotoDetail(scope.row)"
                   >查看</el-button
                 > -->
-                <el-button
-                  type="text"
-                  v-if="scope.row.status"
-                  @click="stop(scope.row)"
-                  >停用</el-button
-                >
-                <el-button type="text" v-else @click="start(scope.row)"
-                  >启用</el-button
-                >
-                <el-button
-                  type="text"
-                  v-if="!scope.row.status"
-                  @click="gotoDetail(scope.row)"
-                  >修改</el-button
-                >
+                  <el-button
+                    type="text"
+                    v-if="scope.row.status"
+                    @click="stop(scope.row)"
+                    >停用</el-button
+                  >
+                  <el-button type="text" v-else @click="start(scope.row)"
+                    >启用</el-button
+                  >
+                  <el-button
+                    type="text"
+                    v-if="!scope.row.status"
+                    @click="gotoDetail(scope.row)"
+                    >修改</el-button
+                  >
                 </auth>
                 <auth auths="sysCoupon/delete">
                   <el-button

src/views/resetTeaming/components/musicArchices.vue

@@ -17,7 +17,7 @@
       </el-switch>
     </div>
     <!-- searchKey="musicArchices" -->
-    <tab-router v-model="activeIndex" ref="tab">
+    <el-tabs v-model="activeIndex" ref="tab">
       <el-tab-pane
         label="基本信息"
         lazy
@@ -107,7 +107,7 @@
       >
         <survey v-if="activeIndex == 8" />
       </el-tab-pane>
-    </tab-router>
+    </el-tabs>
   </div>
 </template>
 <script>
@@ -143,7 +143,7 @@ export default {
   },
   data() {
     return {
-      activeIndex: "training-photos",
+      activeIndex: "1",
       planDtosList: [],
       planDtosList1: [],
       year: "",

src/views/teamBuild/modals/accessories.vue

@@ -98,9 +98,27 @@ export default {
       }
       this.$listeners.change(formatids, selectMoney);
     },
+    list: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.$nextTick(() => {
+          const accessoriesByid = {};
+          for (const item of this.list) {
+            accessoriesByid[item.id] = item;
+          }
+          const groupListById = {};
+          for (const item of this.groupList) {
+            groupListById[item.id] = item;
+          }
+          this.accessoriesByid = accessoriesByid;
+          this.groupListById = groupListById;
+        });
+      },
+    },
   },
   mounted() {
-    this.init()
+    this.init();
   },
   computed: {
     groupOptions() {

src/views/teamBuild/modals/change-voice.vue

@@ -95,12 +95,13 @@
         }}</span>
       </el-form-item>
       <template>
-        <el-form-item
-          v-show="
+        <!--      v-show="
             (courseViewType == 2 && form.musicalGoods == 'OWNED') ||
             courseViewType != 2
-          "
-          v-if="activeAccessories.length || groupList.length || changeInfo"
+          " -->
+        <el-form-item
+
+          v-if="(activeAccessories.length || groupList.length || changeInfo)&&form.musicalGoods"
           label="更换教辅"
           class="is-required"
         >
@@ -109,6 +110,7 @@
             :list.sync="activeAccessories"
             :groupList.sync="groupList"
             @change="accessoriesChange"
+
             v-if="!changeInfo"
           />
           <span v-else-if="changeInfo">{{ changeAccessoriesGoods }}</span>
@@ -350,8 +352,10 @@ export default {
       );
     },
     activeAccessories() {
+
       const { musicalGoods } = this.form || {};
-      return musicalGoods ? this.accessoriesByGoods[musicalGoods] || [] : [];
+        let arr = musicalGoods ? this.accessoriesByGoods[musicalGoods] || [] : [];
+      return arr
     },
     changeSubjectName() {
       let name = "";
@@ -378,7 +382,6 @@ export default {
         (data.originalAccessoriesPrice || 0) +
         (data.originalCourseFee || 0) +
         (data.originalMusicalPrice || 0);
-      // console.log(payed, data.changeMusicalPrice, data.changeAccessoriesPrice, data.changeCourseFee, {...data})
       return (
         (data.changeMusicalPrice || 0) +
         (data.changeAccessoriesPrice || 0) +
@@ -464,12 +467,16 @@ export default {
           });
           data = res.data;
           this.musicGroupSubjectPlanFee = res.data.musicGroupSubjectPlan.fee;
+          // 更改辅件了列表
+
         } catch (e) {
           console.log(e);
         }
       } else {
         this.musicGroupSubjectPlanFee = 0;
       }
+
+
       const items = formatAllGoods(data, this.item.kitGroupPurchaseType);
       for (const key in items) {
         if (items.hasOwnProperty(key)) {