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

src/components/school/student/student-genjin.vue

@@ -3,32 +3,139 @@
 </style>
 <template>
   <div>
-    <div style="margin-top:30px;">
-      <div class="row wrap">
-        <q-input filled type="textarea" class="col-6 q-pb-lg" label="内容"></q-input>
+    <div class="row wrap">
+        <q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd=true" />
+        <q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm" @click="isShowAdd=false" />
+    </div>
+    <template v-if="isShowAdd">
+        <UeEditor v-if="isShowAdd" v-model="flowMsg.Remark" class="q-pb-lg" :config="config"></UeEditor>
+        <q-btn label="新增" color="accent q-mb-lg" size="md" @click="saveFlow()" />
+    </template>
+    <div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
+      <div class="TimeLineDiv">
+        <q-timeline color="primary">
+          <q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
+            <template v-slot:title>
+              <div class="visit_Cont">
+                <div v-html="tItem.Remark"></div>
+                <div @click="delFollow(tItem.Id)" class="visit_delete">删除</div>
+              </div>
+            </template>
+            <template v-slot:subtitle>
+              <div class="Time_TopList">
+                <div>{{ tItem.CreateTime }}</div>
+              </div>
+            </template>
+          </q-timeline-entry>
+        </q-timeline>
       </div>
     </div>
+    <div style="margin:20px 0;">
+      <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="page_Count" input
+        @input="changePage" />
+    </div>
   </div>
 </template>
 <script>
+  import UeEditor from '../../editor/UeEditor'
+  import {
+    queryStudentFollowPage, //获取到访列表
+    saveStudentFollow,
+    deleteStudentFollow
+  } from '../../../api/customerstudent/customerstudent';
+
   export default {
     meta: {
       title: ""
     },
     components: {
-
+      UeEditor
     },
     props: {
 
     },
     data() {
       return {
-
+        isShowAdd:false,
+        config: {
+          initialFrameWidth: null,
+          initialFrameHeight: 90
+        },
+        flowMsg:{
+            Remark:''
+        },
+        msg: {
+          pageIndex: 1,
+          pageSize: 12
+        },
+        dataList:[],
+        page_Count:0
       }
     },
-    mounted() {},
+    mounted() {
+        this.getList();
+    },
     methods: {
+      //保存跟进
+      saveFlow() {
+        saveStudentFollow(this.flowMsg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '数据保存成功！',
+              position: 'top'
+            })
+            this.getList();
+            this.clearMsg();
+          }
+        }).catch(() => {
+
+        })
+      },
+      getList(){
+        queryStudentFollowPage(this.msg).then(res => {
+          if (res.Code == 1) {
+            this.dataList = res.Data.PageData;
+            this.page_Count = res.Data.PageCount;
+          }
+        }).catch(() => {
 
+        })
+      },
+      //清除
+      clearMsg(){
+
+      },
+      changePage(val){
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      //删除跟进
+      delFollow(Id){
+        let that = this
+        this.$q.dialog({
+          title: '提示信息',
+          message: '是否确定删除？',
+          cancel: true,
+          persistent: true,
+          ok: "确定",
+          cancel: "取消",
+        }).onOk(() => {
+          deleteStudentFollow({
+            Id: Id
+          }).then((res) => {
+            that.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              timeout: 2000,
+              message: res.Message,
+              position: 'top'
+            })
+            that.getList()
+          })
+        }).onCancel(() => {});  
+      }
     },
   }
 

src/components/school/student/student-order.vue

+<template>
+    <div>
+        订单
+    </div>
+</template>
\ No newline at end of file

src/components/school/student/student-record.vue

@@ -7,7 +7,7 @@
             <template v-slot:title>
               <div class="visit_Cont">
                 <div>{{tItem.LogTitle}}</div>
-                <div>{{tItem.LogContent}}</div>
+                <div v-html="tItem.LogContent"></div>
               </div>
             </template>
             <template v-slot:subtitle>

src/components/school/student/student-shiting.vue

