修改问题

dist/static/css/chunk-385d1d9e.3956bf6b.css → dist/static/css/chunk-377484c0.03972dfb.css

@@ -1 +1 @@
-.el-button--primary[data-v-69869838],.el-button--primary[data-v-69869838]:active,.el-button--primary[data-v-69869838]:focus,.el-button--primary[data-v-69869838]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-69869838] .el-date-editor.el-input,[data-v-69869838] .el-select{width:100%!important}[data-v-69869838] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-69869838]{margin-top:20px;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}.infoWrap .left[data-v-69869838]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-69869838]{margin-bottom:20px}.infoWrap .right[data-v-69869838]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-69869838]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-69869838]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}
+.el-button--primary[data-v-32cca616],.el-button--primary[data-v-32cca616]:active,.el-button--primary[data-v-32cca616]:focus,.el-button--primary[data-v-32cca616]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-32cca616] .el-date-editor.el-input,[data-v-32cca616] .el-select{width:100%!important}[data-v-32cca616] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-32cca616]{margin-top:20px;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}.infoWrap .left[data-v-32cca616]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-32cca616]{margin-bottom:20px}.infoWrap .right[data-v-32cca616]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-32cca616]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-32cca616]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

src/utils/searchArray.js

@@ -40,7 +40,7 @@ const attendanceStatus = [
   { value: "TRUANT", label: "旷课" },
   { value: "LEAVE", label: "请假" },
   { value: "QUIT_SCHOOL", label: "退学" },
-  { value: "DROP_OUT", label: "休学" }
+  // { value: "DROP_OUT", label: "休学" }
 ]
 
 // 交易状态
@@ -64,7 +64,7 @@ const musicGroupStatus = [
   { value: 'PAY', text: '缴费中' },
   { value: 'PREPARE', text: '筹备中' },
   { value: 'PROGRESS', text: '进行中' },
-  { value: 'PAUSE', text: '已结束' },
+  { value: 'PAUSE', text: '暂停' },
   { value: 'DRAFT', text: '编辑中' },
   { value: 'AUDIT', text: '审核中' },
   { value: 'AUDIT_FAILED', text: '审核失败' },

src/views/studentManager/components/studentRecord.vue

@@ -130,7 +130,6 @@ export default {
         { value: "NORMAL", label: "正常" },
         { value: "TRUANT", label: "旷课" },
         { value: "LEAVE", label: "请假" },
-        { value: "DROP_OUT", label: "休学" },
       ],
       pageInfo: {
         // 分页规则

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -48,7 +48,7 @@
     <div class="tableWrap">
       <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="上课时间">
+        <el-table-column label="上课时间" width="200">
           <template slot-scope="scope">
             {{ scope.row.classDate + ' ' + scope.row.classTime }}
           </template>

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -386,7 +386,7 @@ export default {
     onSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.topForm.flowOrganRange = this.topForm.flowOrganRange.join(',')
+          this.topForm.flowOrganRange = this.topForm.flowOrganRange ? this.topForm.flowOrganRange.join(',') : null
           this.topForm.subjectId = this.topForm.subjectIds.join(',')
           if (this.pageType == 'update') {
             this.topForm.id = this.teacherId