Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/schedul/schedul-visit.vue

 <style>
-.schedulVisit {
+  .schedulVisit {
     min-height: calc(100% - 30px);
     padding: 15px;
     margin-top: 30px;
     border-radius: 8px;
     background: #fff;
-}
+  }
 
-.schedulVisit .fangkeTitle {
+  .schedulVisit .fangkeTitle {
     color: #000000;
     font-size: 18px;
     font-weight: bold;
-}
+  }
 
-.schedulVisit .fangkeNumb {
+  .schedulVisit .fangkeNumb {
     display: inline-block;
     background-color: #bccefd;
     color: #2966fe;
@@ -23,429 +23,189 @@
     line-height: 22px;
     margin-left: 15px;
     padding: 0px 6px;
-}
+  }
 
-.schedulVisit .visit_Date {
+  .schedulVisit .visit_Date {
     margin-left: 60px;
     color: #000000;
     font-size: 16px;
-}
+  }
 
-.schedulVisit .visit_Date i {
+  .schedulVisit .visit_Date i {
     color: #b4b4b4;
     margin-right: 10px;
-}
+  }
 
-.page-option .el-input__inner {
+  .page-option .el-input__inner {
     background-color: #f1f3f5;
     border: 0;
     height: 34px;
     line-height: 34px;
     border-radius: 10px;
-}
+  }
 
-.page-option .el-input__icon {
+  .page-option .el-input__icon {
     line-height: 34px;
-}
+  }
 
-.schedul_Vtable tr th {
+  .schedul_Vtable tr th {
     color: #8e8e8e;
-}
+  }
 
-.schedul_Vtable tr td {
+  .schedul_Vtable tr td {
     color: #2d2d2d;
-}
+  }
 
-.visit_FORM .el-input__inner {
+  .visit_FORM .el-input__inner {
     background: #f0f2f5;
     border-radius: 10px;
     height: 34px;
     line-height: 34px;
     border: 0;
-}
+  }
 
-.visit_FORM .el-input__icon {
+  .visit_FORM .el-input__icon {
     line-height: 34px;
-}
+  }
 
-.schedulVisit .q-table {
+  .schedulVisit .q-table {
     padding-bottom: 5px;
-}
+  }
 
-.schedulVisit .q-table tbody td:before {
+  .schedulVisit .q-table tbody td:before {
     background: "" !important;
-}
+  }
 
-.schedulVisit .q-table tbody tr:hover {
+  .schedulVisit .q-table tbody tr:hover {
     box-shadow: 0px 2px 20px 0px #e4e7fb;
     background: #fff;
     border-radius: 16px;
-}
+  }
 
-.schedulVisit .q-table tbody td:before {
+  .schedulVisit .q-table tbody td:before {
     background: transparent !important;
-}
+  }
 
-.scheduVipop .el-textarea__inner {
+  .scheduVipop .el-textarea__inner {
     background: #f0f2f5 !important;
     border: 0;
-}
+  }
+
 </style>
 <template>
   <div class="schedulVisit">
     <div class="row">
       <div class="col q-mr-lg">
-        <q-tabs
-          style="margin-bottom:20px;"
-          v-model="tabCheck"
-          narrow-indicator
-          dense
-          align="left"
-          class="text-primary"
-        >
+        <q-tabs style="margin-bottom:20px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
           <q-tab :ripple="false" name="first" label="预约到访" />
           <q-tab :ripple="false" name="second" label="访客登记" />
           <q-tab :ripple="false" name="third" label="预约试听" />
         </q-tabs>
       </div>
       <div v-if="tabCheck == 'first'" class="col-3">
-        <q-input
-          dense
-          debounce
-          v-model="searchObj.arriveVisitKey"
-          input-style="font-size:13px;"
-          filled
-          placeholder="请输入到访者姓名或电话"
-          @keydown.enter="changeVisitList"
-        >
+        <q-input dense debounce v-model="searchObj.arriveVisitKey" input-style="font-size:13px;" filled
+          placeholder="请输入到访者姓名或电话" @keydown.enter="changeVisitList">
           <template v-slot:prepend>
             <q-icon name="search" color="gery-3" />
           </template>
         </q-input>
       </div>
       <div v-if="tabCheck == 'second'">
