From e219ccb67e233945ad59abcb16161f854989efdc Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期四, 12 一月 2023 19:34:46 +0800
Subject: [PATCH] 高级搜索

---
 src/components/SeniorTranfer.vue |   32 +++++++++++++++++++-------------
 src/views/SeniorView.vue         |    2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/components/SeniorTranfer.vue b/src/components/SeniorTranfer.vue
index 2cf8ed0..91fb4a8 100644
--- a/src/components/SeniorTranfer.vue
+++ b/src/components/SeniorTranfer.vue
@@ -99,6 +99,7 @@
       treeDimensions: { children: 'children', title: 'Desc', key: 'Code' },
       parentCodeSearch: '',
       fitst: true,
+      copy:'1',
     }
   },
   computed: {
@@ -205,7 +206,7 @@
       }
       this.treeLoading = true
       url(params).then(res => {
-        this.treeData = this.formatTreeData(res.Data,0)
+        this.treeData = this.formatTreeData(res.Data)
         // console.log(this.treeData);
         // if (url.toString().indexOf('GetCpcClass') > 0) {
         //   // this.treeData
@@ -310,7 +311,7 @@
       }
       this.treeLoading = true
       url(params).then(res => {
-        this.treeData = this.formatTreeData(res.Data,1)
+        this.treeData = this.formatTreeData(res.Data)
         // console.log(this.treeData);
         if (url.toString().indexOf('GetStraindustryTree') > 0) {
           // this.treeData
@@ -363,25 +364,22 @@
       })
     },
     //缁熶竴鏍煎紡 key title
-    formatTreeData(listData,search) {
+    formatTreeData(listData) {
+      // console.log(search);
       let tempList = []
       let that = this
       function flatten(list = []) {
         list.forEach(item => {
-          if(search===1){
-            item.title = that.activeKey === 'cpcCodeSort' || (that.activeKey === 'ipcCodeSort' && item.ParentCode) ? item.Code + " " + item[that.treeDimensions.title] : item[that.treeDimensions.title]
-          }else{
-            item.title= item.valueshow
-          }
-          
-          // console.log(item,that.treeDimensions);
-          // item.valueshow = that.treeDimensions.valueshow
+          item.title= item.valueshow
           item.key = item[that.treeDimensions.key]
           flatten(item.children);
+          
         });
+       
       }
       tempList = JSON.parse(JSON.stringify(listData))
       flatten(tempList);
+      that.copy=''
       return tempList
     },
     transferChange(targetKeys) {
@@ -393,7 +391,7 @@
       itemSelect(eventKey, !isChecked(checkedKeys, eventKey));
     },
     onLoadData(treeNode) {
-      // console.log(treeNode);
+      console.log(treeNode);
       return new Promise(resolve => {
         if (treeNode.dataRef.children) {
           resolve();
@@ -405,13 +403,21 @@
           if (this.activeKey == 'cpcCodeSort') {
             url = GetCpcClassTree
           }
+          this.copy=treeNode.dataRef.key
+          
           url({
             // year: this.activeKey == 'cpcCodeSort' ? this.ICPYear : undefined,
             year: this.activeKey == 'ipcCodeSort' ? this.ICPYear : undefined,
 
             parentCode: treeNode.dataRef.key
+
           }).then(res => {
-            treeNode.dataRef.children = this.formatTreeData(res.Data)
+            // if(this.parentCodeSearch){
+            //   treeNode.dataRef.children = this.formatTreeData(res.Data,0)
+            // }else{
+              treeNode.dataRef.children = this.formatTreeData(res.Data)
+            // }
+            
             this.treeData = [...this.treeData];
             resolve();
           })
diff --git a/src/views/SeniorView.vue b/src/views/SeniorView.vue
index f590298..ead7c23 100644
--- a/src/views/SeniorView.vue
+++ b/src/views/SeniorView.vue
@@ -226,7 +226,7 @@
   keyWords: [{ code: 'title0|abstract0', name: '鏍囬/鎽樿' }, { code: 'title0|abstract0|claim0', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰' }, { code: 'title0|abstract0|claim0|description0', name: '鏍囬/鎽樿/鏉冨埄瑕佹眰/璇存槑涔�' }, { code: 'title0', name: '鏍囬' }, { code: 'abstract0', name: '鎽樿' }, { code: 'claim0', name: '鏉冨埄瑕佹眰' }, { code: 'description0', name: '璇存槑涔�' }],
   name: [{ code: 'assigneeHarmonizedName', name: '鐢宠浜�' }, { code: 'inventorHarmonizedName', name: "鍙戞槑浜�" }],
   address: [{ code: 'address', name: '鐢宠浜哄湴鍧�' }, { code: 'province', name: '涓浗鐢宠浜虹渷' }, { code: 'city', name: '涓浗鐢宠浜哄湴甯�' }, { code: 'county', name: '涓浗鐢宠浜哄尯鍘�' }, { code: 'assigneeCrossCountryCount', name: '鐢宠浜哄浗鍒�' }, { code: 'country', name: '鍏紑鍥藉埆' }],
-  fenlei: [{ code: 'ipcCodeSort', name: 'IPC(鍥介檯鍒嗙被)' }, { code: 'cpcCodeSort', name: 'CPC(鍚堜綔涓撳埄鍒嗙被)' }, { code: 'industrycn', name: '鍥芥皯缁忔祹琛屼笟鍒嗙被' }, { code: 'stratregicIndustry', name: '鎴樼暐鎬ф柊鍏翠骇涓氬垎绫�' },{ code: 'locarnoCodeSort', name: '娲涜喀璇哄垎绫�' }],
+  fenlei: [{ code: 'ipcCodeSort', name: 'IPC(鍥介檯鍒嗙被)' }, { code: 'cpcCodeSort', name: 'CPC(鍚堜綔涓撳埄鍒嗙被)' }, { code: 'industrycn', name: '鍥芥皯缁忔祹琛屼笟鍒嗙被' }, { code: 'strategicIndustryCode', name: '鎴樼暐鎬ф柊鍏翠骇涓氬垎绫�' },{ code: 'locarnoCodeSort', name: '娲涜喀璇哄垎绫�' }],
   haoma: [{ code: 'publicationNumber', name: '鍏紑鍙�' }, { code: 'applicationNumber', name: '鐢宠鍙�' }, { code: 'pctNumber', name: 'PCT鍙�' },],
   // {code:'',name:'浼樺厛鏉冨彿'}
   date: [{ code: 'publicationDate', name: '鍏紑鏃�' }, { code: 'filingDate', name: '鐢宠鏃�' }, { code: 'grantDate', name: '鎺堟潈鏃�' }, { code: 'priorityDate', name: '浼樺厛鏉冩棩' }],

--
Gitblit v1.8.0