zhuliu преди 7 месеца
родител
ревизия
6d8bf16e76

+ 9 - 9
src/utils/constants.js

@@ -214,19 +214,19 @@ export default {
         {label: '申请人国家/地区', value: 'CO',DBType:['CN'],type:'文本',dataType:1,placeholder:'请输入国省代码,例:94 OR CN'},
         // {label: '发明人国家', value: 'ICO',type:2,dataType:1,placeholder:'请输入发明人国家,例:94 OR CN'},
         {label: '受理局', value: 'GJ',DBType:['WD'],type:'文本',dataType:3,placeholder:'请输入国家,例:CN'},
-        {label: '申请国家', value: 'CO',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入国家,例:CN'},
-        {label: '申请人国家', value: 'PAC',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入申请人国家,例:CN',
+        {label: '申请国家', value: 'CO',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入国家,例:CN'},
+        {label: '申请人国家', value: 'PAC',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入申请人国家,例:CN',
           after:[
-            {label: '申请人省', value: 'PAP',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入申请人省'},
-            {label: '申请人市', value: 'PAA',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入申请人市'},
-            // {label: '申请人区县', value: 'ADD',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入申请人区县'},
+            {label: '申请人省', value: 'PAP',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入申请人省'},
+            {label: '申请人市', value: 'PAA',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入申请人市'},
+            // {label: '申请人区县', value: 'ADD',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入申请人区县'},
           ]
         },
-        {label: '权利人国家', value: 'PEC',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入权利人国家,例:CN',
+        {label: '权利人国家', value: 'PEC',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入权利人国家,例:CN',
           after:[
-            {label: '权利人省', value: 'PEP',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入权利人省'},
-            {label: '权利人市', value: 'PEA',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入权利人市'},
-            // {label: '权利人区县', value: 'RDD',DBType:['inner_CN','inner_WD'],type:'文本',dataType:3,placeholder:'请输入权利人区县'},
+            {label: '权利人省', value: 'PEP',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入权利人省'},
+            {label: '权利人市', value: 'PEA',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入权利人市'},
+            // {label: '权利人区县', value: 'RDD',DBType:['inner_CN','inner_WD'],type:'文本',dataType:1,placeholder:'请输入权利人区县'},
           ]
         },
       ],

+ 1 - 0
src/views/components/import/conditionImport/internal_search/indexMixins.js

@@ -6,6 +6,7 @@ export default{
         async handleAnalyses() {
             var params = {
                 condition: this.condition.searchCondition || '',//检索条件
+                numberQuery:this.condition.NO,
                 customFields:  [],
                 groupField:null,
                 orderDTOList: [

+ 7 - 0
src/views/components/import/conditionImport/internal_search/mixins.js

@@ -13,6 +13,12 @@ export default{
             return ''
           }
         },
+        //号码检索
+        numberQuery:{
+          default: () => {
+            return ''
+          }
+        },
         // 自定义栏位检索条件
         customFields: {
           default: () => {
@@ -194,6 +200,7 @@ export default{
     
           let params = {
             condition: this.searchOption || '',//检索条件
+            numberQuery:this.numberQuery,
             projectId: this.projectId,//项目id
             taskId: this.taskId,//任务id
             countVOS: countVOS,//栏位的聚合入参

+ 1 - 1
src/views/components/import/conditionImport/internal_search/searchResult_internal.vue

@@ -3,7 +3,7 @@
   <div style="background: white; height: 100%" >
     <el-container>
       <el-aside width="300px">
-        <filter_search ref="filter_search" @customTab="handleCustomFields" :searchOption="condition.searchCondition" :customFields="customFields" :projectId="conditionObj.projectId?conditionObj.projectId[0]:undefined"></filter_search>
+        <filter_search ref="filter_search" @customTab="handleCustomFields" :numberQuery="condition.NO" :searchOption="condition.searchCondition" :customFields="customFields" :projectId="conditionObj.projectId?conditionObj.projectId[0]:undefined"></filter_search>
       </el-aside>
       <el-container>
         <el-header style="height:auto !important;padding:0 !important;">