-        <q-btn
-          outline
-          dense
-          icon="add"
-          class="q-px-sm"
-          color="primary"
-          @click="showAddForm = true"
-          label="新增客户"
-        ></q-btn>
+        <q-btn outline dense icon="add" class="q-px-sm" color="primary" @click="showAddForm = true" label="新增客户">
+        </q-btn>
       </div>
     </div>
     <div class="page-content">
-      <q-table
-        :pagination="msg"
-        :loading="loadingObj.visitLoading"
-        no-data-label="暂无相关数据"
-        flat
-        class="stickycreatInsertStr-column-table schedul_Vtable"
-        separator="none"
-        :data="data"
-        :columns="columns"
-        row-key="name"
-        v-if="tabCheck == 'second'"
-      >
+      <q-table :pagination="msg" :loading="loadingObj.visitLoading" no-data-label="暂无相关数据" flat
+        class="stickycreatInsertStr-column-table schedul_Vtable" separator="none" :data="data" :columns="columns"
+        row-key="name" v-if="tabCheck == 'second'">
+        <template v-slot:body-cell-StuName="props">
+          <q-td :props="props">
+            <div class="text-blue cursor-pointer" @click="getStuRight(props.row)">
+              {{ props.value }}
+            </div>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-AssistList="props">
+          <q-td :props="props">
+            <template v-for="(item,index) in  props.row.AssistList">
+              {{item.AssistName}}<span :key="index" v-if="index!=props.row.AssistList.length-1">,</span>
+            </template>
+          </q-td>
+        </template>
         <template>
           <div class="fangkeTitle" ref="fkdj">访客登记</div>
           <span class="fangkeNumb">{{ data.length }}</span>
           <div class="visit_Date">
-            <i class="iconfont icon-img-rili" style=""></i
-            >{{ saveObj.PlanDate }}
+            <i class="iconfont icon-img-rili" style=""></i>{{ saveObj.PlanDate }}
           </div>
           <q-space />
           <div class="page-option" style="margin-right:20px;width:250px;">
-            <el-input
-              placeholder="姓名/电话/微信"
-              v-model="msg.KeyWords"
-              @input="resetSearch"
-            >
+            <el-input placeholder="姓名/电话/微信" v-model="msg.KeyWords" @input="resetSearch">
               <i slot="prefix" class="el-input__icon el-icon-search"></i>
             </el-input>
           </div>
           <div class="page-option addVisit">
-            <el-popover
-              placement="left"
-              popper-class="scheduVipop"
-              width="300"
-              trigger="click"
-            >
+            <el-popover placement="left" popper-class="scheduVipop" width="300" trigger="click">
               <div>
-                <el-form
-                  label-width="80px"
-                  :model="addMsg"
-                  ref="addMsg1"
-                  :rules="rules"
-                  style="margin-top:10px;"
-                  class="visit_FORM"
-                >
+                <el-form label-width="80px" :model="addMsg" ref="addMsg1" :rules="rules" style="margin-top:10px;"
+                  class="visit_FORM">
                   <el-form-item label="姓名" prop="Name">
-                    <el-input
-                      v-model="addMsg.Name"
-                      placeholder="请输入姓名"
-                    ></el-input>
+                    <el-input v-model="addMsg.Name" placeholder="请输入姓名"></el-input>
                   </el-form-item>
                   <el-form-item label="电话" prop="Tel">
-                    <el-input
-                      v-model="addMsg.Tel"
-                      placeholder="请输入电话号码"
-                    ></el-input>
+                    <el-input v-model="addMsg.Tel" placeholder="请输入电话号码"></el-input>
                   </el-form-item>
                   <el-form-item label="微信号">
-                    <el-input
-                      v-model="addMsg.WeChatNum"
-                      placeholder="请输入微信号"
-                    ></el-input>
+                    <el-input v-model="addMsg.WeChatNum" placeholder="请输入微信号"></el-input>
                   </el-form-item>
                   <el-form-item label="兴趣课程" prop="CourseName">
