修改网管课

src/constant/index.js

@@ -45,8 +45,6 @@ export const courseType = {
   COMM: '对外课',
 }
 
-
-
 export const boolOptions = {
   false: '否',
   true: '是',
@@ -177,4 +175,7 @@ export const classTime = {
   CLASSROOM:'40'
 }
 
-
+export const mergeType = {
+  合并课: '合并课',
+  被合并课: '被合并课',
+}

src/views/accompanyManager/accompanyList.vue

@@ -18,7 +18,6 @@
                class="searchForm"
                @submit="search"
                @reset="onReSet"
-               :save-key="saveKey"
                :model.sync="searchForm">
         <!-- 状态 指导老师 活动方案-->
         <el-form-item>
@@ -68,7 +67,7 @@
                      filterable
                      :filter-method="filterMethod"
                      placeholder="指导老师">
-            <el-option v-for="(item,index) in teacherList"
+            <el-option v-for="(item,index) in selects.teachers"
                        :key="index"
                        :value="item.id"
                        :label="item.realName"></el-option>
@@ -113,11 +112,19 @@
           <el-table-column align="center"
                            prop="id"
                            label="课程组编号"
-                           width="100"></el-table-column>
+                           width="100">
+                            <template slot-scope="scope">
+                              <copy-text>{{scope.row.id}}</copy-text>
+                            </template>
+                           </el-table-column>
           <el-table-column align="center"
                            prop="name"
                            label="课程组名称"
-                           width="100"></el-table-column>
+                           width="100">
+                           <template slot-scope="scope">
+                              <copy-text>{{scope.row.name}}</copy-text>
+                            </template>
+                          </el-table-column>
           <el-table-column align="center"
                            prop="type"
                            label="课程组类型"
@@ -197,11 +204,14 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           width="150"
+          <el-table-column width="150"
                            prop="memo"
                            label="备注"
-                           fixed="right"></el-table-column>
+                           fixed="right">
+                            <template slot-scope="scope">
+                              <overflow-text :text="scope.row.memo" width="150px"></overflow-text>
+                            </template>
+                           </el-table-column>
 
           <el-table-column align="center"
                            width="200"
@@ -330,24 +340,6 @@ export default {
       }
     };
   },
-  computed: {
-    saveKey() {
-      return this.$route.path + '/1'
-    }
-  },
-  created () {
-    // if (this.$route.query.searchForm) {
-    //   this.$route.query.searchForm instanceof Object
-    //     ? (this.searchForm = this.$route.query.searchForm)
-    //     : (this.searchForm = JSON.parse(this.$route.query.searchForm));
-    // }
-    // if (this.$route.query.rules) {
-    //   this.$route.query.rules instanceof Object
-    //     ? (this.rules = this.$route.query.rules)
-    //     : (this.rules = JSON.parse(this.$route.query.rules));
-    // }
-    // this.init();
-  },
   mounted () {
     if (this.$route.query.searchForm) {
       this.$route.query.searchForm instanceof Object
@@ -369,22 +361,11 @@ export default {
       this.teacherList = this.selects.teachers.filter(item => (item.realName || '').indexOf(inp) > -1).slice(0, 49)
     },
     init () {
-      // getEmployeeOrgan().then(res => {
-      //   if (res.code == 200) {
-      //     this.organList = res.data;
-      //   }
-      // });
       this.$store.dispatch('setBranchs')
       this.$store.dispatch('setTeachers')
         .then(() => {
           this.teacherList = [...this.selects.teachers].slice(0, 49)
         })
-      //   <!-- 状态 指导老师 活动方案-->
-      // getTeacher().then(res => {
-      //   if (res.code == 200) {
-      //     this.teacherList = res.data;
-      //   }
-      // });
       this.getList();
     },
     permission (str, parent) {