Prechádzať zdrojové kódy

修改批量修改复审委意见等和去除trim()

zhuliu 2 rokov pred
rodič
commit
d255da25ff

+ 2 - 2
RMS-FrontEnd/src/views/components/articles/components/features.vue

@@ -35,11 +35,11 @@
 
                 <el-checkbox  :label="scope.row.id" @change="getFunInfo(scope.row)" style="display: flex; align-items: center;">
                   <!-- <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input> -->
-                  <div style="white-space:normal; word-break:break-all;text-align:left">{{scope.row.content.trim()}}</div>
+                  <div style="white-space:normal; word-break:break-all;text-align:left">{{scope.row.content}}</div>
                 </el-checkbox>
 
              </el-checkbox-group>  
-             <span v-else>{{scope.row.content.trim()}}</span>
+             <span v-else>{{scope.row.content}}</span>
             </div>
             
           </template>

+ 5 - 5
RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -70,11 +70,11 @@
                   </el-checkbox>
                </el-checkbox-group> -->
                <p v-if="typeFto==1" style="width:100%;outline: #dcdfe6;" 
-                v-html="scope.row.content.trim()" >
+                v-html="scope.row.content" >
               </p>
               <el-checkbox-group v-else v-model="checkList" >
                   <el-checkbox :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
-                    <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content.trim()}}</el-input>
+                    <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
                   </el-checkbox>
                </el-checkbox-group>
             </template>
@@ -342,13 +342,13 @@
           }
           for (var i = 0; i < this.row.length; i++) {
             if (i < row.length - 1) {
-              str = str + row[i].content.trim() 
+              str = str + row[i].content
               strText = strText + row[i].explainText 
               targetDescription = targetDescription + row[i].targetDescription
               let Index = this.tableData1.findIndex(item => { return item.id == row[i].id })
               this.tableData1.splice(Index, 1)
             } else if (i == row.length - 1) {
-              str = str + row[i].content.trim()
+              str = str + row[i].content
               targetDescription = targetDescription + row[i].targetDescription
               strText = strText + row[i].explainText
             }
@@ -652,7 +652,7 @@
                   a.forEach(item=>{
                     if (!res.data.patentRightVos[i].features[m].hasOwnProperty(item)) {//hasOwnProperty判断属性是否存在
                       if(item == 'explainText'){
-                        res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut.trim()
+                        res.data.patentRightVos[i].features[m][item]=res.data.patentRightVos[i].features[m].contentOut
                       }else{
                         res.data.patentRightVos[i].features[m][item]=''
                       }

+ 1 - 1
RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ProductResult.vue

@@ -88,7 +88,7 @@
             
                     <el-table-column prop="content" label="特征" align="center" width="300px">
                         <template slot-scope="scope">   
-                            <div style="width:100%;outline: #dcdfe6;white-space:normal; word-break:break-all;text-align:left" id="preview"  v-html="scope.row.content.trim()"  ></div>
+                            <div style="width:100%;outline: #dcdfe6;white-space:normal; word-break:break-all;text-align:left" id="preview"  v-html="scope.row.content"  ></div>
                         </template>
                     </el-table-column>
                     

+ 1 - 1
RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Claims.vue

@@ -66,7 +66,7 @@
                   <el-checkbox-group v-model="checkList" >
 
                       <el-checkbox  :label="scope.row.id" @change="getFunInfo(scope.row,scope)" style="display: flex; align-items: center;">
-                        <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content.trim()}}</el-input>
+                        <el-input type="textarea" style="width:250px" autosize v-model="scope.row.content"> {{scope.row.content}}</el-input>
                       </el-checkbox>
 
                   </el-checkbox-group>

+ 3 - 3
RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -67,7 +67,7 @@
                   align="center"
                   width="300px">
                   <template slot-scope="scope" >       
-                          {{scope.row.content.trim()}}
+                          {{scope.row.content}}
                   </template>
                 </el-table-column>
               
@@ -675,10 +675,10 @@ export default {
                         res.data.patentRightVos[i].features[m].pContentOut = res.data.patentRightVos[i].contentOut
                         res.data.patentRightVos[i].features[m].comResult = '公开'
                         if (!res.data.patentRightVos[i].features[m].hasOwnProperty("explainText")) {//hasOwnProperty判断属性是否存在
-                          res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut.trim()
+                          res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut
                         } else {
                           if (res.data.patentRightVos[i].features[m].explainText=="") {//属性存在等于空
-                              res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut.trim()
+                              res.data.patentRightVos[i].features[m].explainText=res.data.patentRightVos[i].features[m].contentOut
                           }
                         }
 

+ 22 - 8
RMS-FrontEnd/src/views/report/InvalidResponse/components/InvalidIndex.vue

@@ -455,15 +455,29 @@ export default {
     //保存列数据
     save(key,row){
       var params = []
-      this.tableData.forEach(item=>{
-        params.push(
-          {
-            "invalidReasonId": item.id,
-            "fieldId": row.id,
-            "fieldValue": item[row.fieldKey],
-            "fieldKey": row.fieldKey
+      this.tableData.forEach((item,index)=>{
+        if(index!=0){
+          if(item.id != this.tableData[index-1].id){
+            params.push(
+              {
+                "invalidReasonId": item.id,
+                "fieldId": row.id,
+                "fieldValue": item[row.fieldKey],
+                "fieldKey": row.fieldKey
+              }
+            )
           }
-        )
+        }else{
+          params.push(
+              {
+                "invalidReasonId": item.id,
+                "fieldId": row.id,
+                "fieldValue": item[row.fieldKey],
+                "fieldKey": row.fieldKey
+              }
+            )
+        }
+        
       })
       this.$api.addOrUpdateValue(params).then(response=>{
         if(response.code == 200){