Merge branch 'product' into noveltySearch2

src/utils/axios.js

@@ -50,7 +50,7 @@ _axios.interceptors.request.use(
       // config.headers[constants.tokenHeader] = token
     }
     config.headers['x-project-id'] = Store.getters.projectId || ''
-    config.headers['X-Forwarded-For'] = await getLocalIPAddress()
+    // config.headers['X-Forwarded-For'] = await getLocalIPAddress()
     if (config.loading) {
       loadingInstance = Loading.service({})
     }

src/utils/model/RichText/index.vue

@@ -98,12 +98,14 @@ export default {
       
     })
     window.onkeydown = this.checkKeyPress
-    if(this.autoFocus){
-      this.$refs.myEditBox.focus()
-    }
+    
   },
   methods: {
-
+    setFocus(){
+      if(this.autoFocus){
+        this.$refs.myEditBox.focus()
+      }
+    },
 
     clickBtn(method){
      

src/views/components/import/conditionImport/searchResult.vue

@@ -625,7 +625,7 @@ export default {
         publicDate: "PD",
         applicationDate: "AD",
       };
-      this.queryParams.OrderBy = o[data.prop];
+      this.queryParams.OrderBy = o[data.prop] || data.prop;
       this.queryParams.OrderByType = data.order.toUpperCase();
       this.getList();
     },

src/views/layout/components/help.vue

@@ -176,6 +176,7 @@ export default {
     div{
         border-bottom: 1px solid var(--color1);
         padding: 5px 0;
+        overflow: hidden;
     }
     div:last-child{
         border-bottom: none;

src/views/project/patentDetails/components/PatentField.vue

@@ -379,6 +379,9 @@ export default {
               break;
             case 6://多选和树
             case 5:
+            case 7:
+            case 8:
+            case 9:
               var a = []
               // item.selectedValue = []
               a = (item.selected && item.selected.length > 0) ? item.selected.map(item => item.valueId) : []

src/views/report/InvalidResponse/components/powerManage/powerManage.vue

@@ -181,7 +181,7 @@ export default {
   computed: {},
   created() {},
   async mounted() {
-    this.column = await this.$commonJS.getCustomField('claimManage')
+    this.column = await this.$commonJS.getCustomField('claimManage',{projectId:this.projectId})
     this.checkList = this.column.map(item=>{
         if(!item.ifHidden){
            return item.field 
@@ -225,6 +225,7 @@ export default {
         }
         var params = {
             tableName: 'claimManage',
+            projectId:this.projectId,
             value: this.column,
         }
         this.$api.setTableColumns(params).then((response) => {
@@ -277,7 +278,7 @@ export default {
             case 'historyContent1'://第一次修改后权利要求
                 obj = this.getModifyClaim(row,1,'object')
                 params.content = value
-                params.isFirst = true
+                params.ifFirst = true
                 if(obj){
                     params.description = obj.description
                 }
@@ -285,7 +286,7 @@ export default {
             case 'historyContent2'://第一次修改后权利要求
                 obj = this.getModifyClaim(row,2,'object')
                 params.content = value
-                params.isFirst = false
+                params.ifFirst = false
                 if(obj){
                     params.description = obj.description
                 }
@@ -293,7 +294,7 @@ export default {
             case 'historyDescription1'://第一次修改说明
                 obj = this.getModifyDescription(row,1,'object')
                 params.description = value
-                params.isFirst = true
+                params.ifFirst = true
                 if(obj){
                     params.content = obj.content
                 }
@@ -301,7 +302,7 @@ export default {
             case 'historyDescription2'://第二次修改说明
                 obj = this.getModifyDescription(row,2,'object')
                 params.description = value
-                params.isFirst = false
+                params.ifFirst = false
                 if(obj){
                     params.content = obj.content
                 }

src/views/report/InvalidResponse/components/reasonsAndEvidence/common.js

@@ -47,7 +47,7 @@ export default {
       },
     created() {},
     async mounted() {
-      this.column = await this.$commonJS.getCustomField(this.type)
+      this.column = await this.$commonJS.getCustomField(this.type,{ projectId: this.projectId })
       this.init()
       this.getClaims()
       // this.getCompareLiterature()
@@ -384,7 +384,9 @@ export default {
             // if(!(parts.length>1 && parts[parts.length - 1]!='claimText'+row.id)){
             //   return  
             // }
-            
+            if(['courtOpinions1','courtOpinions2'].indexOf(this.editMessage.field.field)!=-1){
+              this.closeEdit()
+            }
         }
         // this.editField = null
       },
@@ -395,7 +397,7 @@ export default {
       },
       //修改数据
       changeMessage(field,row,value){
-        var value1 = this.getColumnData(this.editMessage.row,field)
+        var value1 = this.getColumnData(this.editMessage.data,field)
         if(value == value1){
           this.closeEdit()
           return
@@ -420,19 +422,30 @@ export default {
           params[part] = value
           api = 'editFeature'
         }
-        
+        var message = this.$message({
+          message: '信息保存中...',
+          type: 'warning',
+          duration:0
+        });
         this.$api[api](params).then(response=>{
           if(response.code == 200){
+            message.close()
             this.$message.success('编辑成功')
+            
             if(sign){
               this.init()
             }else{
               this.getData(row,field,value)
             }
             this.closeEdit()
+            
           }
         }).catch(error=>{
-
+          message.close()
+          this.$message.success('编辑失败')
+          if(this.$refs[field.field+row.proofGroupId] && this.$refs[field.field+row.proofGroupId][0]){
+            this.$refs[field.field+row.proofGroupId][0].setFocus()
+          }
         })
       },
       //添加特征
@@ -450,21 +463,44 @@ export default {
         }else{
           obj.featureSort = Number(featureSort) + 1
         }
+        this.loading = true
+        var that = this
         this.$api.addFeature(obj).then(response=>{
           if(response.code == 200){
+            that.loading = false
             var data = {
               invalidReasonDTO:row.invalidReasonDTO,
               ...obj,
               proofGroupId:response.data,
             }
+            that.updateSort(obj.featureSort,obj.invalidStatueId,'add')
             if(type == 'up'){
-              this.tableData.splice(index,0,data)
+              that.tableData.splice(index,0,data)
             }else{
-              this.tableData.splice(index+1,0,data)
+              that.tableData.splice(index+1,0,data)
             }
-            this.getSpanArr(this.tableData)
+            that.getSpanArr(this.tableData)
           }
+        }).catch(error=>{
+          this.loading = false
+        })
+      },
+      //更新序号
+      updateSort(sort,invalidStatueId,type){
+        var arr = this.tableData.filter(item=>{
+          return item.invalidReasonDTO.invalidStatueId == invalidStatueId
         })
+        for(var i = 0;i<arr.length;i++){
+          var featureSort = Number(arr[i].featureSort)
+          if(featureSort>= sort){
+            if(type == 'add'){
+              arr[i].featureSort = featureSort+1
+            }else if(type == 'del'){
+              arr[i].featureSort = featureSort-1
+            }
+          }
+        }
+        return true
       },
       //删除无效理由
       delInvalidStatue(scope){

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_1.vue

@@ -42,7 +42,7 @@
       </el-container>
  
       <addStatute ref="addStatute" :claims="claims" :projectId="projectId" :statueType='statueType' @save="save"></addStatute>
-      <fields ref="field" :type="type" @getFieldList="getFieldList"></fields>
+      <fields ref="field" :type="type" :projectId="projectId" @getFieldList="getFieldList"></fields>
     </div>
 </template>
 <script>

src/views/report/InvalidResponse/components/reasonsAndEvidence/details_2.vue

@@ -20,7 +20,7 @@
                                     <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
                                     <el-option label="全部无效"  value="全部无效"></el-option>
                                 </el-select>
-                                <my-RichText v-else :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
+                                <my-RichText v-else :ref="item.field + scope.row.proofGroupId" :autoFocus="true" :value="getColumnData(scope.row,item)" @blur="(value)=>changeMessage(item,scope.row,value)"></my-RichText>
                             </div>
                             
                             <div class="text" v-else >
@@ -57,7 +57,7 @@
       </el-container>
  
       <addStatute ref="addStatute" :claims="claims" :projectId="projectId" :statueType='statueType' @save="save"></addStatute>
-      <fields ref="field" :type="type" @getFieldList="getFieldList"></fields>
+      <fields ref="field" :type="type" :projectId="projectId" @getFieldList="getFieldList"></fields>
     </div>
 </template>
 <script>
@@ -237,11 +237,13 @@ export default {
             var params = {
                 proofGroupId:row.proofGroupId
             }
-           
+            var featureSort = row.featureSort
+            var invalidStatueId = row.invalidStatueId
             this.$api.delFeature(params).then(response=>{
                 if(response.code == 200){
                     this.$message.success('删除成功')
                     this.loading = false
+                    this.updateSort(featureSort,invalidStatueId,'del')
                     this.tableData.splice(index,1)
                     this.getSpanArr(this.tableData)
                 }