Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/system/user.js

@@ -25,6 +25,14 @@ export function dictionListUser(query) {
     params: query
   })
 }
+
+export function userListData(query) {
+  return request({
+    url: '/system/user/userListData',
+    method: 'get',
+    params: query
+  })
+}
 export function selectrolesByOrgId(query) {
   return request({
     url: '/system/user/selectrolesByOrgId',

src/components/common/userselect.vue

@@ -25,7 +25,7 @@
 <script>
 import sync from "../utils/computed.sync";
 import { groupBy } from "lodash";
-import { dictionListUser } from "@/api/system/user";
+import {dictionListUser, userListData} from "@/api/system/user";
 
 export default {
   data() {
@@ -125,7 +125,7 @@ export default {
       );
     },
     async refresh() {
-      dictionListUser(this.params).then(items=>{
+      userListData(this.params).then(items=>{
         // debugger
         if(items.data && Array.isArray(items.data)){
         items=items.data;

src/views/core/edu/task/dialog.newTask.vue

@@ -20,6 +20,7 @@
             <el-col :span="12">
               <el-form-item  prop="trainingStartDateTime" label="培训开始时间">
                 <el-date-picker required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
+                                format="yyyy-MM-dd HH:mm"
                                 type="datetime" placeholder="选择日期"  @change="startDateChanged">
                 </el-date-picker>
               </el-form-item>
@@ -27,6 +28,7 @@
             <el-col :span="12">
               <el-form-item prop="trainingEndDateTime" label="培训结束时间">
                 <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
+                                format="yyyy-MM-dd HH:mm"
                                 type="datetime" placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>