韶音需求修改

src/views/report/InvalidResponse/components/IPREmail/components/dialog/addOrEditIPREmail.vue

@@ -13,7 +13,7 @@
             <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
         </el-form-item>
         <el-form-item label="关联账号：" prop="assoAccountId">
-          <el-select style="width:100%" v-model="form.assoAccountId" placeholder="请选择账号" filterable remote  @focus="focusPerson(form.accountName)"
+          <el-select style="width:100%" v-model="form.assoAccountId" placeholder="请选择账号" clearable filterable remote  @focus="focusPerson(form.accountName)"
             :popper-append-to-body="false" :remote-method="remoteMethodPerson" v-SelectLazyLoading="lazyLoadingPerson"
             :loading="personnelList.loading">
             <el-option v-for="item in personnelList.data" :key="parseInt(item.id)" :label="item.name"

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

@@ -28,6 +28,14 @@
           <el-form-item :label="type.time || (form.documentType?`${form.documentType}日`:'时间')">
             <el-date-picker v-model="form[type.timeField]" value-format="yyyy-MM-dd" type="date"  placeholder="请选择时间" style="width: 100%;"></el-date-picker>
           </el-form-item>
+           <template v-if="type.type == 15 || type.type == 25">
+            <el-form-item  label="应到时间">
+              <el-date-picker type="datetime" placeholder="请选择" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" v-model="form.beTime" style="width: 100%"></el-date-picker>
+            </el-form-item>
+            <el-form-item  label="应到处所">
+              <el-input type="textarea" v-model="form.bePosition" autocomplete="off" placeholder="请输入应到处所"></el-input>
+            </el-form-item>
+          </template>
           <template v-if="type.type == 31">
             <el-form-item  label="口审日期">
               <el-date-picker type="datetime" placeholder="请选择" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" v-model="form.oralDate" style="width: 100%"></el-date-picker>

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

@@ -54,6 +54,10 @@
               <p v-if="item.documentType"><span>文档类型：</span><span style="font-weight:bold;color:red">{{ item.documentType }}</span></p>
               <p><span>{{ timeType[item.flowType] || (item.documentType?`${item.documentType}日`:'时间') }}：</span><span>{{ item.occurredTime}}</span></p> 
             </div>
+            <div v-if="item.flowType==15 || item.flowType==25">
+              <p v-if="item.courtSubpoenaVO && item.courtSubpoenaVO.beTime"><span>应到时间：</span><span>{{ item.courtSubpoenaVO.beTime }}</span></p>
+              <p v-if="item.courtSubpoenaVO && item.courtSubpoenaVO.bePosition"><span>应到处所：</span><span>{{ item.courtSubpoenaVO.bePosition }}</span></p>
+            </div>
             <div v-if="item.flowType==31">
               <p><span>口审时间：</span><span>{{ item.oralTrailVO.oralDate }}</span></p>
               <p><span>地点：</span><span>{{ item.oralTrailVO.position }}</span></p>
