Merge branch 'online' into LAO_MO

src/views/resetTeaming/components/resetSound.vue

@@ -108,6 +108,7 @@
                        align="center"
                        prop="jiaopu">
         <template slot-scope="scope">
+          <!-- item.name && -->
           <div>
             <el-dialog :visible.sync="scope.row.markVisible"
                        style="text-align:left;"
@@ -159,8 +160,8 @@
             </el-dialog>
             <span>
               <span v-for='(item,index) in scope.row.markList'
-                    v-if="item.name && scope.row.markChioseList.length>0"
-                    :key='index'>{{item.name+':'}}{{item.goods|goodsFilter(scope.row.markChioseList)}}{{' 价格 '+item.price }} </span>
+                    v-if=" scope.row.markChioseList.length>0"
+                    :key='index'>{{item.name?item.name+':':''}}{{item.goods|goodsFilter(scope.row.markChioseList)}}{{' 价格 '+item.price }} </span>
             </span>
             <i class='el-icon-edit'
                slot='reference'

src/views/teamBuild/components/teamSoundMoney.vue

@@ -96,8 +96,7 @@
             <div>
               <!-- <div class="chiose" white-space:pre;
               >选择</div>-->
-              <div style="width:300px"
-                   v-if="scope.row.fangshi.length >0">{{scope.row.fangshi | fangshiFilter(scope.row)}}</div>
+              <div v-if="scope.row.fangshi.length >0">{{scope.row.fangshi | fangshiFilter(scope.row)}}</div>
               <i class="el-icon-edit"
                  @click="setGiveMode(scope.row)"></i>
             </div>
@@ -156,9 +155,10 @@
                 </span>
               </el-dialog>
               <span>
-                <span v-if="scope.row.markChioseList.length>0&&item.name"
+                <!-- &&item.name -->
+                <span v-if="scope.row.markChioseList.length>0"
                       v-for="(item,index) in scope.row.markList"
-                      :key="index">{{item.name+':'}}{{item.goods|goodsFilter(scope.row.markChioseList)}}{{' 价格 '+item.price }}</span>
+                      :key="index">{{item.name?item.name+':':''}}{{item.goods|goodsFilter(scope.row.markChioseList)}}{{' 价格 '+item.price }}</span>
               </span>
               <i class="el-icon-edit"
                  slot="reference"

src/views/teamBuild/signupList.vue

@@ -16,21 +16,21 @@
           <div class='newBand'
                @click="payStart"
                v-permission="'musicGroup/openPay'"
-               v-if="status=='APPLY'">开始缴费</div>
-          <!-- v-if="status=='PAY'" -->
+               v-show="status=='APPLY'">开始缴费</div>
+          <!-- v-show="status=='PAY'" -->
           <div class='newBand'
                v-permission="'musicGroup/found'"
                @click="onGoHome">确认开团</div>
           <div class='newBand'
                v-permission="'musicGroup/extensionPayment'"
                @click="extendPaymentStatus = true"
-               v-if="status=='PAY'">延长缴费</div>
+               v-show="status=='PAY'">延长缴费</div>
           <div class='newBand'
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
           <div class='newBand'
-               v-if="rightList.length > 0"
+               v-show="rightList.length > 0"
                v-permission="'studentRegistration/queryStudentApplyDetailExport'"
                @click='onDownLoadExecl'>报表导出</div>
         </div>
@@ -92,9 +92,9 @@
                            align='center'>
             <template slot-scope="scope">
               <div>
-                <p v-if="!isEdit">{{ scope.row.expectedStudentNum }}</p>
+                <p v-show="!isEdit">{{ scope.row.expectedStudentNum }}</p>
 
-                <el-input v-if="isEdit"
+                <el-input v-show="isEdit"
                           v-model.trim="scope.row.expectedStudentNum"></el-input>
 
               </div>
@@ -112,9 +112,9 @@
         <div class="btnWrap"
              v-permission="'musicGroup/updateExpectedStudentNum'"
              style="margin-right:20px; margin-top:20px;">
