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

src/components/schedul/schedul-fanke.vue

+<style>
+  .schedulFanke {
+    margin: 20px;
+  }
+
+  .schedulFanke .baseInfo_Item {
+    margin-bottom: 20px;
+  }
+
+  .schedulFanke .EmpList {
+    background-color: #F7F7F7;
+    min-height: 70px;
+    margin-right: 15px;
+    border-radius: 3px;
+    padding: 15px;
+  }
+
+  .schedulFanke .normalName {
+    color: #999999;
+    font-size: 12px;
+  }
+
+  .schedulFanke .normalInner {
+    color: #111111;
+    font-weight: bold;
+    font-size: 13px;
+    margin-top: 5px;
+  }
+
+  .schedulFanke .role_Line {
+    width: 3px;
+    height: 11px;
+    margin-right: 10px;
+    background-color: #3FC4FF;
+    display: inline-block;
+  }
+
+</style>
+<template>
+  <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeFangkeForm">
+    <q-card style="margin-top:61px;width:700px" class="no-border-radius classinfo_Dialog">
+      <div class="schedulFanke">
+        <div class="baseInfo_Item">
+          <span class="role_Line"></span>访客信息
+        </div>
+        <div class="row baseInfo_Item">
+          <div class="col EmpList">
+            <div class="normalName">姓名</div>
+            <div class="normalInner">{{saveObj.Name}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">兴趣课程</div>
+            <div class="normalInner">{{saveObj.CourseName}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">学习时间</div>
+            <div class="normalInner">{{saveObj.StudyTime}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">当前水平</div>
+            <div class="normalInner">{{saveObj.LevelType}}</div>
+          </div>
+        </div>
+        <div class="row baseInfo_Item">
+          <div class="col EmpList">
+            <div class="normalName">关联人员</div>
+            <div class="normalInner">{{saveObj.CreateByName}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">状态</div>
+            <div class="normalInner">{{saveObj.VisitorStatusStr}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">到访时间</div>
+            <div class="normalInner">{{saveObj.CreateTimeStr}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">到访次数</div>
+            <div class="normalInner">{{saveObj.VisitTimes}}</div>
+          </div>
+        </div>
+        <div class="row baseInfo_Item">
+          <div class="col EmpList">
+            <div class="normalName">电话</div>
+            <div class="normalInner">{{saveObj.Tel}}</div>
+          </div>
+          <div class="col EmpList">
+            <div class="normalName">微信</div>
+            <div class="normalInner">{{saveObj.WeChatNum}}</div>
+          </div>
+        </div>
+        <div class="row baseInfo_Item">
+          <div class="col EmpList">
+            <div class="normalName">意向评估</div>
+            <div class="normalInner" style="line-height:22px;">{{saveObj.Evaluate}}</div>
+          </div>
+        </div>
+        <div class="row baseInfo_Item">
+          <div class="col EmpList">
+            <div class="normalName">备注</div>
+            <div class="normalInner" style="line-height:22px;">{{saveObj.Remark}}</div>
+          </div>
+        </div>
+      </div>
+    </q-card>
+    <div class="dialog-out-close" @click="closeFangkeForm"
+      style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
+      <q-icon name="iconfont icon-jujue1" size="26px" />
+    </div>
+  </q-dialog>
+</template>
+
+<script>
+  export default {
+    props: {
+      saveObj: {
+        type: Object,
+        default: null
+      },
+    },
+    data() {
+      return {
+        persistent: true,
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+      console.log(this.saveObj, 'saveObj');
+    },
+    methods: {
+      closeFangkeForm() {
+        this.persistent = false;
+        this.$emit('close');
+      },
+    }
+  }
+
+</script>

src/components/schedul/schedul-visit.vue

@@ -169,6 +169,16 @@
             <img v-if="props.row.VisitorStatus==3" src="../../assets/images/blackList.png" />
           </q-td>
         </template>
+        <template v-slot:body-cell-Evaluate="props">
+          <q-td :props="props">
+            {{getRemarks(props.row.Evaluate)}}
+          </q-td>
+        </template>
+        <template v-slot:body-cell-Remark="props">
+          <q-td :props="props">
+            {{getRemarks(props.row.Remark)}}
+          </q-td>  
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
@@ -220,10 +230,12 @@
               <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="edit" color="accent" style="font-weight:400" label="详情" />
           </q-td>
         </template>
       </q-table>
     </div>
+    <schedulFanke v-if="isShowDetail" @close="closeDetail" :save-obj="sendObj"></schedulFanke>
   </div>
 </template>
 <script>
@@ -236,6 +248,7 @@
   import {
     getGuestBasicsEnumList
   } from '../../api/sale/sale'
+  import schedulFanke from '../schedul/schedul-fanke'
 
   export default {
     props: {
@@ -248,6 +261,9 @@
         default: null
       }
     },
+    components: {
+      schedulFanke
+    },
     data() {
       return {
         columns: [{
@@ -407,6 +423,8 @@
             trigger: 'blur'
           }]
         },
+        sendObj:{},
+        isShowDetail:false
 
       }
     },
@@ -544,6 +562,23 @@
           this.$refs.addMsg2.resetFields(); 
         })
       },
+      //过滤备注显示
+      getRemarks(remark){
+        if(remark.length>10){
+          return remark.substring(0,10)+'...';
+        }else{
+          return remark;
+        }
+      },
+      //获取详情
+      getDetail(obj){
+        this.sendObj = obj;
+        this.isShowDetail=true;
+      },
+      //关闭
+      closeDetail(){
+        this.isShowDetail=false;
+      }
     }
   }
 

src/pages/sale/visitorRegistrat.vue

@@ -23,9 +23,19 @@
             <img v-if="props.row.VisitorStatus==3" title="黑名单" src="../../assets/images/blackList.png" />
           </q-td>
         </template>
+        <template v-slot:body-cell-Evaluate="props">
+          <q-td :props="props">
+            {{getRemarks(props.row.Evaluate)}}
+          </q-td>
+        </template>
+        <template v-slot:body-cell-Remark="props">
+          <q-td :props="props">
+            {{getRemarks(props.row.Remark)}}
+          </q-td>
+        </template>
         <template v-slot:body-cell-Id="props">
           <q-td :props="props">
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="详情" />
+            <q-btn flat size="xs" @click="getDetail(props.row)" icon="edit" color="accent" style="font-weight:400" label="详情" />
           </q-td>
         </template>
         <template v-slot:bottom>
@@ -34,6 +44,7 @@
         </template>
       </q-table>
     </div>
+    <schedulFanke v-if="isShowDetail" @close="closeDetail" :save-obj="sendObj"></schedulFanke>
   </div>
 </template>
 
@@ -41,11 +52,14 @@
   import {
     queryVisitorPage,
   } from '../../api/scheduling/schedu'
+  import schedulFanke from '../../components/schedul/schedul-fanke'
   export default {
     meta: {
       title: "访客登记"
     },
-    components: {},
+    components: {
+      schedulFanke
+    },
     data() {
       return {
         msg: {
@@ -135,7 +149,8 @@
             label: '操作',
           }
         ],
-
+        sendObj:{},
+        isShowDetail:false
       }
     },
     mounted() {
@@ -162,6 +177,23 @@
       changePage() {
         this.msg.pageIndex = val;
         this.getVisitoryPage();
+      },
+      //过滤备注显示
+      getRemarks(remark){
+        if(remark.length>10){
+          return remark.substring(0,10)+'...';
+        }else{
+          return remark;
+        }
+      },
+      //获取详情
+      getDetail(obj){
+        this.sendObj = obj;
+        this.isShowDetail=true;
+      },
+      //关闭
+      closeDetail(){
+        this.isShowDetail=false;
       }
     }
   }