@@ -264,6 +268,8 @@ export default {
         17:'otherDocumentsVO',
         27:'otherDocumentsVO',
         28:'otherDocumentsVO',
+        15:'courtSubpoenaVO',
+        25:'courtSubpoenaVO'
       }
       var form = {
         ...item,

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

@@ -32,7 +32,6 @@
                     <template slot-scope="scope">
                         <div>
                             权要{{ scope.row.sysOrder+1 }}
-                            <!-- <span v-if="!getClaimDel(scope.row)"><el-button type="text" size="small" @click="delClaim(scope.row)">删除</el-button></span> -->
                         </div>
                     </template>
                 </el-table-column>
@@ -62,32 +61,16 @@
                             <my-RichText v-if="editMessage && editMessage.field == item.field && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyDescription(scope.row,2)" @blur="(value)=>changeMessage(item.field,scope.row,value)"></my-RichText>
                             <div v-else v-html="getModifyDescription(scope.row,2)"></div>
                         </div>
-                    </template>
-                </el-table-column>
-                <!-- <el-table-column prop="1" label="修改后权要内容" > 
-                    <template slot-scope="scope">
-                        <div>
-                            <my-RichText v-if="editMessage && editMessage.field == '1' && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyClaim(scope.row)" @blur="(value)=>changeMessage('1',scope.row,value)"></my-RichText>
-                            <div v-else v-html="getModifyClaim(scope.row)"></div>
+                        <div v-if="item.field == 'historyContent3'">
+                            <my-RichText v-if="editMessage && editMessage.field == item.field && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyClaim(scope.row,3)" @blur="(value)=>changeMessage(item.field,scope.row,value)"></my-RichText>
+                            <div v-else v-html="getModifyClaim(scope.row,3)"></div>
                         </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="2" label="修改说明"> 
-                    <template slot-scope="scope">
-                        <div>
-                            <my-RichText v-if="editMessage && editMessage.field == '2' && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyDescription(scope.row,1)" @blur="(value)=>changeMessage('2',scope.row,value)"></my-RichText>
-                            <div v-else v-html="getModifyDescription(scope.row,1)"></div>
+                        <div v-if="item.field == 'historyDescription3'">
+                            <my-RichText v-if="editMessage && editMessage.field == item.field && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyDescription(scope.row,3)" @blur="(value)=>changeMessage(item.field,scope.row,value)"></my-RichText>
+                            <div v-else v-html="getModifyDescription(scope.row,3)"></div>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="3" label="第二次修改说明" v-if="secondModify"> 
-                    <template slot-scope="scope">
-                        <div>
-                            <my-RichText v-if="editMessage && editMessage.field == '3' && editMessage.row.sysOrder == scope.row.sysOrder" :autoFocus="true" :value="getModifyDescription(scope.row,2)" @blur="(value)=>changeMessage('3',scope.row,value)"></my-RichText>
-                            <div v-else v-html="getModifyDescription(scope.row,2)"></div>
-                        </div>
-                    </template>
-                </el-table-column> -->
                 <el-table-column prop="parentOrder" label="父权要" align="center" width="100"> 
                     <template slot-scope="scope">
                         <div>
@@ -168,8 +151,6 @@ export default {
                 label:'附属权利要求'
             }
         ],
-        firstModify:false,
-        secondModify:false,
         editMessage:{
             field:'',
             row:{}
@@ -246,20 +227,7 @@ export default {
         }
         
     },
