Merge branch 'Inspection' into online

src/components/remote-search/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-select
+      v-bind="{...$attrs}"
       :value="value"
       filterable
       remote

src/views/main/api.js

@@ -85,7 +85,7 @@ export const inspectionGetInfo = data => request2({
 // 巡查任务列表
 export const inspectionQueryPage = data => request2({
   url: '/api-web/inspection/queryPage',
-  data: data,
+  params: data,
   method: 'get',
 })
 

src/views/main/schedule-branch/index.vue

@@ -17,18 +17,7 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="organIds">
-        <el-select
-          v-model.trim="search.teacherIdList"
-          clearable
-          filterable
-          placeholder="请选择老师"
-        >
-          <el-option v-for="(item, index) in selects.teachers"
-            :key="index"
-            :value="item.id"
-            :label="item.realName"
-          ></el-option>
-        </el-select>
+        <remote-search :commit='"setTeachers"' :collapse-tags="true"  v-model='search.teacherIdList' :multiple="true" />
       </el-form-item>
       <el-form-item prop="month">
         <el-date-picker
@@ -130,6 +119,7 @@ import view from './modals/view'
 import View from './modals/view.vue';
 const initSearch = {
   organIds: [],
+  teacherIdList: [],
   month: '',
 }
 export default {
@@ -193,6 +183,9 @@ export default {
       try {
         const res = await inspectionQueryPage({
           ...this.search,
+          organIds: this.search.organIds.join(','),
+          teacherIdList: this.search.teacherIdList.join(','),
+          month: this.search.month ? this.$helpers.dayjs(this.search.month).format('YYYY-MM') : undefined,
           page: this.rules.page,
           rows: this.rules.limit,
         })

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

@@ -173,7 +173,9 @@ export default {
             rows: 999
           })
           this.technicians = res.data
-          this.$set(this.form, 'group', this.form.group.map(item => ({...item, userId: ''})))
+          if (this.isCreate) {
+            this.$set(this.form, 'group', this.form.group.map(item => ({...item, userId: ''})))
+          }
         } catch (error) {}
       }
     }