-                    <el-input
-                      v-model="addMsg.CourseName"
-                      placeholder="请输入兴趣课程"
-                    ></el-input>
+                    <el-input v-model="addMsg.CourseName" placeholder="请输入兴趣课程"></el-input>
                   </el-form-item>
                   <el-form-item label="学习时间" prop="StudyTime">
-                    <el-input
-                      v-model="addMsg.StudyTime"
-                      placeholder="请输入学习时间"
-                    ></el-input>
+                    <el-input v-model="addMsg.StudyTime" placeholder="请输入学习时间"></el-input>
                   </el-form-item>
                   <el-form-item label="当前水平" prop="LevelType">
-                    <el-select
-                      v-model="addMsg.LevelType"
-                      style="width:200px;"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item in GBList"
-                        :key="item.Id"
-                        :label="item.Name"
-                        :value="item.Name"
-                      >
+                    <el-select v-model="addMsg.LevelType" style="width:200px;" placeholder="请选择">
+                      <el-option v-for="item in GBList" :key="item.Id" :label="item.Name" :value="item.Name">
                       </el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="状态" prop="VisitorStatus">
-                    <el-select
-                      v-model="addMsg.VisitorStatus"
-                      style="width:200px;"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item in statusList"
-                        :key="item.Id"
-                        :label="item.Name"
-                        :value="item.Id"
-                      >
+                    <el-select v-model="addMsg.VisitorStatus" style="width:200px;" placeholder="请选择">
+                      <el-option v-for="item in statusList" :key="item.Id" :label="item.Name" :value="item.Id">
                       </el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="意向评估" prop="Evaluate">
-                    <el-input
-                      v-model="addMsg.Evaluate"
-                      placeholder="请输入意向评估"
-                    ></el-input>
+                    <el-input v-model="addMsg.Evaluate" placeholder="请输入意向评估"></el-input>
                   </el-form-item>
                   <el-form-item label="备注">
-                    <el-input
-                      type="textarea"
-                      v-model="addMsg.Remark"
-                      :rows="4"
-                      placeholder="请输入备注"
-                    ></el-input>
+                    <el-input type="textarea" v-model="addMsg.Remark" :rows="4" placeholder="请输入备注"></el-input>
                   </el-form-item>
                 </el-form>
-                <q-btn
-                  color="accent"
-                  size="sm"
-                  @click="submitForm('addMsg1')"
-                  style="float:right;margin-bottom:10px;"
-                  label="保存"
-                />
+                <q-btn color="accent" size="sm" @click="submitForm('addMsg1')" style="float:right;margin-bottom:10px;"
+                  label="保存" />
               </div>
-              <q-btn
-                color="accent"
-                slot="reference"
-                size="sm"
-                icon="add"
-                @click="clearAddMsg"
-                label="添加访客"
-                v-if="DutyAuthObj.isShowAdd"
-              />
+              <q-btn color="accent" slot="reference" size="sm" icon="add" @click="clearAddMsg" label="添加访客"
+                v-if="DutyAuthObj.isShowAdd" />
             </el-popover>
           </div>
         </template>
 
         <template v-slot:bottom>
