设备移交 - 新增移交时间选择；优化移交确认框显示、移交时间显示；修复顾问列表包含离职人员问题

设备监管记录 - 新增设备名、顾问名点击搜索

src/App.vue

@@ -108,4 +108,15 @@ body {
   visibility: hidden;
   clear: both;
 }
+
+.page-div {
+  padding-top: 20px;
+}
+
+.cell-link {
+  /*color: #409EFF;*/
+  text-decoration: underline;
+  cursor: pointer;
+  user-select: none;
+}
 </style>

src/components/system/staff.vue

@@ -359,8 +359,4 @@
     justify-content: flex-start;
     align-items: center;
   }
-
-  .page-div {
-    padding-top: 20px;
-  }
 </style>

src/components/system/staffRecord.vue

@@ -50,8 +50,16 @@
 
     <el-table :data="tableData">
       <el-table-column prop="id" label="ID"></el-table-column>
-      <el-table-column prop="teacher_name" label="设备名称"></el-table-column>
-      <el-table-column prop="staff_name" label="当前顾问"></el-table-column>
+      <el-table-column label="设备名称">
+        <template slot-scope="scope">
+          <span @click="onSearch('teacher', scope.row.teacher_id)" class="cell-link">{{scope.row.teacher_name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="staff_name" label="当前顾问">
+        <template slot-scope="scope">
+          <span @click="onSearch('staff', scope.row.staff_id)" class="cell-link">{{scope.row.staff_name}}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="start_at" label="设备开始使用时间"></el-table-column>
       <el-table-column label="设备使用结束时间">
         <template slot-scope="scope">
@@ -74,7 +82,7 @@
     data() {
       return {
         searchFrom: {
-          type: '-1',
+          type: '1',
           teacher_id: '',
           staff_id: ''
         },
@@ -121,7 +129,10 @@
         });
       },
 
-      onSearch(){
+      onSearch(type, id){
+        if (type) {
+          this.searchFrom[`${type}_id`] = id;
+        }
         this.getData();
       },
 

src/components/teacher/index.vue

@@ -25,10 +25,10 @@
       </el-form-item>
       <el-form-item label="任务日期">
         <el-date-picker
-          style="width: 125px;"
+          style="width: 140px;"
+          type="date"
           v-model="searchFrom.task_date"
           value-format="yyyy-MM-dd"
-          type="date"
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
@@ -57,7 +57,7 @@
             <a :href="scope.row.qr" target="_blank" class="clearfix">
               <img class="avatar" :src="scope.row.qr" alt="二维码">
             </a>
-            <div style="display: flex;">
+            <div>
               老师名：{{scope.row.name}}
               <br>
               微信号：{{scope.row.alias}}
@@ -66,7 +66,7 @@
               <br>
               顾问：{{scope.row.adviser}}
               <br>
-              开始时间：{{scope.row.teacher_start}}
+              开始时间：<span style="display: inline-block;width: 72px;vertical-align: text-top;line-height: 16px;">{{scope.row.teacher_start}}</span>
             </div>
           </div>
         </template>
@@ -256,8 +256,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="移交时间：" prop="transfer_at">
+          <div style="display: flex;">
             <el-date-picker
-            v-model="transfer.form.transfer_at" type="date" value-format="yyyy-MM-dd" :clearable="false" placeholder="选择日期"></el-date-picker>
+              v-model="transfer.form.transfer_at" :clearable="false" value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetime" placeholder="选择时间"></el-date-picker>
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer">
@@ -324,16 +327,13 @@
           title:'班级列表',
           id: ''
         },
-        teacherTypeOption: [
-          {
+        teacherTypeOption: [{
           id: 0,
           label: '老师'
-          },
-          {
+        }, {
           id: 1,
           label: '新星妈妈'
-          }
-        ],
+        }],
         phoneNumObj:{}
       }
     },
@@ -442,7 +442,7 @@
         this.transfer.show = !this.transfer.show;
         if (this.transfer.show){
           if (this.transfer.staff[0] === 0) {
-            let json = { limit: 1000, page: 1 };
+            let json = { limit: 1000, page: 1, status: 0 }; // status 0 在职
             getStaffListApi(json).then(res => {
               this.transfer.staff = res.list;
             });
@@ -463,10 +463,11 @@
         this.$refs['transferForm'].validate((valid) => {
           if (valid) {
 
-            this.$confirm(`确认将
-              ${this.transfer.form.teacher_name} 移交给
-              ${this.transfer.form.staff_name} 移交开始时间
+            this.$confirm(`确定将
+              <span style="color: red;">${this.transfer.form.teacher_name}</span> 移交给
+              <span style="color: red;">${this.transfer.form.staff_name}</span> ?<br>移交开始时间
               ${this.transfer.form.transfer_at}`, '提示', {
+              dangerouslyUseHTMLString: true,
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'