Merge branch '07/06musicArchives' into test

src/utils/vueFilter.js

@@ -682,7 +682,14 @@ Vue.filter('teamPayStatus', value => {
 Vue.filter('moneyFormat', value => {
   return numeral(value).format('0,0.00')
 })
+Vue.filter('hasMoneyFormat', value => {
+  if(value){
+    return numeral(value).format('0,0.00')+'元'
+  }else{
+    return '--'
+  }
 
+})
 Vue.filter('stockTypeStatus', value => {
   const template = {
     INTERNAL: '内部',

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -63,14 +63,14 @@
       <!-- <el-table-column align="center" prop="type" label="1天收费现价（元）">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.currentDayFee | moneyFormat }}元
+            {{ scope.row.memberFeeSetting.currentDayFee | hasMoneyFormat }}
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="type" label="1天收费原价（元）">
         <template slot-scope="scope">
           <div>
-            {{ scope.row.memberFeeSetting.originalDayFee | moneyFormat }}元
+            {{ scope.row.memberFeeSetting.originalDayFee | hasMoneyFormat }}
           </div>
         </template>
       </el-table-column> -->
@@ -80,16 +80,16 @@
             <p>
               团购:
               {{
-                scope.row.memberFeeSetting.groupPurchaseMonthFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.groupPurchaseMonthFee | hasMoneyFormat
+              }}
             </p>
             <p>
               零售:
-              {{ scope.row.memberFeeSetting.currentMonthFee | moneyFormat }}元
+              {{ scope.row.memberFeeSetting.currentMonthFee | hasMoneyFormat }}
             </p>
             <p>
               原价:
-              {{ scope.row.memberFeeSetting.originalMonthFee | moneyFormat }}元
+              {{ scope.row.memberFeeSetting.originalMonthFee | hasMoneyFormat }}
             </p>
           </div>
         </template>
@@ -101,24 +101,24 @@
               团购:
               {{
                 scope.row.memberFeeSetting.groupPurchaseQuarterlyFee
-                  | moneyFormat
-              }}元
+                  | hasMoneyFormat
+              }}
             </p>
             <p>
               零售:
               {{
-                scope.row.memberFeeSetting.currentQuarterlyFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.currentQuarterlyFee | hasMoneyFormat
+              }}
             </p>
             <p>
               原价:
               {{
-                scope.row.memberFeeSetting.originalQuarterlyFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.originalQuarterlyFee | hasMoneyFormat
+              }}
             </p>
 
             <!-- </div>
-            {{ scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat }}元 -->
+            {{ scope.row.memberFeeSetting.currentHalfYearFee | hasMoneyFormat }} -->
           </div>
         </template>
       </el-table-column>
@@ -129,20 +129,20 @@
               团购:
               {{
                 scope.row.memberFeeSetting.groupPurchaseHalfYearFee
-                  | moneyFormat
-              }}元
+                  | hasMoneyFormat
+              }}
             </p>
             <p>
               零售:
               {{
-                scope.row.memberFeeSetting.currentHalfYearFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.currentHalfYearFee | hasMoneyFormat
+              }}
             </p>
             <p>
               原价:
               {{
-                scope.row.memberFeeSetting.originalHalfYearFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.originalHalfYearFee | hasMoneyFormat
+              }}
             </p>
           </div>
         </template>
@@ -153,16 +153,16 @@
             <p>
               团购:
               {{
-                scope.row.memberFeeSetting.groupPurchaseYearFee | moneyFormat
-              }}元
+                scope.row.memberFeeSetting.groupPurchaseYearFee | hasMoneyFormat
+              }}
             </p>
             <p>
               零售:
-              {{ scope.row.memberFeeSetting.currentYearFee | moneyFormat }}元
+              {{ scope.row.memberFeeSetting.currentYearFee | hasMoneyFormat }}
             </p>
             <p>
               原价:
-              {{ scope.row.memberFeeSetting.originalYearFee | moneyFormat }}元
+              {{ scope.row.memberFeeSetting.originalYearFee | hasMoneyFormat }}
             </p>
           </div>
         </template>
@@ -183,7 +183,7 @@
           <div>
             <!-- memberRankSetting/add -->
             <auth auths="memberRankOrganizationFeeMapper/get">
-              <el-button type="text" @click="resetFee(scope.row)"
+              <el-button type="text" @click="resetFee(scope.row,'look')"
                 >详情</el-button
               >
             </auth>
