Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

dist/static/css/chunk-2fda3585.a290a1b0.css

@@ -0,0 +1 @@
+.alert[data-v-4eab260a]{margin:10px 0}.dialog-footer[data-v-8fedc242]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-79ab2156],.el-button--primary[data-v-79ab2156]:active,.el-button--primary[data-v-79ab2156]:focus,.el-button--primary[data-v-79ab2156]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-79ab2156] .el-date-editor.el-input,[data-v-79ab2156] .el-select{width:100%!important}[data-v-79ab2156] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-79ab2156] .el-dialog__body{padding:10px 20px}.newBand[data-v-79ab2156]{display:inline-block}

src/views/categroyManager/specialSetup/discountManage.vue

@@ -65,11 +65,11 @@
                            label="操作">
             <template slot-scope="scope">
               <el-button @click="openTypes('update', scope.row)"
-                         v-permission="'chargeType/upSet'"
+                         v-permission="'chargeTypeSubjectMapper/update'"
                          type="text">修改</el-button>
-              <el-button @click="onTypesDel(scope.row)"
-                         v-permission="'chargeType/del'"
-                         type="text">删除</el-button>
+              <!-- <el-button @click="onTypesDel(scope.row)"
+                         v-permission="'chargeTypeSubjectMapper/del'"
+                         type="text">删除</el-button> -->
             </template>
           </el-table-column>
         </el-table>
@@ -92,6 +92,7 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.chargeTypeId"
                      filterable
+                     disabled
                      placeholder="请选择收费类型"
                      clearable>
             <el-option v-for="item in typesList"
@@ -107,6 +108,7 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.subjectId"
                      filterable
+                      disabled
                      placeholder="请选择声部组合"
                      clearable>
             <el-option-group v-for="group in subjectList"

src/views/resetTeaming/modals/review-detail.vue

@@ -24,7 +24,11 @@
       <descriptions-item label="订单类型：">{{
         auditDto.payUserType | payUserTypeFormat
       }}</descriptions-item>
-      <descriptions-item label="学员数量：">{{ studentNum }}</descriptions-item>
+      <descriptions-item label="学员数量：">
+        <span>{{ studentNum }} <el-link v-if="studentNum > 0"
+                   type="primary"
+                   @click="payVisible = true">查看学员</el-link></span>
+      </descriptions-item>
     </descriptions>
     <el-alert title="课程信息"
               :closable="false"
@@ -78,6 +82,31 @@
       <descriptions-item label="缴费有效期：">{{ auditDto.paymentValidStartDate }} -
         {{ auditDto.paymentValidEndDate }}</descriptions-item>
     </descriptions>
+    <el-dialog :visible.sync="payVisible"
+               :close-on-click-modal="false"
+               append-to-body
+               width="600px"
+               title="查看学员">
+      <el-table :data="simpleUserDto">
+        <el-table-column prop="userName"
+                         label="姓名"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="subjectNames"
+                         label="声部"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="phone"
+                         label="手机号"
+                         width="180">
+        </el-table-column>
+      </el-table>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button type="primary"
+                   @click="payVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -95,6 +124,7 @@ export default {
   props: ["detail"],
   data () {
     return {
+      payVisible: false,
       ...initData,
     };
   },