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

 Conflicts:
	src/views/login.vue

src/views/core/edu/plan/index.vue

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" hangsheTree></org-tree>
+                  @click="clickTreeNode" ></org-tree>
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">

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

@@ -39,14 +39,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  prop="dateTime" label="培训开始时间">
+              <el-form-item  prop="trainingStartDateTime" label="培训开始时间">
                 <el-date-picker required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
                   type="datetime" placeholder="选择日期"  @change="startDateChanged">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="dateTime" label="培训结束时间">
+              <el-form-item prop="trainingEndDateTime" label="培训结束时间">
                 <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
                   type="datetime" placeholder="选择日期">
                 </el-date-picker>
@@ -59,46 +59,13 @@
               </el-form-item>
             </el-col>
 
-            <!-- 主持人 -->
-            <!-- <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="hostId" label="主持人">
-                <k-select
-                  v-model="formData.hostId"
-                  url="/user/find/all"
-                  :params="{ orgId: formData.orgId }"
-                  placeholder="请选择主持人"
-                ></k-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="recorderId" label="记录人">
-                <k-select
-                  v-model="formData.recorderId"
-                  url="/user/find/all"
-                  :params="{ orgId: formData.orgId }"
-                  placeholder="请选择记录人"
-                ></k-select>
-              </el-form-item>
-            </el-col> -->
-            <!-- 截止日期 -->
-            <!-- <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="dateTime" label="培训时间">
-                <el-date-picker
-                  v-model="formData.dateTime"
-                  type="datetime"
-                  placeholder="选择日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-            <!-- 总结 -->
             <el-col :span="24">
               <el-form-item v-if="formData.id" prop="note" label="总结">
                 <k-textarea v-model="formData.note" placeholder="请输入总结" :length="2000" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item v-if="formData.id" label="参与人员">
+              <el-form-item v-if="formData.id" prop="absenceList"  label="参与人员">
                 <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
                   :params="{ orgId: formData.orgId }" placeholder="请选择参与人员" @select="absenceUserSelectChanged"></k-select>
               </el-form-item>

src/views/core/materials/index.vue

@@ -192,8 +192,8 @@
           <el-input v-model="form.remark" placeholder="请输入备注" maxlength="200" show-word-limit/>
         </el-form-item>
         <el-form-item label="附件" prop="fileList">
-          <K-file-upload ref="upload" 
-          :defaultValue="formFileListDefualtValue" 
+          <K-file-upload ref="upload"
+          :defaultValue="formFileListDefualtValue"
           v-model="form.fileList"/>
         </el-form-item>
       </el-form>

src/views/system/dept/index.vue

@@ -571,21 +571,21 @@ export default {
       this.handleQuery();
     },
     /** 新增按钮操作 */
-    async  handleAdd() {
-      console.log(this.queryParams.parentId, "this.queryParams.parentId");
-      console.log(this.form.parentId, "this.form.parentId");
+    async handleAdd() {
+      // console.log(this.queryParams.parentId, "this.queryParams.parentId");
+      // console.log(this.form.parentId, "this.form.parentId");
       this.reset();
       if (this.queryParams.parentId != undefined) {
         if (this.pId != -1) {
-          await  deptTreeSelect().then((response) => {
+          await deptTreeSelect().then((response) => {
             this.deptOptions2 = response.data;
             this.defaultKeys.push(response.data[0].id);
           });
         }
         this.form.parentId = this.queryParams.parentId;
+        this.open = true;
+        this.title = "新增";
       }
-      this.open = true;
-      this.title = "新增";
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {