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

src/main.js

@@ -45,7 +45,7 @@ class DonMessage {
 
 // 修改默认属性 
 ElementUI.Dialog.props.closeOnClickModal.default = false;
-ElementUI.Dialog.props.destroyOnClose.default = true;
+// ElementUI.Dialog.props.destroyOnClose.default = true;
 Vue.use(ElementUI)
 // 命名根据需要，DonMessage只是在文章中使用
 Vue.prototype.$message = new DonMessage()

src/views/sporadicManager/sporadicList.vue

@@ -209,8 +209,8 @@
                      :disabled='!isNew || !maskForm.organId'
                      clearable
                      filterable>
-            <el-option v-for='(item,index) in maskMusicList'
-                       :key="index"
+            <el-option v-for='item in maskMusicList'
+                       :key="item.musicGroupId"
                        :value="item.musicGroupId"
                        :label="item.musicGroupName"></el-option>
           </el-select>
@@ -555,6 +555,7 @@ export default {
       maskForm.money = row.amount
       maskForm.subMoney = row.discountAmount
       maskForm.musicGroupId = row.musicGroupId ? row.musicGroupId : null
+      this.$refs['maskForm'].clearValidate()
       if(row.userId) {
         queryUserMusicInfos({ userId: row.userId }).then(studentInfo => {
           if(studentInfo.code == 200) {
@@ -567,7 +568,6 @@ export default {
     },
     onMusicGroupChange(status) {
       let maskForm = this.maskForm
-      console.log(maskForm)
       if(!maskForm.organId) {
         return
       }

src/views/studentManager/components/studentOrder.vue

@@ -136,82 +136,86 @@
     </div>
     <el-dialog title="交易明细"
                width="850px"
-               :visible.sync="cashAccount.status">
-      <el-tabs v-model="activeName"
+               :visible.sync="cashStatus">
+      <el-row>
+        <el-col :span="24">
+          <el-tabs v-model="activeName"
                type="border-card">
-        <el-tab-pane label="账户余额明细"
-                     name="first">
-          <el-table :data="cashAccount.gridData">
-            <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
-            <el-table-column align="center"
-                             property="amount"
-                             label="交易金额"></el-table-column>
-            <el-table-column align="center"
-                             property="balance"
-                             label="账户可用余额"></el-table-column>
-            <el-table-column align="center"
-                             label="交易状态">
-              <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
-            </el-table-column>
-            <el-table-column align="center"
-                             label="交易类型">
-              <template slot-scope="scope">{{ scope.row.type | payType }}</template>
-            </el-table-column>
-            <el-table-column align="center"
-                             width="160px"
-                             property="createTime"
-                             label="交易时间"></el-table-column>
-            <el-table-column align="center"
-                             width="140px"
-                             label="备注">
-              <template slot-scope="scope">
-                <span :title="scope.row.comment">{{ scope.row.comment }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination :total="cashAccount.total"
-                      :page.sync="cashAccount.page"
-                      :limit.sync="cashAccount.limit"
-                      :page-sizes="cashAccount.page_size"
-                      @pagination="getCashAccount" />
-        </el-tab-pane>
-        <el-tab-pane label="课程余额明细"
-                     name="second">
-          <el-table :data="courseAccount.gridData">
-            <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
-            <el-table-column align="center"
-                             property="amount"
-                             label="交易金额"></el-table-column>
-            <el-table-column align="center"
-                             property="balance"
-                             label="课程可用余额"></el-table-column>
-            <el-table-column align="center"
-                             label="交易状态">
-              <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
-            </el-table-column>
-            <el-table-column align="center"
-                             label="交易类型">
-              <template slot-scope="scope">{{ scope.row.type | payType }}</template>
-            </el-table-column>
-            <el-table-column align="center"
-                             width="160px"
-                             property="createTime"
-                             label="交易时间"></el-table-column>
-            <el-table-column align="center"
-                             width="140px"
-                             label="备注">
-              <template slot-scope="scope">
-                <span :title="scope.row.comment">{{ scope.row.comment }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination :total="courseAccount.total"
-                      :page.sync="courseAccount.page"
-                      :limit.sync="courseAccount.limit"
-                      :page-sizes="courseAccount.page_size"
-                      @pagination="getCourseAccount" />
-        </el-tab-pane>
-      </el-tabs>
+            <el-tab-pane label="账户余额明细"
+                        name="first">
+              <el-table :data="cashAccount.gridData">
+                <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
+                <el-table-column align="center"
+                                property="amount"
+                                label="交易金额"></el-table-column>
+                <el-table-column align="center"
+                                property="balance"
+                                label="账户可用余额"></el-table-column>
+                <el-table-column align="center"
+                                label="交易状态">
+                  <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
+                </el-table-column>
+                <el-table-column align="center"
+                                label="交易类型">
+                  <template slot-scope="scope">{{ scope.row.type | payType }}</template>
+                </el-table-column>
+                <el-table-column align="center"
+                                width="160px"
+                                property="createTime"
+                                label="交易时间"></el-table-column>
+                <el-table-column align="center"
+                                width="140px"
+                                label="备注">
+                  <template slot-scope="scope">
+                    <span :title="scope.row.comment">{{ scope.row.comment }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination :total="cashAccount.total"
+                          :page.sync="cashAccount.page"
+                          :limit.sync="cashAccount.limit"
+                          :page-sizes="cashAccount.page_size"
+                          @pagination="getCashAccount" />
+            </el-tab-pane>
+            <el-tab-pane label="课程余额明细"
+                        name="second">
+              <el-table :data="courseAccount.gridData">
+                <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
+                <el-table-column align="center"
+                                property="amount"
+                                label="交易金额"></el-table-column>
+                <el-table-column align="center"
+                                property="balance"
+                                label="课程可用余额"></el-table-column>
+                <el-table-column align="center"
+                                label="交易状态">
+                  <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
+                </el-table-column>
+                <el-table-column align="center"
+                                label="交易类型">
+                  <template slot-scope="scope">{{ scope.row.type | payType }}</template>
+                </el-table-column>
+                <el-table-column align="center"
+                                width="160px"
+                                property="createTime"
+                                label="交易时间"></el-table-column>
+                <el-table-column align="center"
+                                width="140px"
+                                label="备注">
+                  <template slot-scope="scope">
+                    <span :title="scope.row.comment">{{ scope.row.comment }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination :total="courseAccount.total"
+                          :page.sync="courseAccount.page"
+                          :limit.sync="courseAccount.limit"
+                          :page-sizes="courseAccount.page_size"
+                          @pagination="getCourseAccount" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+      </el-row>
     </el-dialog>
     <el-dialog :title="moneyForm.title"
                width="450px"
@@ -346,6 +350,7 @@ export default {
         money: [{ required: true, validator: validPrice, trigger: "blur" }],
         remark: [{ required: true, message: "请输入备注", trigger: "blur" }]
       },
+      cashStatus: false,
       cashAccount: {
         // 点名表
         status: false,
@@ -419,6 +424,7 @@ export default {
       this.getCashAccount();
       this.courseAccount.page = 1;
       this.getCourseAccount();
+      this.cashStatus = true
     },
     getCashAccount () {
       let cashAccount = this.cashAccount;

src/views/teamDetail/components/courseList.vue

@@ -327,7 +327,7 @@
     </el-dialog>
 
     <el-dialog title="点名表"
-               width="700px"
+               width="800px"
                :visible.sync="rollCall.status">
       <el-table :data="rollCall.gridData">
         <el-table-column align="center"
@@ -345,7 +345,7 @@
         </el-table-column>
         <el-table-column align="center"
                          label="操作"
-                         width="220px">
+                         width="240px">
           <template slot-scope="scope">
             <el-button size="small"
                        @click="onChangeRollCall('TRUANT', scope.row)"

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -262,7 +262,7 @@
     </el-dialog>
 
     <el-dialog title='点名表'
-               width="700px"
+               width="800px"
                :visible.sync="rollCall.status">
       <el-table :data="rollCall.gridData">
         <el-table-column align='center'
@@ -282,7 +282,7 @@
         </el-table-column>
         <el-table-column align='center'
                          label="操作"
-                         width="220px">
+                         width="240px">
           <template slot-scope="scope">
             <el-button size="small"
                        @click="onChangeRollCall('TRUANT', scope.row)"