From 3e3a523644168046e60e363a11d59a1ad42ed9d0 Mon Sep 17 00:00:00 2001
From: yaoyanan <794433246@qq.com>
Date: Thu, 18 Mar 2021 17:40:45 +0800
Subject: [PATCH] =?UTF-8?q?1.JDate=E5=B9=B4=E4=BB=BD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=EF=BC=88=E6=A8=A1=E6=80=81=E6=A1=86=E9=9C=80?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=89=202.a-tree-select=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=EF=BC=88value=E5=80=BC?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=9C=80=E5=AE=8C=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JDate.vue       | 27 ++++++++---------
 jero-web/src/components/jero/JTreeSelect.vue | 32 ++++++++++++++++++--
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/components/jero/JDate.vue b/jero-web/src/components/jero/JDate.vue
index 9babe2a1..52c596dc 100644
--- a/jero-web/src/components/jero/JDate.vue
+++ b/jero-web/src/components/jero/JDate.vue
@@ -31,19 +31,17 @@
       :value="momVal"
       :disabled="disabled || readOnly"
       :format="dateFormat"
-      @change="handleMonthChange"
-    />
+      @change="handleMonthChange"/>
     <!--YYYY-->
     <a-date-picker
       v-if="showType === 'year'"
-      mode="year"
       :placeholder="placeholder"
+      mode="year"
       :format="dateFormat"
-      v-model="addForm.all_plan_one"
+      :value="year"
       :open='yearShowOne'
       @openChange="openChangeOne"
-      @panelChange="panelChangeOne"
-      @change="handleYearChange"/>
+      @panelChange="panelChangeOne"/>
   </div>
 </template>
 <script>
@@ -96,9 +94,7 @@
       let dateStr = this.value;
       return {
         yearShowOne:false, //控制年份模态框的显示与否
-        addForm:{
-          all_plan_one:null,//开始年限
-        },
+        year:'',
         decorator:"",
         momVal:!dateStr?null:moment(dateStr,this.dateFormat)
       }
@@ -132,13 +128,11 @@
       },
       // 得到年份选择器的值
       panelChangeOne(value){
-        this.addForm.all_plan_one = value
+        let year = moment(value,this.dateFormat).year().toString() // 处理成字符串
+        this.year = value //组件显示的
+        this.$emit('change',year)
         this.yearShowOne = false
       },
-      handleYearChange(mom,dateStr){
-        this.yearShowOne = false
-        this.$emit('change',dateStr)
-      }
     },
     //2.2新增 在组件内定义 指定父组件调用时候的传值属性和事件类型 这个牛逼
     model: {
@@ -146,4 +140,9 @@
       event: 'change'
     }
   }
+  // let bodyO = document.querySelector()
+  // bodyO.onclick = function (){
+  //   console.log(0)
+  // }
+
 </script>
diff --git a/jero-web/src/components/jero/JTreeSelect.vue b/jero-web/src/components/jero/JTreeSelect.vue
index 92571a55..1e14935a 100644
--- a/jero-web/src/components/jero/JTreeSelect.vue
+++ b/jero-web/src/components/jero/JTreeSelect.vue
@@ -12,6 +12,7 @@
     :value="treeValue"
     :treeData="treeData"
     :multiple="multiple"
+    :show-search="!multiple"
     @change="onChange"
     @search="onSearch">
   </a-tree-select>
@@ -128,7 +129,7 @@
           this.$emit('change', this.value,text)
         }
       },
-      initDictInfo(){
+      initDictInfo(){ //取出父组件传过来的code，text，tableName
         let arr = this.dict.split(",")
         this.tableName = arr[0]
         this.text = arr[1]
@@ -150,6 +151,7 @@
             hasChildField:this.hasChildField,
             condition:this.condition
           }
+          console.log(param)
           getAction(this.url,param).then(res=>{
             if(res.success){
               console.log(res)
@@ -184,7 +186,7 @@
           }
         }
       },
-      loadRoot(){
+      loadRoot(){ // 初始化树
         let param = {
           pid:this.pidValue,
           tableName:this.tableName,
@@ -224,7 +226,31 @@
 
       },
       onSearch(value){
-        console.log(value)
+        let param = {
+          code:this.code,
+          keyword:value,
+          pidField:this.pidField,
+          tableName:this.tableName,
+          text:this.text
+        }
+        getAction('/sys/dict/queryTreeDataByKeyword',param).then((res)=>{
+          if (res.success){
+            //设置是否是叶子节点（是否能展开）
+            for(let i of res.result){
+              i.value = i.key
+              if(i.leaf==false){
+                i.isLeaf=false
+              }else if(i.leaf==true){
+                i.isLeaf=true
+              }
+            }
+            //赋值树的数据
+            this.treeData = []
+            this.treeData = [...res.result]
+            // this.treeData = fn(res.result)
+            // fn(res.result)
+          }
+        })
       },
       getCurrTreeData(){
         return this.treeData