-          <q-pagination
-            class="full-width justify-end"
-            v-model="msg.pageIndex"
-            color="primary"
-            :max="pageCount"
-            :input="true"
-            @input="changePage"
-          />
-        </template>
-        <template v-slot:body-cell-optioned="props">
-          <q-td :props="props">
-            <el-popover
-              placement="left"
-              popper-class="scheduVipop"
-              width="300"
-              ref="popover2"
-              trigger="click"
-            >
-              <div>
-                <el-form
-                  label-width="80px"
-                  :model="addMsg"
-                  ref="addMsg2"
-                  :rules="rules"
-                  style="margin-top:10px;"
-                  class="visit_FORM"
-                >
-                  <el-form-item label="姓名" prop="Name">
-                    <el-input
-                      v-model="addMsg.Name"
-                      placeholder="请输入姓名"
-                      maxlength="50"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="电话" prop="Tel">
-                    <el-input
-                      v-model="addMsg.Tel"
-                      placeholder="请输入电话号码"
-                      maxlength="50"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="微信号">
-                    <el-input
-                      v-model="addMsg.WeChatNum"
-                      placeholder="请输入微信号"
-                      maxlength="50"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="兴趣课程" prop="CourseName">
-                    <el-input
-                      v-model="addMsg.CourseName"
-                      placeholder="请输入兴趣课程"
-                      maxlength="50"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="学习时间" prop="StudyTime">
-                    <el-input
-                      v-model="addMsg.StudyTime"
-                      placeholder="请输入学习时间"
-                      maxlength="100"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="当前水平" prop="LevelType">
-                    <el-select
-                      v-model="addMsg.LevelType"
-                      style="width:200px;"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item in GBList"
-                        :key="item.Name"
-                        :label="item.Name"
-                        :value="item.Name"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="状态" prop="VisitorStatus">
-                    <el-select
-                      v-model="addMsg.VisitorStatus"
-                      style="width:200px;"
-                      placeholder="请选择"
-                    >
-                      <el-option
-                        v-for="item in statusList"
-                        :key="item.Id"
-                        :value="item.Id"
-                        :label="item.Name"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="意向评估" prop="Evaluate">
-                    <el-input
-                      v-model="addMsg.Evaluate"
-                      placeholder="请输入意向评估"
-                      maxlength="500"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="备注">
-                    <el-input
-                      type="textarea"
-                      v-model="addMsg.Remark"
-                      :rows="4"
-                      placeholder="请输入备注"
-                      maxlength="500"
-                    >
-                    </el-input>
-                  </el-form-item>
-                </el-form>
-                <q-btn
-                  color="accent"
-                  size="sm"
-                  @click="submitForm2('addMsg2')"
-                  style="float:right;margin-bottom:10px;"
-                  label="保存"
-                />
-              </div>
-              <q-btn
-                flat
-                size="xs"
-                icon="edit"
-                slot="reference"
-                @click="EditVisitor(props.row.Id)"
-                color="accent"
-                style="font-weight:400"
-                label="编辑"
-                v-if="DutyAuthObj.isShowEdit"
-              />
-            </el-popover>
-            <q-btn
-              flat
-              size="xs"
-              @click="getDetail(props.row)"
-              icon="iconfont icon-View"
-              color="accent"
-              style="font-weight:400"
-              label="详情"
-            />
-          </q-td>
+          <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
+            :input="true" @input="changePage" />
         </template>
       </q-table>
-      <q-table
-        v-if="tabCheck == 'first'"
-        hide-bottom
-        :columns="visitColumns"
-        :data="showTodayVist"
-        :loading="loadingObj.visitLoading"
-        no-data-label="暂无相关数据"
-        flat
-        class="sticky-right-column-table sticky-column-table"
-        separator="none"
-      >
+      <q-table v-if="tabCheck == 'first'" hide-bottom :columns="visitColumns" :data="showTodayVist"
+        :loading="loadingObj.visitLoading" no-data-label="暂无相关数据" flat
+        class="sticky-right-column-table sticky-column-table" separator="none">
         <template v-slot:body-cell-Option="props">
           <q-td :props="props">
-            <q-btn
-              dense
-              flat
-              color="primary"
-              v-if="props.row.IsVisit != 1"
-              @click="setCustomerVisitHandler(props.row.Id)"
-            >
-              <q-icon
-                name="edit"
-                color="primary"
-                style="font-size:11px"
-                class="q-mr-xs"
-              ></q-icon>
+            <q-btn dense flat color="primary" v-if="props.row.IsVisit != 1"
+              @click="setCustomerVisitHandler(props.row.Id)">
+              <q-icon name="edit" color="primary" style="font-size:11px" class="q-mr-xs"></q-icon>
               <span style="font-size:12px;">到访</span>
             </q-btn>
           </q-td>
@@ -458,29 +218,17 @@
           </q-td>
         </template>
       </q-table>