-    //添加权要删除历史
-    delClaim(row){
-        var params = {
-            claimId:row.id,
-            ifFirst:!this.secondModify
-        }
-        this.$api.deletePatentClaim(params).then(response=>{
-            if(response.code == 200){
-                this.getList()
-            }
-        }).catch(response=>{
 
-        })
-    },
      //双击单元格进行编辑
      cellDblclick(row, column, cell, event){
        this.editMessage = {
@@ -279,15 +247,23 @@ export default {
             case 'historyContent1'://第一次修改后权利要求
                 obj = this.getModifyClaim(row,1,'object')
                 params.content = value
-                params.ifFirst = true
+                params.ifFirst = 1
                 if(obj){
                     params.description = obj.description
                 }
                 break;
-            case 'historyContent2'://第一次修改后权利要求
+            case 'historyContent2': //第二次修改后权利要求
                 obj = this.getModifyClaim(row,2,'object')
                 params.content = value
-                params.ifFirst = false
+                params.ifFirst = 0
+                if(obj){
+                    params.description = obj.description
+                }
+                break;
+            case 'historyContent3'://第三次修改后权利要求
+                obj = this.getModifyClaim(row,3,'object')
+                params.content = value
+                params.ifFirst = 2
                 if(obj){
                     params.description = obj.description
                 }
@@ -295,7 +271,7 @@ export default {
             case 'historyDescription1'://第一次修改说明
                 obj = this.getModifyDescription(row,1,'object')
                 params.description = value
-                params.ifFirst = true
+                params.ifFirst = 1
                 if(obj){
                     params.content = obj.content
                 }
@@ -303,7 +279,15 @@ export default {
             case 'historyDescription2'://第二次修改说明
                 obj = this.getModifyDescription(row,2,'object')
                 params.description = value
-                params.ifFirst = false
+                params.ifFirst = 0
+                if(obj){
+                    params.content = obj.content
+                }
+                break;
+            case 'historyDescription3'://第三次修改说明
+                obj = this.getModifyDescription(row,3,'object')
+                params.description = value
+                params.ifFirst = 2
                 if(obj){
                     params.content = obj.content
                 }
@@ -357,9 +341,11 @@ export default {
         if(row.patentClaimHistoryList){
             var obj = row.patentClaimHistoryList.find(item=>{
                 if(type == 1){
-                    return item.operateType != 2 && item.ifFirst
+                    return item.operateType != 2 && item.ifFirst==1
                 }else if(type == 2){
-                  return item.operateType != 2 && !item.ifFirst
+                  return item.operateType != 2 && item.ifFirst==0
+                }else if(type == 3){
+                  return item.operateType != 2 && item.ifFirst==2
                 }
             })
             if(obj){
@@ -379,9 +365,11 @@ export default {
         if(row.patentClaimHistoryList){
             var obj = row.patentClaimHistoryList.find(item=>{
                 if(type == 1){
-                    return item.operateType != 2 && item.ifFirst
+                    return item.operateType != 2 && item.ifFirst == 1
                 }else if(type == 2){
-                    return item.operateType != 2 && !item.ifFirst
+                    return item.operateType != 2 && item.ifFirst == 0
+                }else if(type == 3){
+                    return item.operateType != 2 && item.ifFirst == 2
                 }
             })
             if(obj){
@@ -404,30 +392,6 @@ export default {
         this.loading = true
         this.$api.queryClaim(params).then(response=>{
             if(response.code == 200){
-                var data = response.data.data
-                var first = false
-                var second = false
-                for(var i = 0;i<data.length;i++){
-                    
-                    if(data[i].patentClaimHistoryList){
-                        var history = data[i].patentClaimHistoryList
-                        if(!first){
-                            first = history.find(item=>{
-                                return item.ifFirst
-                            })
-                        }
-                        if(!second){
-                            second = history.find(item=>{
-                                return !item.ifFirst
-                            })
-                        }
-                    }
-                    if(first && second){
-                        break;
-                    }
-                }
-                this.firstModify = first
-                this.secondModify = second
                 this.tableData = response.data.data
                 this.loading = false
             }

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog title="添加无效理由" :visible.sync="dialog.showDialog" width="600px" :close-on-click-modal="false"  :before-close="handleClose" append-to-body>
-        <el-form :model="form" ref="form" label-width="80px" label-position="left">
+        <el-form :model="form" ref="form" label-width="110px" label-position="left">
             <template >
                 <div>
                     <el-form-item  label="法条" prop="name">
@@ -20,12 +20,12 @@
                         <!-- <div v-if="form.statutesId == 5">说明书</div>
                         <div v-else>附图</div> -->
                     </el-form-item>
-                    <el-form-item v-else label="权要" prop="name">
+                    <el-form-item v-else label="修改后的权要" prop="name">
                         <el-select v-model="form.claimId" placeholder="请选择" style="width:100%">
                             <el-option
-                                v-for="item in claims"
+                                v-for="(item,index) in claims"
                                 :key="item.sysOrder"
-                                :label="`权要${Number(item.sysOrder)+1}`"
+                                :label="`权要${Number(index)+1}`"
                                 :value="item.id"
                             >
                             </el-option>

src/views/report/components/dialog/components/handelPersonTable.vue

@@ -76,7 +76,7 @@
                             <span v-if="scope.row.accountName">{{ scope.row.accountName + '（'+ scope.row.accountUserName +'）' }}</span>
                         </div>
                         <div v-else>
-                            <el-select style="width:100%" v-model="scope.row.assoAccountId" placeholder="请选择账号" filterable remote @focus="focusPerson(scope.row.accountName)"
+                            <el-select style="width:100%" v-model="scope.row.assoAccountId" placeholder="请选择账号" clearable filterable remote @focus="focusPerson(scope.row.accountName)"
                                 :popper-append-to-body="false" :remote-method="remoteMethodPerson" v-SelectLazyLoading="lazyLoadingPerson" :disabled="currentEditField && currentEditField!='assoAccountId'"
                                 :loading="personnelList.loading">
                                 <el-option v-for="item in personnelList.data" :key="parseInt(item.id)" :label="item.name"
@@ -242,15 +242,20 @@ export default {
         this.$message.warning('姓名不能为空')
         return
       }
-      if(!row.email){
-        this.$message.warning('邮箱不能为空')
-        return
+      if(this.type != 2){
+        if(!row.email){
+          this.$message.warning('邮箱不能为空')
+          return
+        }
       }
-      var regx = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9_\.\-])+\.)+([a-zA-Z0-9]{2,4})+$/
-      if(!regx.test(row.email)){
-        this.$message.warning('邮箱格式不正确')
-        return
+      if(row.email){
+        var regx = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9_\.\-])+\.)+([a-zA-Z0-9]{2,4})+$/
+        if(!regx.test(row.email)){
+          this.$message.warning('邮箱格式不正确')
+          return
+        }
       }
+      
       var a = '添加'
       if(row.id){
         a = '修改'