Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/components/orgTreeSelect/index.vue

@@ -241,6 +241,7 @@ export default {
         let checkNodes = this.$refs.tree.getCheckedNodes();
         let type = this.queryForm.type;
         let recursionFn = function (tree) {
+          console.log(tree,'TREE')
           tree.forEach((item) => {
             if (type == item.type) {
               checkNodes.push(item);

src/views/core/drill/task/dialog.info.vue

@@ -68,8 +68,7 @@
             span="2"
             label="预设案由"
           >
-            <!-- {{ formData.presetCase }} -->
-            江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号
+             {{ formData.presetCase }}
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"

src/views/core/reportForms/drill.vue

@@ -26,7 +26,7 @@
             noResultsText="没有搜索结果"
           />
         </el-form-item>
-        <el-form-item label="培训任务名称:" label-width="50">
+        <el-form-item label="演练任务名称:" label-width="50">
           <el-select v-model="queryParams.planId" @change="changeHandler">
             <el-option
               v-for="item in options"
@@ -211,9 +211,10 @@ export default {
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
+        range: [new Date(), new Date()],
       };
 
-      this.getList();
+      //this.getList();
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/core/reportForms/eduTraining.vue

@@ -208,8 +208,9 @@ export default {
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
+        date:new Date(),
       };
-      this.getList();
+     // this.getList();
     },
 
     /** 导出按钮操作 */