04/26 15:35

111

dist/static/css/chunk-4ae16bc6.18378e21.css → dist/static/css/chunk-8335a786.b38ed516.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}.titlewrap[data-v-e8c8e82c]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-e8c8e82c],.wrap[data-v-e8c8e82c]{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}.wrap div[data-v-e8c8e82c]{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}.titlewrap[data-v-709ff8c4]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-709ff8c4],.wrap[data-v-709ff8c4]{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}.wrap div[data-v-709ff8c4]{margin-right:20px}

src/views/accompanyManager/accompanyList.vue

@@ -213,7 +213,7 @@
       </div>
     </el-dialog>
     <el-dialog title="备注" width="400px" :visible.sync="memoVisible">
-      <el-input type="textarea" v-model.trim="memoForm.memo" :rows="7"></el-input>
+      <el-input type="textarea" v-model.trim="memoForm.memo" :rows="7" :maxlength="255" show-word-limit></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="memoVisible = false">取 消</el-button>
         <el-button type="primary" @click="subMemo">确 定</el-button>

src/views/accompanyManager/accompanys.vue

@@ -131,7 +131,7 @@
         label-width="80px;"
         :inline="true"
       >
-        <el-form-item label="上课日期" prop="date">
+        <el-form-item label="上课日期" prop="date" v-if="courseType != 'TRIAL'">
           <el-date-picker
             v-model.trim="maskForm.date"
             style="width:200px!important;"
@@ -140,6 +140,15 @@
             value-format="yyyy-MM-dd"
             placeholder="选择日期"
           ></el-date-picker>
+        </el-form-item v-else>
+            <el-form-item label="上课日期" prop="date">
+          <el-date-picker
+            v-model.trim="maskForm.date"
+            style="width:200px!important;"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-time-select
@@ -458,6 +467,7 @@ export default {
       this.practiceId = this.$route.query.id;
       this.userId = this.$route.query.userId;
       this.courseType = this.$route.query.type;
+      console.log( this.courseType)
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules;
       }

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

@@ -201,7 +201,6 @@
                   clearable
                   placeholder="专业技能" 
                   multiple
-                 
                 >
                     <el-option
                       v-for="item in subjectList"
@@ -477,13 +476,17 @@ export default {
             this.$message.error('请选择专业技能')
             return
           }
-          this.topForm.flowOrganRange = this.topForm.flowOrganRange
+          if(this.topForm.flowOrganRange instanceof Array){
+             this.topForm.flowOrganRange = this.topForm.flowOrganRange
             ? this.topForm.flowOrganRange.join(",")
             : null;
+          }
+         
           this.subjectId = this.subjectIds.join(",");
+           this.topForm.subjectId = this.subjectId
           if (this.pageType == "update") {
             this.topForm.id = this.teacherId;
-            this.topForm.subjectId = this.subjectId
+           
             teacherUpdate(this.topForm).then(res => {
               if (res.code == 200) {
                 // this.$emit('onTeacher')