+<template>
+    <div>
+        试听
+    </div>
+</template>
\ No newline at end of file

src/components/school/student/student-yuefang.vue

@@ -38,16 +38,14 @@
           <q-timeline-entry v-for="(tItem,tIndex) in dataList" :key="tIndex">
             <template v-slot:title>
               <div class="visit_Cont">
-                <div>约访地点：{{tItem.AppointmentPoint}}</div>
-                <div>接待人：{{tItem.ReceptionPersion}}</div>
                 <div>备注：{{tItem.Remark}}</div>
-                <div>反馈：{{tItem.Feedback}}</div>
                 <div @click="delVisit(tItem.Id)" class="visit_delete">删除</div>
               </div>
             </template>
             <template v-slot:subtitle>
               <div class="Time_TopList">
-                <div>{{ tItem.AppointmentTime }}</div>
+                <div>{{ tItem.CreateTime }}</div>
+                <div>{{ tItem.CreateByName }}</div>
               </div>
             </template>
           </q-timeline-entry>

src/components/school/student/studentRight-form.vue

@@ -26,7 +26,7 @@
         </div>
         <div class="detail-travel">
           <div class="detail_first">
-            <q-tabs v-model="ckedTab" dense align="left" class="text-teal" style="width:300px;">
+            <q-tabs v-model="ckedTab" dense align="left" class="text-teal" style="width:300px;margin-bottom:20px;">
               <q-tab name="1" label="记录" />
               <q-tab name="2" label="操作" />
               <q-tab name="3" label="订单" />
@@ -45,20 +45,20 @@
                 </template>
                 <!-- 操作 -->
                 <template v-if="ckedTab==2">
-                  <div class="operate_Content">
+                  <div class="operate_Content" style="margin-top:20px;">
                     <student-visit :save-obj="baseObj" :StuId="baseObj.StuId" v-if="secondType==1"></student-visit>
                     <student-yuefang :save-obj="baseObj" v-if="secondType==2"></student-yuefang>
                     <student-genjin :save-obj="baseObj" v-if="secondType==3"></student-genjin>
-                    <student-hetong :save-obj="baseObj" v-if="secondType==4"></student-hetong>
+                    <student-shiting :save-obj="baseObj" v-if="secondType==4"></student-shiting>
                   </div>
                 </template>
                 <!-- 订单 -->
                 <template v-if="ckedTab==3">
-
+                  <student-order :save-obj="baseObj"></student-order>
                 </template>
                 <!-- 合同 -->
                 <template v-if="ckedTab==4">
-
+                  <student-hetong :save-obj="baseObj"></student-hetong>
                 </template>
               </div>
             </div>
@@ -78,7 +78,9 @@
   import studentVisit from '../student/student-visit';
   import studentYuefang from '../student/student-yuefang';
   import studentGenjin from '../student/student-genjin';
+  import studentShiting from '../student/student-shiting';
   import studentHetong from '../student/student-hetong';
+  import studentOrder from '../student/student-order';
   export default {
     meta: {
       title: "学员管理"
@@ -89,7 +91,9 @@
       studentVisit,
       studentYuefang,
       studentGenjin,
-      studentHetong
+      studentShiting,
+      studentHetong,
+      studentOrder
     },
     props: {
       saveObj: {
@@ -275,7 +279,6 @@
 
   .tripTypeContent {
     display: flex;
-    margin-top: 20px;
     overflow-x: auto;
     white-space: nowrap;
   }
@@ -328,7 +331,6 @@
     flex-direction: column;
     width: 100%;
     height: 100%;
-    padding-top: 10px;
   }
 
   .student_Name{
@@ -341,7 +343,6 @@
     font-size:20px;
   }
   .TimeLineDiv {
-    overflow: auto;
     height:620px;
     flex: 1;
     height: 100%;
@@ -361,7 +362,6 @@
   }
   .operate_Content{
     overflow: auto;
-    margin-top: 30px;
     padding-right:20px;
   }
   .operate_Content::-webkit-scrollbar{