云集老师绑定优化

src/components/coupon/index.vue

 <template>
   <div class="refund">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="100px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
           <el-form-item label="用户ID">
             <el-input v-model="searchFrom.user_id"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="订单号">
             <el-input v-model="searchFrom.out_trade_no"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="使用状态">
             <el-select v-model="searchFrom.status" placeholder="请选择" @change="getList" clearable>
               <el-option
@@ -23,13 +17,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" @click="getList">搜索</el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="list"

src/components/externalLaunch/index.vue

@@ -3,9 +3,7 @@
 */
 <template>
   <div class="index">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="80px">
-      <el-row>
-        <el-col :lg="10" :sm="24" :md="24">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item label="购买时间">
             <el-date-picker
               v-model="searchFrom.time"
@@ -16,28 +14,20 @@
               :default-time="['00:00:00','23:59:59']">
             </el-date-picker>
           </el-form-item>
-        </el-col>
-        <el-col :lg="4" :sm="24" :md="12">
           <el-form-item label="来源">
             <el-input v-model="searchFrom.source" placeholder="名称"
-                      size="small"></el-input>
+                     ></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :lg="4" :sm="24" :md="12">
           <el-form-item>
-            <el-button type="primary" plain size="small" @click="initPage">
+            <el-button type="primary" plain  @click="initPage">
               搜索
             </el-button>
           </el-form-item>
-        </el-col>
-        <el-col :lg="4" :sm="24" :md="12">
           <el-form-item>
-            <el-button type="primary" plain size="small" @click="doExport">
+            <el-button type="primary" plain  @click="doExport">
               导出
             </el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="tableData"

src/components/order/index.vue

 <template>
   <div class="order">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="100px">
-      <el-row>
-        <el-col :span="6">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
+    
           <el-form-item label="用户ID">
             <el-input v-model="searchFrom.user_id"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="用户昵称">
             <el-input v-model="searchFrom.nickname"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="收件人手机号">
             <el-input v-model="searchFrom.receive_mobile"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="商品名称">
             <el-select v-model="searchFrom.goods_id" placeholder="请选择" @change="getOrderList" clearable>
               <el-option
@@ -28,22 +21,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6">
           <el-form-item label="来源" class="test">
             <el-input v-model="searchFrom.invite_type	" :placeholder="inviteSearchPlaceholder">
               <template slot="prepend">CC -</template>
             </el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="添加推广人">
             <el-input v-model="searchFrom.invite_id" :placeholder="inviteSearchPlaceholder"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="购买方式">
             <el-select v-model="searchFrom.buy_type" placeholder="请选择" @change="getOrderList" clearable>
               <el-option
@@ -54,8 +39,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="订单状态">
             <el-select multiple v-model="searchFrom.status" placeholder="请选择" @change="getOrderList" clearable>
               <el-option
@@ -66,15 +49,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6">
           <el-form-item label="交易订单号">
             <el-input v-model="searchFrom.out_trade_no"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="购买时间">
             <el-date-picker
               v-model="searchFrom.payTime"
@@ -86,19 +63,13 @@
               @change="getOrderList">
             </el-date-picker>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item style="float: right">
+          <el-form-item >
             <el-button type="primary" plain @click="getOrderList">搜索</el-button>
             <el-button type="primary" plain @click="exportTable">导出</el-button>
           </el-form-item>
-        </el-col>
-         <el-col :span="3" :offset="3" v-if="!$store.state.readonly">
-          <el-form-item>
+          <el-form-item style="float:right">
             <!-- <el-button type="success" plain @click="add">新增订单</el-button> -->
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="tableData"

src/components/refund/index.vue

 <template>
   <div class="refund">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="100px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
           <el-form-item label="用户昵称">
             <el-input v-model="searchFrom.nickname"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="用户ID">
             <el-input v-model="searchFrom.user_id"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="订单编号">
             <el-input v-model="searchFrom.out_trade_no"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="退款状态">
             <el-select v-model="searchFrom.status" placeholder="请选择" @change="getRefundList" clearable>
               <el-option
