Merge branch 'Inspection' into online

src/views/main/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" searchKey="ids" @reload="getList"/>
+      <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" searchKey="ids" @reload="reloadItem"/>
     </h2>
     <div class="m-core">
       <tab-router v-permission="'newIndex'">
@@ -15,7 +15,7 @@
           <reminders/>
         </el-tab-pane>
         <el-tab-pane lazy label="【乐团主管】日程安排" name="teamSchedule">
-          <teamSchedule />
+          <teamSchedule ref="teamSchedule" />
         </el-tab-pane>
         <el-tab-pane lazy label="【分部经理】日程安排" name="ScheduleBranch">
           <ScheduleBranch/>
@@ -69,6 +69,9 @@ export default {
           this.dataInfo = Object.assign(res.data, tempDate)
         }
       })
+    },
+    reloadItem() {
+      this.$refs.teamSchedule.getList()
     }
   }
 }

src/views/main/schedule-branch/modals/create.vue

@@ -54,8 +54,8 @@
               <el-option v-for="(item,index) in technicians"
                 :key="index"
                 :label="item.realName"
-                :disabled="form.group.map(m => m.userId).includes(item.userId)"
-                :value="item.userId"></el-option>
+                :disabled="form.group.map(m => m.userId).includes(item.id)"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,7 +172,7 @@ export default {
             organId: this.form.organId,
             rows: 999
           })
-          this.technicians = res.data
+          this.technicians = res.data.rows
           this.$set(this.form, 'group', group.map(item => ({...item, userId: ''})))
         } catch (error) {}
       }