05/29 11:27

111

dist/static/css/chunk-d9b8b59a.9d5f2fdd.css → dist/static/css/chunk-1267dc6c.fb38bcd4.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.infoMsg[data-v-f7fdd166]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-f7fdd166]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-f7fdd166]{font-size:20px}.infoMsg .left[data-v-f7fdd166]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-f7fdd166],.infoMsg .right[data-v-f7fdd166]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-f7fdd166]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-f7fdd166]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-f7fdd166]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-f7fdd166]{width:300px}.wrap[data-v-f7fdd166]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-f7fdd166]{margin-right:20px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.infoMsg[data-v-8c971d98]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-8c971d98]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-8c971d98]{font-size:20px}.infoMsg .left[data-v-8c971d98]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-8c971d98],.infoMsg .right[data-v-8c971d98]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-8c971d98]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-8c971d98]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-8c971d98]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-8c971d98]{width:300px}.wrap[data-v-8c971d98]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-8c971d98]{margin-right:20px}

dist/static/css/chunk-a8c20a76.9453b54e.css → dist/static/css/chunk-5bdaf900.c77e1c2a.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-5e674067]{position:absolute;top:3px;right:2px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-4492435c]{position:absolute;top:3px;right:2px}

src/views/operateManager/serverIndexList.vue

@@ -172,7 +172,8 @@
                        class="micon el-tooltip"
                        style="width:8px height:8px"
                        alt /> -->
-                  <i class="el-icon-question" style="font-size: 18px; color: #F56C6C"></i>
+                  <i class="el-icon-question"
+                     style="font-size: 18px; color: #F56C6C"></i>
                 </el-tooltip>
               </p>
 
@@ -215,6 +216,12 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           label="作业提交时间">
+            <template slot-scope="scope">
+              <div>{{scope.row.lastSubmitTime}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
                            label="操作">
             <!--  -->
             <template slot-scope="scope">

src/views/recodeManager/recodeList.vue

@@ -170,7 +170,13 @@ import load from "@/utils/loading";
 import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
 import { queryTeacherAttendances } from "@/api/recodeManager";
 import { courseType } from '@/utils/searchArray'
-
+let nowTime = new Date();
+nowTime =
+  nowTime.getFullYear() +
+  "-" +
+  (nowTime.getMonth() + 1) +
+  "-" +
+  nowTime.getDate();
 export default {
   components: { pagination },
   data () {
@@ -181,7 +187,7 @@ export default {
         signInStatus: null,
         signOutStatus: null
       },
-      courseTime: [],
+      courseTime: [nowTime, nowTime],
       courseType,
       // teacherList: [],
       tableList: [],
@@ -228,8 +234,8 @@ export default {
         obj.courseStartDate = this.courseTime[0]
         obj.courseEndDate = this.courseTime[1]
       } else {
-        obj.courseStartDate = null
-        obj.courseEndDate = null
+        this.$message.error('请选择搜索时间')
+        return
       }
       queryTeacherAttendances(obj).then(res => {
         if (res.code == 200) {
@@ -249,7 +255,7 @@ export default {
         signInStatus: null,
         signOutStatus: null
       }
-      this.courseTime = [];
+      this.courseTime = [nowTime, nowTime];
       this.$refs['searchForm'].resetFields();
       this.search()
     }

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -419,13 +419,6 @@ export default {
       }
       this.search()
     },
-
-    startPay () {
-      if (this.activeChiose.length < 1) {
-        this.$message.error('请至少选择一名学生')
-        return
-      }
-    },
     resetPay () {
       // this.activeRow = row;
       if (this.activeChiose.length < 1) {
@@ -463,7 +456,7 @@ export default {
       // console.log(ids)
       openMusicGroupPaymentCalenderDetailPayment({ ids }).then(res => {
         if (res.code == 200) {
-          this.$message.success('开启成功')
+          this.$message.error(res.msg)
           this.getList();
         }
       })

src/views/teamBuild/signupList.vue

@@ -332,6 +332,7 @@
                :visible.sync="paymentStatus"
                width="400px">
       <el-form ref="paymentForm"
+               class="paymentForm"
                :model="paymentForm"
                label-position="top"
                :rules="paymentRules">
@@ -344,13 +345,14 @@
                           placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="缴费类型"
-                      :rules="[{ required: true, message: '请选择缴费类型'}]"
+        <el-form-item label="是否排乐团网管课"
+                      :rules="[{ required: true, message: '请选择是否排乐团网管课'}]"
                       prop="feeType">
-          <el-select v-model="paymentForm.feeType">
-            <el-option label="线上"
+          <el-select v-model="paymentForm.feeType"
+                     style="width: 100%!imoprtant">
+            <el-option label="需要排线上课"
                        value="ONLINE"></el-option>
-            <el-option label="线下"
+            <el-option label="只排线下课"
                        value="OFFLINE"></el-option>
           </el-select>
         </el-form-item>
@@ -1041,4 +1043,10 @@ export default {
 /deep/.el-button--danger {
   background: #f85043;
 }
+.paymentForm {
+  /deep/.el-input__inner,
+  /deep/.el-input.el-input--suffix {
+    width: 360px !important;
+  }
+}
 </style>