05/29 21111

111

dist/static/css/chunk-2df9d7d0.bc6d040e.css

@@ -1 +0,0 @@
-.floor[data-v-5363ea01]{padding-right: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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-5363ea01]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-5363ea01],.floor .remove[data-v-5363ea01]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-5363ea01]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-5363ea01]{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}.studentMask .left[data-v-5363ea01]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-5363ea01]{margin-bottom:20px}.studentMask .left h4[data-v-5363ea01]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-5363ea01]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-5363ea01]{padding-left:10px;line-height:25px}.studentMask .right[data-v-5363ea01]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-5363ea01]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-5363ea01] .el-date-editor.el-input,.resetClassForm[data-v-5363ea01] .el-date-editor.el-input__inner{width:180px!important}[data-v-5363ea01] .el-date-editor.el-input,[data-v-5363ea01] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-769d49db.6e8982c1.css

@@ -0,0 +1 @@
+.floor[data-v-3412ae3b]{padding-right: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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-3412ae3b]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-3412ae3b],.floor .remove[data-v-3412ae3b]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-3412ae3b]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-3412ae3b]{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}.studentMask .left[data-v-3412ae3b]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-3412ae3b]{margin-bottom:20px}.studentMask .left h4[data-v-3412ae3b]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-3412ae3b]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-3412ae3b]{padding-left:10px;line-height:25px}.studentMask .right[data-v-3412ae3b]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-3412ae3b]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-3412ae3b] .el-date-editor.el-input,.resetClassForm[data-v-3412ae3b] .el-date-editor.el-input__inner{width:180px!important}[data-v-3412ae3b] .el-date-editor.el-input,[data-v-3412ae3b] .el-date-editor.el-input__inner{width:100px!important}

src/views/teamDetail/components/resetClass.vue

@@ -541,42 +541,17 @@
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="声部"
-                      prop="subjectIdList"
-                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
-                      v-if="newClassForm.type =='HIGH' || newClassForm.type =='NORMAL'">
-          <el-select v-model.trim="newClassForm.subjectIdList"
+        <el-form-item label="主教老师"
+                      prop="bishop"
+                      :rules="[{ required: true, message: '请选择主教老师',trigger: 'blur'}]">
+          <el-select placeholder="请选择主教老师"
+                     v-model="newClassForm.bishop"
                      clearable
-                     multiple>
-            <el-option v-for="(item,index) in soundList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="声部"
-                      prop="subjectIdList"
-                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
-                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
-          <el-select v-model.trim="newClassForm.subjectIdList"
-                     clearable>
-            <el-option v-for="(item,index) in soundList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="可报名声部"
-                      prop="subjectIdList"
-                      :rules="[{ required: true, message: '请选择可报名声部',trigger: 'blur'}]"
-                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
-          <el-select v-model.trim="newClassForm.memo"
-                     multiple
-                     clearable>
-            <el-option v-for="(item,index) in soundList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="预计招生数"
@@ -597,19 +572,6 @@
           <el-input style="width:180px;"
                     v-model="newClassForm.expectStudentNum"></el-input>
         </el-form-item>
-        <el-form-item label="主教老师"
-                      prop="bishop"
-                      :rules="[{ required: true, message: '请选择主教老师',trigger: 'blur'}]">
-          <el-select placeholder="请选择主教老师"
-                     v-model="newClassForm.bishop"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in teacherList"
-                       :label="item.realName"
-                       :value="item.id"
-                       :key="index"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="助教老师"
                       v-if=" newClassForm.type != 'HIGH_ONLINE'"
                       prop="teaching">
@@ -625,6 +587,45 @@
                        :key="index"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="声部"
+                      prop="subjectIdList"
+                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
+                      v-if="newClassForm.type =='HIGH' || newClassForm.type =='NORMAL'">
+          <el-select v-model.trim="newClassForm.subjectIdList"
+                     clearable
+                     multiple>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="可报名声部"
+                      prop="subjectIdList"
+                      :rules="[{ required: true, message: '请选择可报名声部',trigger: 'blur'}]"
+                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
+          <el-select v-model.trim="newClassForm.memo"
+                     multiple
+                     clearable>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="声部"
+                      prop="subjectIdList"
+                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
+                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
+          <el-select v-model.trim="newClassForm.subjectIdList"
+                     clearable>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
       </el-form>
       <div slot="footer"
            class="dialog-footer">
@@ -1475,7 +1476,7 @@ export default {
           }
           createClass(obj).then(res => {
             if (res.code == 200) {
-              this.$message.success("创建成功");
+              this.$message.success(res.msg);
               this.getList();
               this.newClassVisible = false;
             }

src/views/workBenchManager/requestProcessing.vue

@@ -132,6 +132,7 @@
                         prop="reason">
             <el-input type="textarea"
                       :rows="5"
+                      :disabled="visibleForm.statusEnum !='PENDING'"
                       v-model.trim="visibleForm.reason"></el-input>
           </el-form-item>
           <el-form-item label="处理意见"
@@ -139,11 +140,17 @@
                         prop="handingSuggestion">
             <el-input type="textarea"
                       :rows="5"
+                      :disabled="visibleForm.statusEnum !='PENDING'"
                       v-model.trim="visibleForm.handingSuggestion"></el-input>
           </el-form-item>
+          <el-form-item label="处理结果"
+                        v-if="visibleForm.statusEnum !='PENDING'">
+            {{visibleForm.statusEnum | statusEnum}}
+          </el-form-item>
         </el-form>
       </div>
-      <div slot="footer">
+      <div slot="footer"
+           v-if="visibleForm.statusEnum =='PENDING'">
         <el-button @click="subreset('DENIED')">拒绝</el-button>
         <el-button type="primary"
                    @click="subreset('AGREED')">同意</el-button>
@@ -313,8 +320,8 @@ export default {
             handingSuggestion: res.data.handingSuggestion,
             teacherId: res.data.teacherId,
             salarySettlementMonth: res.data.salarySettlementMonth,
-            statusEnum: null,
-            id: res.data.id
+            statusEnum: res.data.statusEnum,
+            id: res.data.id,
           };
 
           this.dialogVisible = true;