官方无效的修改

src/api/newApi/report.js

@@ -66,6 +66,12 @@ export default {
     return axios.post("/xiaoshi/feature/spiltFeature", data);
   },
   /**
+   * 拆分特征
+   */
+  saveBatchFeature(data) {
+    return axios.post("/xiaoshi/feature/saveBatchFeature", data);
+  },
+  /**
    * 查询拆分特征详情
    */
   getSpiltFeature(data) {
@@ -714,4 +720,26 @@ updateSupplyEvidence(data) {
   getCompareGroups(data) {
     return axios.post("/xiaoshi/stabilityReport/getCompareGroups", data);
   },
+  /**
+    * 稳定性分析和第三方意见
+    * 添加或编辑检索记录
+  */
+  addSearchRecord(data) {
+    return axios.post("/xiaoshi/searchRecord/addSearchRecord", data);
+  },
+  /**
+    * 稳定性分析和第三方意见
+    * 删除检索记录
+  */
+  removeSearchRecords(data) {
+    return axios.post("/xiaoshi/searchRecord/removeSearchRecords", data);
+  },
+  /**
+    * 稳定性分析和第三方意见
+    * 查询检索记录
+  */
+  querySearchRecords(data) {
+    return axios.post("/xiaoshi/searchRecord/querySearchRecords", data);
+  },
+
 };

src/assets/css/main.scss

@@ -57,6 +57,9 @@
   .el-input__inner:hover, .el-input__inner:focus{
     border-color: #409eff !important;
   }
+  .el-input-number .el-input__inner{
+    text-align: left;
+  }
   
   //文本域
   textarea {

src/utils/common.js

@@ -378,7 +378,7 @@ export default {
   validFile(data,arr) {
     if (data && data.length > 0) {
       for(var i =0;i<data.length;i++){
-        if(data[i].guid){
+        if(data[i] && data[i].guid){
           arr.push(data[i].guid)
         }else{
           return true

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

@@ -72,25 +72,30 @@
     <projectListDialog ref="projectListDialog" :importData="condition"></projectListDialog>
 
     <el-dialog custom-class="checkCondition" title="查看/编辑检索式" :visible.sync="visible" width="500px"
-      :before-close="() => { visible = false }" :close-on-click-modal="false">
+      :before-close="() => { visible = false }" :close-on-click-modal="false" append-to-body>
       <div>
         <el-input type="textarea" :rows="4" v-model="condition.searchCondition"></el-input>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false">取 消</el-button>
         <el-button type="primary" @click="searchFinish">检 索</el-button>
+        <el-button type="primary" v-if="condition.reportType==1||condition.reportType == 2" @click="saveSearchCondition">保存检索式</el-button>
       </span>
     </el-dialog>
+    <addAndEditSearchRecords ref="addAndEditSearchRecords" :projectId="condition.importToId"></addAndEditSearchRecords>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import moment from 'moment';
 import PatentTableListView from "@/views/project/patentCollection/components/views/Table.vue";
 import PatentAbstractListView from "@/views/project/patentCollection/components/views/Abstract";
 import PatentPictureListView from "@/views/project/patentCollection/components/views/Picture";
 import field from '@/views/components/dialog/fields.vue';
 import projectListDialog from "./components/projectListDialog.vue";
 import search from '@/utils/model/search/search.vue'
+import addAndEditSearchRecords from '@/views/report/analysisAndOpinion/components/searchRecords/dialog/addAndEditSearchRecords.vue';
 export default {
   components: {
     PatentTableListView,
@@ -99,6 +104,7 @@ export default {
     field,
     projectListDialog,
     search,
+    addAndEditSearchRecords
   },
   props: {
     searchData: {}
@@ -158,6 +164,7 @@ export default {
   },
   watch: {},
   computed: {
+    ...mapGetters(['userinfo']),
     records() {
       return this.$store.state.patent.records;
     },
@@ -173,6 +180,17 @@ export default {
 
   },
   methods: {
+    //保存检索式
+    saveSearchCondition(){
+      var form = {
+        searchCondition:this.condition.searchCondition,
+        searchBase:'小世系统',
+        allNum:this.total,
+        searchPerson:this.userinfo.name,
+        searchTime:moment().format("YYYY-MM-DD")
+      }
+      this.$refs.addAndEditSearchRecords.open(form)
+    },
     handleClick(row, location) {
       var search = {
         searchOption: this.searchOption,

src/views/report/InvalidResponse/components/Evidence/evidence.vue

@@ -232,6 +232,9 @@ export default {
         importToType:1,
         type:type,
       }
+      if(type == 4){
+        form.reportType = this.reportType
+      }
       this.$commonJS.toImportParent(form,type)
     },
     //非专利文献导入

src/views/report/InvalidResponse/components/dialog/addEvidenceReason.vue

@@ -53,7 +53,7 @@
                         <el-table-column prop="featureOrder" label="特征内容" >
                             <template slot-scope="scope">
                                 <div v-if="['4','8'].indexOf(form.statutesId) ==-1">
-                                   <div v-if="!ifSecondInvalid || showFeature">
+                                   <div v-if="(!ifSecondInvalid || showFeature) && !getFeatureDel(scope.row)">
                                         <el-input type="textarea" autosize v-model="scope.row.featureText" @blur="change(scope.row)"></el-input>
                                     </div>
                                     <div v-else>
@@ -97,7 +97,7 @@
                         </el-table-column>
                         <el-table-column label="操作" prop="featureOrder" width="150" align="center">
                             <template slot-scope="scope">
-                                <div>
+                                <div v-if="!getFeatureDel(scope.row)">
                                     <el-button type="text" size="small" @click="addEvidence(scope.row)">添加无效证据</el-button>
                                     <el-button type="text" size="small" @click="chooseHistory(scope.row)">选择历史无效证据</el-button>
                                     <el-button type="text" size="small" @click="dele(scope)">删除</el-button>
@@ -272,7 +272,12 @@ export default {
                 }
             }
         }
-        
+        if(this.features.length==0){
+            this.showFeature = true
+        }
+        if(this.form.showFeature){
+            this.showFeature = true
+        }
         this.getSpanArr(this.features)
         this.showDialog = true
     },
@@ -368,7 +373,9 @@ export default {
         var claim = this.form.claimText
         var arr = claim.match(/\S*?([，|,|；|;|。])/g)
         var data = []
+        var str = ''
         arr.forEach((item,index)=>{
+            str += item
             var obj = {
                 featureOrder:index+1,
                 featureText:item,
@@ -376,6 +383,19 @@ export default {
             }
             data.push(obj)
         })
+        var str2 = claim.replace(str,'')
+        if(str2){
+            var index = 0
+            if(data.length>0){
+                index = data[data.length-1].featureOrder   
+            }
+            var obj = {
+                featureOrder:index+1,
+                featureText:str2,
+                literatureId:[]
+            }
+            data.push(obj)
+        }
         this.features = data
         this.getSpanArr(this.features)
     },

src/views/report/InvalidResponse/components/dialog/claimAndFeatureHistory.vue

@@ -37,7 +37,7 @@
                             </div>
                             <div v-else>
                                 <el-button type="text" size="small" v-if="scope.$index!=0 && scope.$index==tableData.length-1 && scope.row.operate != 1" @click="edit(scope.row)"> 编辑 </el-button>
-                                <el-button type="text" size="small" v-if="scope.$index==tableData.length-1 && scope.row.times!=2" @click="add(scope)"> 添加第{{ ifSecondInvalid?'2':'1' }}次权要修改 </el-button>
+                                <el-button type="text" size="small" v-if="scope.$index==tableData.length-1 && scope.row.times!=2" @click="add(scope)"> 添加第{{ ifSecondInvalid?'2':'1' }}次{{type==1?'权要':'特征'}}修改 </el-button>
                             </div>
                             
                         </div>

src/views/report/InvalidResponse/components/dialog/editEvidence.vue

@@ -85,11 +85,14 @@ export default {
     submit(){
         this.$refs.form.validate((valid) => {
           if (valid) {
-            var guids = this.$commonJS.checkUploadFile([this.form.systemFile])
-            if(!guids){
-                return false
+            if(this.form.type == 1){
+                var guids = this.$commonJS.checkUploadFile([this.form.systemFile])
+                if(!guids){
+                    return false
+                }
+                this.form.fileGuid = guids.length>0?guids[0]:''  
             }
-            this.form.fileGuid = guids.length>0?guids[0]:''
+            
             this.form.projectId = this.projectId
             this.btnLoading = true
             if(this.form.id){

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

@@ -1225,14 +1225,14 @@ export default {
                 field:'invalidReasonDetail1'
             },
             {
-                label:'第二次总无效理由',
-                field:'invalidReasonDetail2'
-            },
-            {
                 label:'总答辩意见',
                 field:'presentOpinions1'
             },
             {
+                label:'第二次总无效理由',
+                field:'invalidReasonDetail2'
+            },
+            {
                 label:'第二次总答辩意见',
                 field:'presentOpinions2'
             },
@@ -1436,7 +1436,7 @@ export default {
                     obj[FirstEvidenceReason1[i].featureOrder].evidenceList.push(FirstEvidenceReason1[i])
                     
                 }else{
-                    var evidenceList = null
+                    var evidenceList = []
                     if(FirstEvidenceReason1[i].literatures && FirstEvidenceReason1[i].literatures.length>0){
                         evidenceList = [
                             {

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

@@ -208,9 +208,12 @@
                 <el-table-column prop="proofGroupDescription" label="操作" align="center" min-width="130px">
                     <template slot-scope="scope">
                         <div>
-                            <el-button @click="manageInvalidEvidence(scope.row)" type="text" size="small">管理{{ifSecondInvalid?'第二次':''}}无效证据</el-button>
-                            <el-button v-if="scope.row.proofGroupDescription" @click="remove(scope.row)" type="text" size="small">删除</el-button>
-                            <el-button @click="details(scope)" type="text" size="small">详情</el-button>
+                            <template v-if="!getClaimDel(scope.row) || !getFeatureDel(scope.row)">
+                                <el-button @click="manageInvalidEvidence(scope.row)" type="text" size="small">管理{{ifSecondInvalid?'第二次':''}}无效证据</el-button>
+                                <el-button v-if="scope.row.proofGroupDescription" @click="remove(scope.row)" type="text" size="small">删除</el-button> 
+                            </template>
+                            <el-button @click="details(scope)" type="text" size="small" v-if="showDetails(scope)">详情</el-button>
+                            <el-button @click="details(scope)" type="text" size="small" v-else>关闭详情</el-button>
                         </div>
                     </template>
                 </el-table-column>
@@ -673,11 +676,12 @@ export default {
      freightData(FirstEvidenceReason1){
         var obj = {}
             for(var i = 0;i<FirstEvidenceReason1.length;i++){
+
                 if(obj[FirstEvidenceReason1[i].featureOrder]){
                     obj[FirstEvidenceReason1[i].featureOrder].evidenceList.push(FirstEvidenceReason1[i])
                     
                 }else{
-                    var evidenceList = null
+                    var evidenceList = []
                     if(FirstEvidenceReason1[i].literatures && FirstEvidenceReason1[i].literatures.length>0){
                         evidenceList = [
                             {
@@ -888,6 +892,17 @@ export default {
                         statutesId:row.statutesId,
                         statutesContent:this.getProvisionName(row.statutesId),
                     }
+                    if(this.ifSecondInvalid){
+                        var obj = this.claims.find(item=>{ return item.id == row.claimId})
+                        if(obj.patentClaimHistoryList && obj.patentClaimHistoryList.length>0){
+                            var data1 = obj.patentClaimHistoryList.filter(item=>{
+                                return item.content && item.ifFirst
+                            })
+                            if(data1.length>0){
+                               form.claimText = data1[data1.length-1].content 
+                            } 
+                        }
+                    }
                     this.$refs.addEvidenceReason.open(form,[])
                 }
             }).catch(error=>{
@@ -907,6 +922,22 @@ export default {
             statutesId:row.statutesId,
             statutesContent:this.getProvisionName(row.statutesId),
         }
+        if(this.ifSecondInvalid){
+            var obj = this.claims.find(item=>{ return item.id == row.claimId})
+            if(obj.patentClaimHistoryList && obj.patentClaimHistoryList.length>0){
+                var data1 = obj.patentClaimHistoryList.filter(item=>{
+                    return item.content && item.ifFirst
+                })
+                if(data1.length>0){
+                    form.claimText = data1[data1.length-1].content 
+                } 
+            }
+            if(row.literatures){
+                form.showFeature = false
+            }else{
+                form.showFeature = true
+            }
+        }
         var feature = []
         if(data){
             for(var i = 0;i<data.length;i++){
@@ -938,7 +969,7 @@ export default {
                         return item.featureGen!=2
                     })
                     obj.featureId = a[a.length-1].featureId
-                    obj.featureGroupId = a[a.length-1].featureGroupId
+                    obj.featureGroupId = a[a.length-1].id
                     obj.literatureId = item.secondLiteratures?item.secondLiteratures.map(i=>i.id):[]
                     obj.evidenceText = item.secondEvidenceText
                     if(statutes.indexOf(row.statutesId)!=-1){
@@ -986,6 +1017,14 @@ export default {
         }
         this.$refs.addEvidenceReason.open(form,feature)
     },
+    showDetails(data){
+        var row = data.row
+        var num = this.tableData.findLastIndex(item=>{
+            return item.proofGroupId == row.proofGroupId
+        })
+        var keyId = this.tableData[num].keyId
+        return  this.expends.indexOf(keyId) == -1
+    },
     //详情
     details(data){
         var row = data.row

src/views/report/analysisAndOpinion/components/searchRecords/dialog/addAndEditSearchRecords.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <el-dialog :title="title" :visible.sync="showDialog" width="1000px" :close-on-click-modal="false" @close="handleClose" append-to-body>
+        <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="检索内容" prop="searchCondition">
+                <el-input
+                    v-model="form.searchCondition"
+                    autocomplete="off"
+                    placeholder="请输入检索内容"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="检索数据库" prop="searchBase">
+                <el-input
+                    v-model="form.searchBase"
+                    autocomplete="off"
+                    placeholder="请输入检索数据库"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="检索数量" prop="allNum">
+                <el-input-number v-model="form.allNum" controls-position="right" :min="0" style="width:100%" ></el-input-number>
+            </el-form-item>
+            <el-form-item label="检索人" prop="searchPerson">
+                <el-input
+                    v-model="form.searchPerson"
+                    autocomplete="off"
+                    placeholder="请输入检索人"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="检索时间" prop="searchTime">
+                <el-date-picker
+                    v-model="form.searchTime"
+                    type="date"
+                    value-format="yyyyMMdd"
+                    placeholder="选择检索时间"
+                    style="width:100%"
+                    >
+                </el-date-picker>
+            </el-form-item>
+        </el-form>
+
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="handleClose">取 消</el-button>
+            <el-button type="primary" :loading="btnLoading" @click="submit">确 定</el-button>
+        </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {
+    projectId:{
+        default:0
+    }
+  },
+  data() {
+    return {
+        title:'',
+        showDialog:false,
+        form:{},
+        btnLoading:false
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {
+    open(form){
+        if(form.id){
+            this.title = '编辑检索记录'
+        }else{
+            this.title = '添加检索记录'
+        }
+        this.form = JSON.parse(JSON.stringify(form))
+        this.showDialog =  true
+    },
+    handleClose(){
+        this.showDialog = false
+    },
+    submit(){
+        this.$refs.form.validate((valid) => {
+            if (valid) {
+                this.form.projectId = this.projectId
+                this.btnLoading = true
+                var a = '添加'
+                if(this.form.id){
+                    a = '编辑'
+                }
+                this.$api.addSearchRecord(this.form).then(response=>{
+                    if(response.code == 200){
+                        this.btnLoading = false
+                        this.$message.success(a + '成功')
+                        this.$emit('save',true)
+                        this.handleClose()
+                    }
+                }).catch(error=>{
+                    this.$message.error(a + '失败')
+                    this.btnLoading = false
+                })
+            }
+        })
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/report/analysisAndOpinion/components/searchRecords/searchRecords.vue

@@ -2,7 +2,10 @@
   <div class="height_100">
     <el-container>
         <el-header>
-            <el-button type="primary" size="small" @click="add">添加</el-button>
+            <div style="display:flex;justify-content:flex-end;width: 100%;">
+              <el-button type="primary" size="small" @click="add">添加</el-button>  
+            </div>
+            
         </el-header>
         <el-main v-DivHeight="getDivHeight">
             <el-table
@@ -17,26 +20,32 @@
                 <el-table-column type="selection" width="55" :reserve-selection="true">
 
                 </el-table-column>
-                <el-table-column prop="conditions" label="检索式"></el-table-column>
-                <el-table-column prop="dbType" label="检索范围" width="140">
+                <el-table-column prop="searchCondition" label="检索式"></el-table-column>
+                <el-table-column prop="searchBase" label="检索数据库" width="140">
+                    <template slot-scope="scope">
+                    <div>
+                        {{ scope.row.searchBase }}
+                    </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="allNum" label="检索数量" width="120">
                     <template slot-scope="scope">
                     <div>
-                        {{ dbType[scope.row.dbType] }}
+                        {{ scope.row.allNum }}件
                     </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="time" label="创建/更新时间" width="240">
+                <el-table-column prop="searchPerson" label="检索人" width="120">
                     <template slot-scope="scope">
-                    <div class="time">
-                        <p>创建：{{ scope.row.retrieveTime }}</p>
-                        <p>更新：{{ scope.row.updateTime }}</p>
+                    <div>
+                        {{ scope.row.searchPerson }}
                     </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="totalNum" label="检索结果" width="120">
+                <el-table-column prop="searchTime" label="检索时间" width="120">
                     <template slot-scope="scope">
                     <div>
-                        {{ scope.row.totalNum }}件
+                        {{ scope.row.searchTime }}
                     </div>
                     </template>
                 </el-table-column>
@@ -48,11 +57,11 @@
                                 <i class="iconfont icon-bianji"></i>
                             </el-tooltip>
                             </span>
-                            <span @click="executeSearch(scope.row)" class="margin-left_10">
+                            <!-- <span @click="executeSearch(scope.row)" class="margin-left_10">
                             <el-tooltip class="item" effect="dark" content="再次执行" placement="top">
                                 <i class="iconfont icon-zidongzhihang"></i>
                             </el-tooltip>
-                            </span>
+                            </span> -->
                             <span @click="delSearch(scope.row)" class="margin-left_10">
                             <el-tooltip class="item" effect="dark" content="删除" placement="top">
                                 <i class="iconfont icon-shanchu"></i>
@@ -69,7 +78,7 @@
               已勾选 <b>{{ multipleSelection.length }}</b> 条
             </span>
             <div v-show="multipleSelection.length" class="margin-left_10">
-              <el-button type="primary" size="small" @click="del"></el-button>
+              <el-button type="primary" size="small" @click="del">删除</el-button>
             </div>
           </div>
           <div>
@@ -81,14 +90,18 @@
 
         </el-footer>
     </el-container>
+    <addAndEditSearchRecords ref="addAndEditSearchRecords" :projectId="projectId" @save="getList"></addAndEditSearchRecords>
   </div>
 </template>
 
 <script>
 import { getTableHeight } from '@/views/components/mixins'
+import addAndEditSearchRecords from './dialog/addAndEditSearchRecords.vue';
 export default {
     mixins:[getTableHeight],
-  components: {},
+  components: {
+    addAndEditSearchRecords
+  },
   props: {
     projectId:{
         default:0
@@ -101,9 +114,10 @@ export default {
         loading:false,
         queryParams:{
             current:1,
-            size:10
+            size:10,
+            projectId:this.projectId
         },
-        total:0
+        total:0,
     };
   },
   watch: {},
@@ -113,16 +127,70 @@ export default {
     this.getList()
   },
   methods: {
-    getList(){},
+    getList(){
+        this.loading = true
+        this.$api.querySearchRecords(this.queryParams).then(response=>{
+            if(response.code == 200){
+                this.tableData = response.data.data
+                this.total = response.data.total
+                this.loading = false
+            }
+        }).catch(error=>{
+            this.tableData = []
+            this.loading = false
+        })
+    },
     handleCurrentChange(val){
         this.queryParams.current = val
         this.getList()
     },
-    add(){},
-    del(){},
+    add(){
+        this.$refs.addAndEditSearchRecords.open({})
+    },
+    del(){
+        var ids = this.multipleSelection.map(item=>{
+            return item.id
+        })
+        this.removeSearchRecords(ids,1)
+    },
+    delSearch(row){
+        this.removeSearchRecords([row.id])
+    },
+    removeSearchRecords(ids,type){
+        this.$confirm('确认删除本条数据吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            this.$api.removeSearchRecords(ids).then(response=>{
+                if(response.code == 200){
+                    this.$message.success('删除成功')
+                    this.getList()
+                    if(type){
+                        this.multipleSelection = []
+                        this.$refs.table.clearSelection();
+                    }else{
+                        var id = response.data.data[0]
+                        var index = this.multipleSelection.findIndex(item=>{
+                            return item.id == id
+                        })
+                        if(index!=-1){
+                            this.multipleSelection.splice(index,1)
+                        }
+                    }
+                    
+                }
+            }).catch(error=>{
+                this.$message.error('删除失败')
+            })
+        })
+    },
     handleSelectionChange(val){
         this.multipleSelection = val
     },
+    editSearch(row){
+        this.$refs.addAndEditSearchRecords.open(row)
+    },
   },
 };
 </script>

src/views/report/components/details/components/splitDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 标的专利特征拆分 -->
   <div style="height: calc(100% - 20px);">
-    <splitPage :isEdit="this.reportType==5?false:true" :isResult="9" :tableData="tableData" :patentNo="patentNo" @splitSelect="splitSelect">
+    <splitPage :isEdit="this.reportType==5?false:true" :isResult="reportType==5?9:''" :tableData="tableData" :patentNo="patentNo" @splitSelect="splitSelect" @isSave="save">
       <!-- <div slot="handleLeft">
         <span>标的专利：</span><el-link type="primary" @click="toPatentDetails(patentNo)">{{ patentNo }}</el-link>
       </div> -->
@@ -34,6 +34,19 @@ export default {
     
   },
   methods: {
+    save(data){
+      var params = {
+        projectId:this.projectId,
+        featuresList:data
+      }
+      this.$api.saveBatchFeature(params).then(response=>{
+        if(response.code == 200){
+          this.$message.success('保存成功')
+        }
+      }).catch(error=>{
+        this.$message.error('保存失败')
+      })
+    },
     // 改变拆分条件
     splitSelect(split) {
       this.getList(split,true)

src/views/report/components/splitPage/splitPage.vue

@@ -444,7 +444,6 @@ export default {
           return false
         }
         // 将内容合并起来
-        this.scopeRow[0].ifChange=true
         this.scopeRow.forEach((rowItem, rowIndex) => {
           for (let m = 0; m < arr.length; m++) {
             merge[arr[m]] = merge[arr[m]] + rowItem[arr[m]]
@@ -458,11 +457,13 @@ export default {
               for (let j = 0; j < arr.length; j++) {
                 this.tableData[Index1][arr[j]] = merge[arr[j]]
               }
+              this.tableData[Index1].ifChange = true
             }
           }
 
 
         })
+        console.log(this.tableData)
         this.handleSort(this.scopeRow[0].rightSort)
         this.typeSelect(this.showType)
         this.scopeRow = []