-      <q-table
-        v-if="tabCheck == 'third'"
-        hide-bottom
-        :columns="dutyColumns"
-        :data="shwoTrialList"
-        :loading="loadingObj.trialLoading"
-        no-data-label="暂无相关数据"
-        flat
-        class="sticky-column-table"
-      >
+      <q-table v-if="tabCheck == 'third'" hide-bottom :columns="dutyColumns" :data="shwoTrialList"
+        :loading="loadingObj.trialLoading" no-data-label="暂无相关数据" flat class="sticky-column-table">
         <template v-slot:body-cell-StuName="props">
           <q-td :props="props" style="border-left:1px solid #E5e5e5;padding:0">
             <template v-for="(x, i) in props.row.GuestList">
-              <div
-                :key="i"
-                class="q-pa-md"
-                :style="{
+              <div :key="i" class="q-pa-md" :style="{
                   'border-bottom':
                     i == props.row.GuestList.length - 1
                       ? 'none'
                       : '1px solid #e5e5e5'
-                }"
-              >
+                }">
                 {{ x.GuestName }}
               </div>
             </template>
@@ -489,16 +237,12 @@
         <template v-slot:body-cell-StuPhone="props">
           <q-td :props="props" style="border-right:1px solid #E5e5e5;padding:0">
             <template v-for="(x, i) in props.row.GuestList">
-              <div
-                :key="i + 'tel'"
-                class="q-pa-md"
-                :style="{
+              <div :key="i + 'tel'" class="q-pa-md" :style="{
                   'border-bottom':
                     i == props.row.GuestList.length - 1
                       ? 'none'
                       : '1px solid #e5e5e5'
-                }"
-              >
+                }">
                 {{ x.StuTel }}
               </div>
             </template>
@@ -506,31 +250,15 @@
         </template>
       </q-table>
     </div>
-    <schedulFanke
-      v-if="isShowDetail"
-      @close="closeDetail"
-      :save-obj="sendObj"
-    ></schedulFanke>
-    <q-dialog
-      v-model="showAddForm"
-      persistent
-      content-class="bg-grey-1 big-dialog"
-    >
-      <student-add-form
-        @success="addFinishHandler"
-        @close="showAddForm = false"
-      ></student-add-form>
+    <schedulFanke v-if="isShowDetail" @close="closeDetail" :save-obj="sendObj"></schedulFanke>
+    <q-dialog v-model="showAddForm" persistent content-class="bg-grey-1 big-dialog">
+      <student-add-form @success="addFinishHandler" @close="showAddForm = false"></student-add-form>
     </q-dialog>
     <q-dialog persistent v-model="isShowModelInfo" v-if="visitModel">
       <q-card flat class="q-pa-md" style="width:300px">
         <div class="text-h6">客户已存在</div>
         <div class="text-center q-my-md">
-          <q-avatar
-            size="40px"
-            rounded
-            style="background:#C7C7C7"
-            text-color="white"
-          >
+          <q-avatar size="40px" rounded style="background:#C7C7C7" text-color="white">
             <span>{{ visitModel.StuName.substring(0, 1) }}</span>
           </q-avatar>
         </div>
@@ -546,31 +274,40 @@
         </div>
         <q-separator class="q-mb-md" />
         <div class="text-center q-py-xs">
-          <q-btn
-            outline
-            color="primary"
-            class="q-px-md"
-            label="打卡到访"
-            @click="createVisitHandler(visitModel)"
-          ></q-btn>
+          <q-btn outline color="primary" class="q-px-md" label="打卡到访" @click="createVisitHandler(visitModel)"></q-btn>
         </div>
       </q-card>
     </q-dialog>
+    <studentRight-form v-if="isShowStuRight" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
+    </studentRight-form>
   </div>
 </template>
 <script>
