Merge branch 'dev'

src/components/system/staffRecord.vue

@@ -60,6 +60,11 @@
           <span @click="onSearch('staff', scope.row.staff_id)" class="cell-link">{{scope.row.staff_name}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="移交原因">
+        <template slot-scope="scope">
+          {{scope.row.reason | reasonFormat}}
+        </template>
+      </el-table-column>
       <el-table-column prop="start_at" label="设备开始使用时间"></el-table-column>
       <el-table-column label="设备使用结束时间">
         <template slot-scope="scope">
@@ -86,6 +91,7 @@
           teacher_id: '',
           staff_id: ''
         },
+        //reasonList: ,
         teacherList: [],
         staffList: [],
         tableData: [],
@@ -101,6 +107,30 @@
       this.getStaffList();
       this.getData()
     },
+    filters: {
+      reasonFormat(val) {
+        var arr = [{
+          id: 0,
+          name: '人员入职',
+        },{
+          id: 1,
+          name: '人员离职',
+        },{
+          id: 2,
+          name: '请假',
+        },{
+          id: 3,
+          name: '其它',
+        }];
+        var res = '';
+        arr.forEach(value => {
+          if (value.id == val) {
+            res = value.name
+          }
+        })
+        return res
+      },
+    },
     methods: {
       getTeacherList() {
         let json = { page: 1, limit: 1000 };