@@ -28,14 +20,10 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button type="primary" @click="getRefundList">搜索</el-button>
             <el-button type="primary" plain @click="exportTable">导出</el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="list"

src/components/smsRecord/index.vue

 <template>
   <div class="sms">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="100px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
           <el-form-item label="类型">
-            <el-select v-model="searchFrom.type" placeholder="请选择" @change="getList">
-                 <el-option label="全部" value=""></el-option>
+            <el-select v-model="searchFrom.type" placeholder="请选择" @change="getList" clearable>
               <el-option
                 v-for="item in TypeList"
                 :key="item.status"
@@ -14,13 +11,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="手机号">
             <el-input v-model="searchFrom.mobile"  @change="getList"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="发送状态">
             <el-select v-model="searchFrom.status" placeholder="请选择" @change="getList" clearable>
               <el-option
@@ -31,13 +24,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" @click="getList">搜索</el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="list"

src/components/system/adminLog.vue

 <template>
   <div class="log">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="80px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item label="用户ID">
             <el-input v-model="searchFrom.admin_id"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="地址">
             <el-input v-model="searchFrom.url"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="功能名">
             <el-input v-model="searchFrom.desc"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" plain @click="getList">搜索</el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="list"
@@ -58,7 +48,6 @@
         label="功能名"
         prop="desc">
       </el-table-column>
-      </el-table-column>
       <el-table-column
         prop="created_at"
         label="创建时间" sortable>

src/components/teacher/index.vue

 <template>
   <div class="user">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="80px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item label="昵称">
             <el-input v-model="searchFrom.name"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="教师类型">
             <el-select v-model="searchFrom.type" placeholder="请选择" @change="getUser" clearable>
               <el-option
@@ -18,18 +14,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" plain @click="getUser">搜索</el-button>
           </el-form-item>
-        </el-col>
-        <el-col :span="4" :offset="8" v-if="!$store.state.readonly">
-          <el-form-item>
+          <el-form-item  v-if="!$store.state.readonly">
             <el-button type="success" plain @click="add">新增教师</el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="userList"

src/components/user/index.vue

 <template>
   <div class="user" v-loading="loading">
-    <el-form ref="searchFrom" :model="searchFrom" label-width="80px">
-      <el-row>
-        <el-col :span="4">
+    <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item label="ID">
             <el-input v-model="searchFrom.userId"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="昵称">
             <el-input v-model="searchFrom.nickName"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="电话">
             <el-input v-model="searchFrom.mobile"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item label="等级">
             <el-input v-model="searchFrom.level"></el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
           <el-form-item>
             <div class="flexRow">
               <el-button type="primary" plain @click="getUser">搜索</el-button>
               <el-button type="success" plain @click="syncUser">同步最新数据</el-button>
             </div>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
     <el-table
       :data="userList"

src/components/yunji/index.vue

@@ -28,7 +28,7 @@
             </el-select>
           </el-form-item>
       <el-form-item label="老师">
-        <el-select v-model="searchFrom.teacher_id" placeholder="请选择" @change="getList" >
+        <el-select v-model="searchFrom.teacher_id" placeholder="请选择" @change="getList" clearable filterable>
           <el-option
             v-for="(data,index) in teacherList"
             :key="index"
@@ -119,12 +119,12 @@
         prop="buyer_comment"
         label="备注" >
       </el-table-column>
-       <!-- <el-table-column
+       <el-table-column
         label="操作"  v-if="!$store.state.readonly" >
          <template slot-scope="scope">
             <el-button @click="bindTeacher(scope.row)" size="mini" plain type="success">绑定老师</el-button>
           </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <page :nowPage="nowPage" :total="total" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
     <teacher-dialog :dialogObj="dialogObj"></teacher-dialog>
@@ -283,6 +283,9 @@
          if (this.searchFrom.goods_id) {
           json.goods_id = this.searchFrom.goods_id
         }
+         if(this.searchFrom.teacher_id){
+          json.teacher_id = this.searchFrom.teacher_id
+        }
 
        if(this.searchFrom.payTime && this.searchFrom.payTime.length > 0){
           json.start_at =this.searchFrom.payTime[0]