Browse Source

04/17 21:36

11
Xiao_Mo 5 years ago
parent
commit
8020a8a60a

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-7437d5f8.2b1a8055.css → dist/static/css/chunk-5b71ee2d.be05e4c0.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}.red[data-v-1d037c4f]{color:red}.visibleForm[data-v-1d037c4f] .el-input__inner,.visibleForm[data-v-1d037c4f] .el-textarea__inner{width:225px!important}
+.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}.red[data-v-06773983]{color:red}.visibleForm[data-v-06773983] .el-input__inner,.visibleForm[data-v-06773983] .el-textarea__inner{width:225px!important}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0f75279a.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-01894b84.5de09cd6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-01894b84.63cc8578.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0558a7bf.493b11fd.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-09753c97.eb105529.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-09753c97.efe38113.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-40e665d1.eee04c9d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-4525310e.72b37af4.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-49f1f558.6a3e7606.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-49f1f558.b62cb05f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-5b71ee2d.95bb9bbc.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6181ddae.221e9739.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6cb6556b.bc006347.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7437d5f8.68329b84.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-98ae4e4a.c94965a0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ac13cdcc.7cfbe992.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-ac13cdcc.a5203f72.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bc672cf4.7a518794.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bc672cf4.f1ddac05.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-edcf4054.a04b0ef6.js


+ 8 - 1
src/utils/searchArray.js

@@ -15,6 +15,12 @@ const courseType = [
   { label: "课堂课", value: "CLASSROOM" },
   { label: "对外课", value: "COMM" }
 ]
+const courseListType = [
+  { label: "乐团课", value: "MUSIC" },
+  { label: "VIP课", value: "VIP" },
+  { label: "网管课", value: "PRACTICE" },
+  
+]
 
 // 考勤状态
 const attendance = [
@@ -127,5 +133,6 @@ export {
   courseStatus,
   teacherTimeStatus,
   courseGroupStatus,
-  commGroupStatus
+  commGroupStatus,
+  courseListType
 }

+ 3 - 3
src/views/workBenchManager/classFeesIsOk.vue

@@ -143,7 +143,7 @@
               <p
                 :class="scope.row.signOutStatus == 1?'':'red'"
               >{{scope.row.signOutStatus | attendanceOutType}}</p>
-              <p class="red" v-if="!scope.row.signOutStatus&&scope.row.signOutStatus!=0">未签</p>
+              <p class="red" v-if="!scope.row.signOutStatus&&scope.row.signOutStatus!=0">未签退</p>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="expectSalary" label="应发课酬">
@@ -230,7 +230,7 @@ import {
   closeSalaryConfirm,
   teacherSalaryModifyLog
 } from "@/api/journal";
-import { courseType } from "@/utils/searchArray";
+import { courseListType } from "@/utils/searchArray";
 export default {
   components: { pagination },
   data() {
@@ -259,7 +259,7 @@ export default {
       teacherList: [],
       tableList: [],
       organList: [],
-      groupTypeList: courseType,
+      groupTypeList: courseListType,
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数

Some files were not shown because too many files changed in this diff