-          <el-button v-if="!isEdit"
+          <el-button v-show="!isEdit"
                      @click="isEdit = true">编辑</el-button>
-          <el-button v-if="isEdit"
+          <el-button v-show="isEdit"
                      @click="saveIsEdit">保存</el-button>
         </div>
       </div>
@@ -172,7 +172,7 @@
                            prop="parentsPhone"
                            align='center'>
           </el-table-column>
-          <!-- v-if='status == "PAY"' -->
+          <!-- v-show='status == "PAY"' -->
           <el-table-column label="学员状态"
                            fixed='right'
                            prop="paymentStatus"
@@ -191,10 +191,10 @@
               <div>
                 <el-button type='text'
                            v-permission="'studentRegistration/batchUpdateSubject'"
-                           v-if="scope.row.paymentStatus != 2"
+                           v-show="scope.row.paymentStatus != 2"
                            @click='resetSubject(scope.row)'>修改专业</el-button>
                 <!-- APPLY  status == "APPLY" || s-->
-                <el-popover v-if='scope.row.remark'
+                <el-popover v-show='scope.row.remark'
                             placement="top-start"
                             title="备注"
                             width="200"
@@ -207,20 +207,20 @@
                 <!-- &&  status == "PAY"-->
                 <el-button type='text'
                            v-permission="'studentRegistration/queryFeeDetail'"
-                           v-if='scope.row.paymentStatus==2'
+                           v-show='scope.row.paymentStatus==2'
                            @click='lookdetail(scope.row)'>查看</el-button>
                 <el-button type='text'
                            v-permission="'musicGroupQuit/directQuitMusicGroup2'"
-                           v-if='scope.row.paymentStatus==2'
+                           v-show='scope.row.paymentStatus==2'
                            @click='quitTeam(scope.row)'>退团</el-button>
                 <el-button type="text"
-                           v-if="permission('musicGroupQuit/directQuitMusicGroup3')&&scope.row.paymentStatus==2"
+                           v-show="permission('musicGroupQuit/directQuitMusicGroup3')&&scope.row.paymentStatus==2"
                            @click="quieTeams(scope.row)">退团不退费</el-button>
                 <el-button type="text"
-                           v-if="permission('visit/add')"
+                           v-show="permission('visit/add')"
                            @click="addVisit(scope.row)">新增回访</el-button>
                 <el-button type="text"
-                           v-if="scope.row.paymentStatus==2"
+                           v-show="scope.row.paymentStatus==2"
                            v-permission="'subjectChange/getStudentOriginal'"
                            @click="openChangeVoice(scope.row)">更改声部</el-button>
               </div>
@@ -228,13 +228,13 @@
           </el-table-column>
         </el-table>
         <div style="margin-top: 10px; margin-bottom: 10px;"
-             v-if="status=='APPLY'">
+             v-show="status=='APPLY'">
           <el-button @click="onSelectAll">全选/取消</el-button>
           <el-button style="background-color: #14928a;border: 1px solid #14928a;"
                      @click="onPartPayment"
                      v-permission="'studentRegistration/openPayment'"
                      type="primary">提前缴费</el-button>
-          <!-- <div class='newBand' v-if="status=='APPLY'">允许缴费</div> -->
+          <!-- <div class='newBand' v-show="status=='APPLY'">允许缴费</div> -->
         </div>
         <pagination :total="rules.total"
                     :page.sync="rules.page"
@@ -394,7 +394,7 @@
              class="qrcode code"
              ref="qrCodeUrl"></div>
         <p class="code-url"
-           v-if="codeUrl">{{ codeUrl }}</p>
+           v-show="codeUrl">{{ codeUrl }}</p>
       </div>
     </el-dialog>
     <el-dialog title="缴费详情二维码"
@@ -406,7 +406,7 @@
              class="qrcode code"
              ref="qrCodeUrl"></div>
         <p class="code-url"
-           v-if="codeUrl2">{{ codeUrl2 }}</p>
+           v-show="codeUrl2">{{ codeUrl2 }}</p>
       </div>
     </el-dialog>