Browse Source

修改创建报告的时候专利无法导入问题

zhuliu 4 tháng trước cách đây
mục cha
commit
496621bc5f

+ 7 - 2
src/views/components/import/conditionImport/components/projectListDialog.vue

@@ -141,7 +141,12 @@
               ></el-tag>
             </div>
           </el-form-item>
-
+          <el-form-item v-if="form.importToId && form.importToType!=2" label="标引操作规则:">
+              <el-select v-model="indexingRules"  placeholder="请选择标引操作规则" >
+                  <el-option label="覆盖原标引结果" :value="2"></el-option>
+                  <el-option label="新增标引结果" :value="1"></el-option>
+              </el-select>
+          </el-form-item>
 
           <el-form-item label="下载内容">
             <el-select
@@ -495,7 +500,7 @@ export default {
                             fieldType:choose.fieldType,
                             fieldId:choose.fieldId,
                             fieldValue:[choose.fieldValueId],
-                            optionType:2
+                            optionType:this.indexingRules
                         }
                     )
                 }else{

+ 5 - 2
src/views/components/import/task/components/index.vue

@@ -415,10 +415,13 @@ export default {
           try{
             let data = JSON.parse(row.searchCondition)
             if(data.publicNo){
-              content += `<p>公开公告号:${data.publicNo}`
+              content += `<p>公开公告号:${data.publicNo}</p>`
             }
             if(data.appNo){
-              content += `<p>申请号:${data.appNo}`
+              content += `<p>申请号:${data.appNo}</p>`
+            }
+            if(data.patentNo){
+              content += `<p>专利号:${data.patentNo}</p>`
             }
           }catch(e){
             content = row.searchCondition

+ 4 - 1
src/views/report/components/dialog/addAndEditReport.vue

@@ -1046,9 +1046,12 @@ export default {
     },
     //导入专利
     patentImport(){
+      var searchCondition = {
+        patentNo:this.form.signPatentNo.trim()
+      }
       var params = {
           "type": "2",
-          "searchCondition": this.form.signPatentNo.trim(),
+          "searchCondition": JSON.stringify(searchCondition),
           "importContent": 1111,
       }
       this.$api.addImportTask(params).then(response=>{