@@ -305,8 +305,8 @@
           :rules="[
             { required: false, message: '请输入月收费团购价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -325,8 +325,8 @@
           :rules="[
             { required: false, message: '请输入月收费零售价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -345,8 +345,8 @@
           :rules="[
             { required: false, message: '请输入月收费原价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -365,8 +365,8 @@
           :rules="[
             { required: false, message: '请输入季度收费团购价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -385,8 +385,8 @@
           :rules="[
             { required: false, message: '请输入季度收费零售价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -405,8 +405,8 @@
           :rules="[
             { required: false, message: '请输入季度收费原价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -425,8 +425,8 @@
           :rules="[
             { required: false, message: '请输入半年收费团购价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -445,8 +445,8 @@
           :rules="[
             { required: false, message: '请输入半年收费零售价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -465,8 +465,8 @@
           :rules="[
             { required: false, message: '请输入半年收费原价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -485,8 +485,8 @@
           :rules="[
             { required: false, message: '请输入年收费团购价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -505,8 +505,8 @@
           :rules="[
             { required: false, message: '请输入年收费零售价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -525,8 +525,8 @@
           :rules="[
             { required: false, message: '请输入年收费原价' },
             {
-              pattern: /^\d+$/,
-              message: '请输入≥0的正整数',
+              pattern:/^[1-9][0-9]*$/,
+              message: '请输入大于0的正整数',
             },
           ]"
           :label-width="formLabelWidth"
@@ -649,17 +649,24 @@ export default {
       this.branchStatus = true;
     },
     resetFee(row, type) {
-      if (type) {
+      if (type=='update') {
         this.title = "修改收费标准";
         this.pageType = "update";
         this.addDisabled = false;
       } else {
         this.addDisabled = true;
         this.title = "查看收费标准";
-        this.pageType = "";
+        this.pageType = "look";
       }
+      let obj = {}
+      for(let key in row.memberFeeSetting){
+        if(row.memberFeeSetting,key,row.memberFeeSetting[key]){
+          obj[key] = row.memberFeeSetting[key]
+        }
+      }
+
       this.form = {
-        ...row.memberFeeSetting,
+        ...obj,
         organId: row.organId,
         memberRankSettingId: row.memberRankSettingId,
         outId: row.id,
@@ -667,6 +674,11 @@ export default {
       this.branchStatus = true;
     },
     onSubmit() {
+      console.log(this.pageType)
+      if(this.pageType == 'look'){
+        this.branchStatus = false;
+           return
+      }
       this.$refs.ruleForm.validate(async (flag) => {
         if (flag) {
           if (this.pageType == "update") {
@@ -694,8 +706,6 @@ export default {
               this.branchStatus = false;
               this.getList();
             } catch {}
-          } else {
-            this.branchStatus = false;
           }
         }
       });

src/views/teamBuild/signupList.vue

@@ -60,7 +60,10 @@
             v-permission="'musicGroup/extensionPayment'"
             @click="extendTime(true)"
             v-show="
-               status == 'APPLY' || status == 'PAY' || status == 'PROGRESS' || status == 'PREPARE'
+              status == 'APPLY' ||
+              status == 'PAY' ||
+              status == 'PROGRESS' ||
+              status == 'PREPARE'
             "
           >
             延长缴费
@@ -509,21 +512,115 @@
           :selectable="checkboxSelect"
         >
         </el-table-column>
-        <el-table-column label="学员姓名" prop="studentName" align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.studentName }}({{ scope.row.gender | sex }})</div>
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" class="demo-table-expand">
+              <el-row style="margin-left: 64px">
+                 <el-col :span="4">
+                  <el-form-item label="入团年份">
+                    <span>
+                      {{ props.row.createTime | dayjsFormat("YYYY年") }}</span
+                    >
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="报名专业">
+                    <span>{{props.row.subjectName }}</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="服从调剂:">
+                    <span>{{ props.row.isAllowAdjust | isAllowAdjust }}</span>
+                  </el-form-item></el-col
+                >
+                <!-- <el-col :span="4">
+                  <el-form-item label="是否购买云教练:">
+                    <span>{{
+                      props.row.hasCloudTeacher == 1 ? "是" : "否"
+                    }}</span>
+                  </el-form-item></el-col
+                > -->
+
+                <el-col :span="4">
+                  <!-- <el-form-item> -->
+                  <!-- <template slot="label"> -->
+                  <div class="hiddenwrap">
+                    <p
+                      style="
+                        position: relative;
+                        display: flex;
+                        align-items: center;
+                      "
+                    >
+                      解除限制
+                      <el-tooltip placement="top" popper-class="mTooltip">
+                        <div slot="content">
+                          学员是否受到不购买云教练的缴费限制
+                        </div>
+                        <i
+                          class="el-icon-question"
+                          style="font-size: 18px; color: #f56c6c"
+                        ></i
+                        >:
+                      </el-tooltip>
+                    </p>
+                    <!-- </template> -->
+
+                    <span>
+                      {{ props.row.noneNeedCloudTeacher == 1 ? "是" : "否" }}
+                    </span>
+                  </div>
+                  <!-- </el-form-item>-->
+                </el-col>
+                <!-- <el-col :span="4">
+                  <el-form-item label="备注:">
+                    <overflow-text
+                      :text="props.row.remark"
+                    ></overflow-text> </el-form-item
+                ></el-col> -->
+
+              </el-row>
+            </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="家长姓名" prop="parentsName" align="center">
+        <el-table-column
+          label="姓名"
+          prop="studentName"
+          align="center"
+          width="150px"
+        >
+          <template slot-scope="scope">
+            <div>
+              <p class="courseYellow left">
+                学员: {{ scope.row.studentName }}({{ scope.row.gender | sex }})
+              </p>
+              <p class="left">家长: {{ scope.row.parentsName }}</p>
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column align="center" label="入团年份">
+        <!-- <el-table-column label="家长姓名" prop="parentsName" align="center">
+        </el-table-column> -->
+
+        <!-- <el-table-column align="left" label="入团年份">
           <template slot-scope="scope">
             <div>
               {{ scope.row.createTime | dayjsFormat("YYYY年") }}
             </div>
           </template>
+        </el-table-column> -->
+        <el-table-column
+          label="联系电话"
+          prop="parentsPhone"
+          align="center"
+          width="110px"
+        >
         </el-table-column>
-        <el-table-column label="联系电话" prop="parentsPhone" align="center">
+        <el-table-column label="学员状态" prop="studentStatus" align="center">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.studentStatus | musicGroupStudentType }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label="年级班级" align="center">
           <template slot-scope="scope">
@@ -539,23 +636,22 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column label="服从调剂" prop="isAllowAdjust" align="center">
+        <!-- <el-table-column label="服从调剂" prop="isAllowAdjust" align="center">
           <template slot-scope="scope">
             <div>
               {{ scope.row.isAllowAdjust | isAllowAdjust }}
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column label="报名专业" prop="subjectName" align="center">
         </el-table-column> -->
-        <el-table-column
-          label="报名/调剂专业"
-          prop="actualSubjectName"
-          align="center"
-        >
+        <el-table-column label="调剂专业" prop="actualSubjectName" align="center">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.subjectName }} / {{ scope.row.actualSubjectName }}
+              <p>
+               {{ scope.row.actualSubjectName }}
+              </p>
+              <!-- <p>报名:{{ scope.row.subjectName }}</p> -->
             </div>
           </template>
         </el-table-column>
@@ -570,33 +666,27 @@
         <!-- visited -->
         <!-- v-show='status == "PAY"' -->
         <el-table-column
-          label="报名缴费状态"
+          label="报名缴费/订单状态"
           prop="paymentStatus"
           align="center"
         >
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentStatus | paymentStatus }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="学员状态" prop="studentStatus" align="center">
-          <template slot-scope="scope">
-            <div>
-              {{ scope.row.studentStatus | musicGroupStudentType }}
+              <p>{{ scope.row.paymentStatus | paymentStatus }}</p>
+              <p>{{ scope.row.payingStatus | filtersPayingStatus }}</p>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="订单状态" prop="payingStatus" align="center">
+
+        <!-- <el-table-column label="订单状态" prop="payingStatus" align="center">
           <template slot-scope="scope">
             <div>
               {{ scope.row.payingStatus | filtersPayingStatus }}
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-          label="是否购买云教练"
-          fixed="right"
+          label="是否购买会员"
           prop="hasCloudTeacher"
           align="center"
         >
@@ -606,7 +696,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           label="解除限制"
           fixed="right"
           prop="noneNeedCloudTeacher"
@@ -629,7 +719,7 @@
               {{ scope.row.noneNeedCloudTeacher == 1 ? "是" : "否" }}
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="备注" prop="remark" align="center">
           <template slot-scope="scope">
             <div>
@@ -637,11 +727,10 @@
             </div>
           </template>
         </el-table-column>
-        {{ status }}
+        <!-- {{ status }} -->
         <el-table-column
           label="操作"
-          fixed="right"
-          width="240"
+          width="200px"
           align="center"
           v-if="
             status == 'PAY' ||
@@ -1985,6 +2074,22 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.courseYellow {
+  color: #ff802c;
+}
+.hiddenwrap {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  p {
+    font-size: 14px;
+    color: #606266;
+    line-height: 40px;
+    padding: 0 12px 0 0;
+    box-sizing: border-box;
+    font-weight: 700;
+  }
+}
 .auth {
   display: inline-block;
   & + .auth {
@@ -2153,4 +2258,7 @@ export default {
 /deep/.description-label {
   white-space: normal !important;
 }
+.left {
+  text-align: left;
+}
 </style>