-import { getTodayVisitList } from "../../api/stuMan/index";
-import { getStudentPage, saveStudent, getStudentInfo } from "../../api/school";
-import {
+  import studentRightForm from "../school/student/studentRight-form";
+  import {
+    getTodayVisitList
+  } from "../../api/stuMan/index";
+  import {
+    getStudentPage,
+    saveStudent,
+    getStudentInfo
+  } from "../../api/school";
+  import {
     saveStudentVisitFeedback,
     saveStudentVisit
-} from "../../api/customerstudent/customerstudent";
-import { getGuestBasicsEnumList } from "../../api/sale/sale";
-import schedulFanke from "../schedul/schedul-fanke";
-import { queryDutyTrialLesson } from "../../api/duty/index";
-import studentAddForm from "../../components/school/student/studentAddForm";
-import { mapGetters } from "vuex";
-export default {
+  } from "../../api/customerstudent/customerstudent";
+  import {
+    getGuestBasicsEnumList
+  } from "../../api/sale/sale";
+  import schedulFanke from "../schedul/schedul-fanke";
+  import {
+    queryDutyTrialLesson
+  } from "../../api/duty/index";
+  import studentAddForm from "../../components/school/student/studentAddForm";
+  import {
+    mapGetters
+  } from "vuex";
+  export default {
     props: {
       saveObj: {
         type: Object,
@@ -583,20 +320,21 @@ export default {
     },
     components: {
       schedulFanke,
-    studentAddForm
+      studentAddForm,
+      studentRightForm
     },
     computed: {
       ...mapGetters(["userInfo"])
     },
     data() {
       return {
+        isShowStuRight: false,
         isShowModelInfo: true,
         visitModel: null,
         tabCheck: "first",
-      columns: [
-        {
+        columns: [{
             name: "StuName",
-          label: "姓名",
+            label: "昵称",
             required: true,
             field: "StuName",
             align: "left"
@@ -620,31 +358,68 @@ export default {
             align: "left"
           },
           {
-          name: "CreateTimeStr",
-          field: "CreateTimeStr",
-          label: "创建时间",
+            name: "StuProfession",
+            label: "职业",
+            field: "StuProfession",
+            align: "left"
+          },
+          {
+            name: "StuEducationName",
+            label: "学历",
+            field: "StuEducationName",
+            align: "left"
+          },
+          {
+            name: "StuPurposeName",
+            label: "目的",
+            field: "StuPurposeName",
             align: "left"
           },
           {
             name: "CreateByName",
+            label: "负责人",
+            align: "left",
+            field: "CreateByName"
+          },
+          {
+            name: "AssistList",
+            label: "协同人",
+            align: "left",
+            field: "AssistList"
+          },
+          {
+            name: "CreateTypeStr",
+            label: "获取渠道",
+            field: "CreateTypeStr",
+            align: "left"
+          },
+          {
+            name: "StuSourceIdName",
             label: "关联人员",
-          field: "CreateByName",
+            field: "StuSourceIdName",
             align: "left"
           },
           {
-          name: "VisitTimes",
+            name: "VisitCount",
             label: "到访次数",
-          field: "VisitTimes",
+            field: "VisitCount",
             align: "left"
           },
           {
-          name: "optioned",
-          label: "操作"
+            name: "TrialLessonCount",
+            label: "试听次数",
+            field: "TrialLessonCount",
+            align: "left"
+          },
+          {
+            name: "CreateTimeStr",
+            field: "CreateTimeStr",
+            label: "创建时间",
+            align: "left"
           }
         ],
         showAddForm: false,
-      visitColumns: [
-        {
+        visitColumns: [{
             name: "StuName",
             label: "姓名",
             field: "StuName",
@@ -698,8 +473,7 @@ export default {
             field: "Option"
           }
         ],
-      dutyColumns: [
-        {
+        dutyColumns: [{
             name: "TeacherName",
             label: "试讲老师",
             field: "TeacherName",
@@ -766,8 +540,7 @@ export default {
           Evaluate: "", //意向评估
           Remark: "" //备注
         },
-      statusList: [
-        {
+        statusList: [{
             Id: 1,
             Name: "正常"
           },
@@ -790,62 +563,49 @@ export default {
         },
         rules: {
           //表单必填验证
-        Name: [
-          {
+          Name: [{
             required: true,
             message: "请输入姓名",
             trigger: "blur"
-          }
-        ],
-        Tel: [
-          {
+          }],
+          Tel: [{
             required: true,
             message: "请输入电话",
             trigger: "blur"
-          }
-        ],
-        CourseName: [
-          {
+          }],
+          CourseName: [{
             required: true,
             message: "请输入兴趣课程",
             trigger: "blur"
-          }
-        ],
-        StudyTime: [
-          {
+          }],
+          StudyTime: [{
             required: true,
             message: "请输入学习时间",
             trigger: "blur"
-          }
-        ],
-        LevelType: [
-          {
+          }],
+          LevelType: [{
             required: true,
             message: "请选择当前水平",
             trigger: "change"
-          }
-        ],
-        VisitorStatus: [
-          {
+          }],
+          VisitorStatus: [{
             required: true,
             message: "请选择状态",
             trigger: "change"
-          }
-        ],
-        Evaluate: [
-          {
+          }],
+          Evaluate: [{
             required: true,
             message: "请输入意向评估",
             trigger: "blur"
-          }
-        ]
+          }]
         },
         sendObj: {},
         isShowDetail: false,
         todayVistList: [],
         showTodayVist: [],
         trialList: [],
-      shwoTrialList: []
+        shwoTrialList: [],
+        stuOption:null
       };
     },
     watch: {
@@ -879,6 +639,16 @@ export default {
       this.initDutyTrialLessonList();
     },
     methods: {
+      //点击学生姓名弹出
+      getStuRight(obj) {
+        if (obj) {
+          this.stuOption = obj;
+        } else {
+          this.stuOption = null;
+        }
+        this.isShowStuRight = true;
+      },
+
       addFinishHandler(m, t) {
         console.log(m, t);
         if (m && m.StuId) {
@@ -898,15 +668,14 @@ export default {
           Id: 0,
           Date: d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(),
           ReceptionPersion: this.userInfo.Id,
-        Remark:
-          "客户临时到访门店，由" + this.userInfo.AccountName + "记录到访信息",
+          Remark: "客户临时到访门店，由" + this.userInfo.AccountName + "记录到访信息",
           School_Id: this.userInfo.School_Id,
           StuId: m.StuId,
           VisitTime: d.getHours() + ":" + d.getMinutes()
         };
         console.log("进来了呀", msg);
         saveStudentVisit(msg).then(r => {
-        this.visitModel=null
+          this.visitModel = null
           if (r.Data) {
             let msg2 = {
               Id: r.Data.Id,
@@ -970,6 +739,13 @@ export default {
         this.msg.pageIndex = val;
         this.getVisitoryPage();
       },
+      refreshStuList() {
+        this.getVisitoryPage();
+        this.closeStuForm();
+      },
+      closeStuForm(){
+        this.isShowStuRight = false;
+      },
       //获取访客列表
       getVisitoryPage() {
         this.loading = true;
@@ -1062,7 +838,9 @@ export default {
       initTodayVistList() {
         this.loadingObj.visitLoading = true;
         if (this.$route.query.Id) {
-        let msg = { Id: this.$route.query.Id };
+          let msg = {
+            Id: this.$route.query.Id
+          };
           getTodayVisitList(msg).then(r => {
             this.todayVistList = r.Data;
             this.changeVisitList();
@@ -1090,7 +868,9 @@ export default {
       initDutyTrialLessonList() {
         this.loadingObj.trialLoading = true;
         if (this.$route.query.Id) {
-        let msg = { Id: this.$route.query.Id };
+          let msg = {
+            Id: this.$route.query.Id
+          };
           queryDutyTrialLesson(msg).then(r => {
             if (r.Data) {
               r.Data.forEach(x => {
@@ -1106,8 +886,10 @@ export default {
         }
       }
     }
-};
+  };
+
 </script>
 <style lang="sass">
-@import url('~assets/css/table.sass')
+  @import url('~assets/css/table.sass')
+
 </style>

src/components/school/student/stulist.vue

@@ -41,7 +41,7 @@
       <template v-slot:body-cell-AssistList="props">
         <q-td :props="props">
           <template v-for="(item,index) in  props.row.AssistList">
-            {{item.AssistName}}
+            {{item.AssistName}}<span :key="index" v-if="index!=props.row.AssistList.length-1">,</span>
           </template>
         </q-td>
       </template>