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

src/pages/stuMan/visitorRecord.vue

@@ -8,13 +8,14 @@
         </div>
         <div class="col-3">
           <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" clearable
-              option-label="EmployeeName" v-model="msg.CreateBy"  :options="EmployeeList" emit-value map-options label="业务员" use-input  @filter="filterFn2"/>
+            option-label="EmployeeName" v-model="msg.CreateBy" :options="EmployeeList" emit-value map-options
+            label="业务员" use-input @filter="filterFn2" />
         </div>
         <div class="col-3">
           <q-field filled>
              <template v-slot:control>
-                <el-date-picker v-model="dateList2" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" :picker-options="option"
-                   range-separator="至"  start-placeholder="开班开始时间"  end-placeholder="开班结束时间">
+              <el-date-picker v-model="dateList2" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
+                :picker-options="option"  range-separator="至"  start-placeholder="开班开始时间"  end-placeholder="开班结束时间">
                  </el-date-picker>       
             </template>
           </q-field>
@@ -30,6 +31,11 @@
           <q-space />
 
         </template>
+        <template v-slot:body-cell-Name="props">
+          <q-td>
+            <span style="color:#2961FE;cursor:pointer;" @click="getDetail(props.row)">{{props.row.Name}}</span>
+          </q-td>
+        </template>
         <template v-slot:body-cell-VisitorStatus="props">
           <q-td :props="props">
             <img v-if="props.row.VisitorStatus==1" title="正常" src="../../assets/images/normal.png" />
@@ -54,20 +60,27 @@
         </template>
       </q-table>
     </div>
+    <schedulFanke v-if="isShowDetail" @close="closeDetail" :save-obj="sendObj"></schedulFanke>
 
   </div>
-  </template>
+</template>
 
-  <script>
+<script>
   import {
     getVisitorAllPageList,
   } from '../../api/stuMan/index'
-    import {    queryEmployee  } from '../../api/users/user';
+  import {
+    queryEmployee
+  } from '../../api/users/user';
+  import schedulFanke from '../../components/schedul/schedul-fanke'
 
   export default {
     meta: {
       title: "访问记录"
     },
+    components: {
+      schedulFanke
+    },
 
     data() {
       return {
@@ -76,13 +89,13 @@
           pageSize: 10,
           rowsPerPage: 10,
           KeyWords: "",
-            CreateBy:'',
-            StartTime:'',
-            EndTime:'',
+          CreateBy: '',
+          StartTime: '',
+          EndTime: '',
         },
         pageCount: 0,
         dataList: [],
-          dateList2:[],
+        dateList2: [],
         loading: false,
         columns: [{
             name: 'Name',
@@ -165,13 +178,15 @@
           },
 
         ],
-          option:{
-            disabledDate:(time)=> {
+        option: {
+          disabledDate: (time) => {
             return time.getTime() > Date.now()
           }
         },
-            EmployeeList:[],//业务员
-            AllemployeeList:[],
+        EmployeeList: [], //业务员
+        AllemployeeList: [],
+        isShowDetail:false,
+        sendObj: {},
       }
     },
     mounted() {
@@ -182,7 +197,15 @@
 
     },
     methods: {
-       
+      //关闭
+      closeDetail() {
+        this.isShowDetail = false;
+      },
+      //获取详情
+      getDetail(obj) {
+        this.sendObj = obj;
+        this.isShowDetail = true;
+      },
       getList() {
         this.loading = true;
         if (this.dateList2 && this.dateList2.length > 0) {
@@ -221,13 +244,13 @@
         var qMsg = {
           Dept_Id: 0
         }
-            qMsg.Dept_Id=id;
+        qMsg.Dept_Id = id;
         queryEmployee(qMsg).then(res => {
-            if(res.Code==1){
+          if (res.Code == 1) {
             this.EmployeeList = res.Data;
-                let obj={
-                    Id:"",
-                    EmployeeName:"不限"
+            let obj = {
+              Id: "",
+              EmployeeName: "不限"
             }
             this.EmployeeList.unshift(obj)
             this.AllemployeeList = JSON.parse(JSON.stringify(this.EmployeeList));
@@ -253,13 +276,14 @@
     }
   }
 
-  </script>
-  <style >
+</script>
+<style>
   .visitorRecord .border-bottom {
     border-bottom: 1px dashed #EEE;
     padding-bottom: 5px;
     margin-bottom: 5px;
   }
+
   .visitorRecord .el-input {
     width: 100%;
     border: none;
@@ -271,15 +295,13 @@
     border: none;
     background-color: transparent;
   }
+
   .visitorRecord .el-range-input {
     background-color: transparent !important;
   }
 
-  
-  
-  </style>
-  <style lang="sass">
+</style>
+<style lang="sass">
   @import url('~assets/css/table.sass')
 
-  </style>
-  
\ No newline at end of file
+</style>