Merge remote-tracking branch 'origin/master'

src/views/course/courseTrafficLog/index.vue

@@ -203,7 +203,9 @@ export default {
         this.courseTrafficLogList = response.rows;
         this.total = response.total;
         this.loading = false;
-      });
+      }).finally(()=>{
+        this.loading = false;
+      })
     },
     // 取消按钮
     cancel() {

src/views/course/courseWatchLog/index.vue

@@ -5,12 +5,12 @@
         <el-select v-model="queryParams.userId" remote placeholder="用户名/手机号" filterable clearable  style="width: 100%;"
                    @keyup.enter.native="handleQuery"
                    :remote-method="remoteGetFsUserList"
-                   @clear="handleClear"
                    :loading="queryUserLoading"
         >
           <el-option
             v-for="dict in fsUserList"
-            :key="`${dict.nickname} - ${dict.phone}`"
+            :key="`${dict.nickname} - ${dict.userId}`"
+            :label="`${dict.nickname} - ${dict.userId}`"
             :value="dict.userId">
           </el-option>
         </el-select>
@@ -240,6 +240,12 @@ export default {
       }
     })
 
+    getFsUserList({}).then(res=>{
+      if(res.code === 200) {
+        this.fsUserList = res.data
+      }
+    })
+
     this.getDicts('user_source_type').then(response => {
       this.userSourceTypeOptions = response.data;
     })

src/views/course/courseWatchLog/statistics.vue

@@ -5,13 +5,12 @@
         <el-select v-model="queryParams.userId" remote placeholder="用户名/手机号" filterable clearable  style="width: 100%;"
                    @keyup.enter.native="handleQuery"
                    :remote-method="remoteGetFsUserList"
-                   @clear="handleClear"
                    :loading="queryUserLoading"
         >
           <el-option
             v-for="dict in fsUserList"
-            :key="`${dict.nickname} - ${dict.phone}`"
-            :label="`${dict.nickname} - ${dict.phone}`"
+            :key="`${dict.nickname} - ${dict.userId}`"
+            :label="`${dict.nickname} - ${dict.userId}`"
             :value="dict.userId">
           </el-option>
         </el-select>
@@ -174,6 +173,11 @@ export default {
         this.companyUserList = res.data
       }
     })
+    getFsUserList({}).then(res=>{
+      if(res.code === 200) {
+        this.fsUserList = res.data
+      }
+    })
   },
   methods: {
     handleClear(){

src/views/course/courseWatchLog/watchLog.vue

@@ -5,13 +5,12 @@
         <el-select v-model="queryParams.userId" remote placeholder="用户名/手机号" filterable clearable  style="width: 100%;"
                    @keyup.enter.native="handleQuery"
                    :remote-method="remoteGetFsUserList"
-                   @clear="handleClear"
                    :loading="queryUserLoading"
         >
           <el-option
             v-for="dict in fsUserList"
-            :key="`${dict.nickname} - ${dict.phone}`"
-            :label="`${dict.nickname} - ${dict.phone}`"
+            :key="`${dict.nickname} - ${dict.userId}`"
+            :label="`${dict.nickname} - ${dict.userId}`"
             :value="dict.userId">
           </el-option>
         </el-select>
@@ -381,6 +380,11 @@ export default {
     getMyQwUserList().then(response => {
       this.myQwUserList = response.data;
     });
+    getFsUserList({}).then(res=>{
+      if(res.code === 200) {
+        this.fsUserList = res.data
+      }
+    })
   },
   methods: {
     handleClear(){

src/views/users/user/transferLog.vue

@@ -43,7 +43,7 @@
             :value="item.dictValue"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="审批处理时间" prop="processedAt">
+      <el-form-item label="审批时间" prop="processedAt">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.processedAt"
           type="date"