韶音需求修改

src/utils/common.js

@@ -108,7 +108,7 @@ treeToArray(data,prop={children:children}){
       } else {
         arr.push({
           key:item.value,
-          value:item.searchValue.label
+          value:item.searchValue.value
         })
       }
     })
@@ -299,6 +299,7 @@ treeToArray(data,prop={children:children}){
       'String': '1',//文本
       "DateYear":'5',//年份
       "DateMonth":'6',//年月
+      "radio":"4",//下拉单选
     }
 
     //获取规范数据

src/utils/model/retrieval/search.vue

@@ -31,7 +31,7 @@
       <div v-else-if="field.type == 4" style="width: 100%">
         <el-select v-model="value" size="small" filterable :placeholder="getPlaceholder()"
           style="width: 100%">
-          <el-option v-for="item in field.options || []" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in field.options || []" :key="item.value" :label="item.label" :value="item.value+''">
           </el-option>
         </el-select>
       </div>
@@ -199,9 +199,15 @@ export default {
           searchValue = this.field.options.filter(item => {
             return this.value.indexOf(item.value) != -1
           })
-        } else {
+        }else if (this.field.type == 4){
+          searchValue = this.field.options.find(item => {
+            return this.value == item.value
+          })
+        }
+         else {
           searchValue = {
-            label: this.value
+            label: this.value,
+            value: this.value
           }
         }
         this.searchOptions.push(
@@ -212,7 +218,6 @@ export default {
         )
         this.getValue()
       }
-
       this.$emit('search', this.searchOptions)
     },
     getObject(val) {

src/views/components/import/task/components/index.vue

@@ -314,7 +314,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回条件对象

src/views/components/indicia/components/indicia.vue

@@ -125,7 +125,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回条件对象

src/views/event/components/index.vue

@@ -242,7 +242,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value]=item.searchValue.label
+          params[item.value]=item.searchValue.value
         }
       })
       // 返回条件对象

src/views/noveltySearch/components/noveltySearchCard.vue

@@ -159,7 +159,7 @@ import createNoveltySearch from './dialog/createNoveltySearch.vue';
                 return itemValue.value
             })
             } else {
-            params[item.value] = item.searchValue.label
+            params[item.value] = item.searchValue.value
             }
         })
         this.searchOption = this.$commonJS.ArrayToArray(val)

src/views/patentMining/components/fileMessage.vue

@@ -290,7 +290,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回字符串

src/views/patentMining/components/viewIndex.vue

@@ -238,7 +238,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回条件对象

src/views/product/components/framework/viewIndex.vue

@@ -404,7 +404,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
 

src/views/product/components/index.vue

@@ -363,7 +363,7 @@ export default {
               return itemValue.value
             })
           } else {
-            params[item.value]=item.searchValue.label
+            params[item.value]=item.searchValue.value
           }
         })
       }

src/views/project/index.vue

@@ -249,7 +249,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       this.searchOption = this.$commonJS.ArrayToArray(val)

src/views/project/patentCollection/components/drawer/merge.vue

@@ -473,7 +473,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
 

src/views/project/patentCollection/components/drawer/merge2.vue

@@ -449,7 +449,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
 

src/views/project/patentCollection/components/drawer/mergeTableDialog.vue

@@ -170,7 +170,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
 

src/views/project/patentCollection/index.vue

@@ -486,7 +486,7 @@ export default {
     //         return itemValue.value
     //       })
     //     } else {
-    //       params[item.value] = item.searchValue.label
+    //       params[item.value] = item.searchValue.value
     //     }
     //   })
     //   // 返回字符串

src/views/project/patentDetails/components/patentMessage/pageProduct.vue

@@ -277,7 +277,7 @@ export default {
               return itemValue.value
             })
           } else {
-            params[item.value] = item.searchValue.label
+            params[item.value] = item.searchValue.value
           }
         })
       }

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

@@ -76,6 +76,9 @@
                       item.label }}</el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
+                <el-form-item label="是否提行政诉讼及理由">
+                  <el-input type="textarea" v-model="form.invalidStageReason" autocomplete="off"  placeholder="请输入是否提行政诉讼及理由"></el-input>
+                </el-form-item>
             </div>
           </template>
           <template v-if="type.type ==16 || type.type ==26">
@@ -95,10 +98,17 @@
                 </el-form-item>
             </div>
           </template>
-          <template v-if="evidenceRiskFlowType.indexOf(Number(type.type)) != -1">
+          <template v-if="actType == 0 && evidenceRiskFlowType.indexOf(Number(type.type)) != -1">
             <div>
                 <el-form-item label="证据风险及应对措施">
-                  <el-input type="textarea" v-model="evidenceRisk" autocomplete="off" @change="changeEvidenceRisk = true" placeholder="请输入证据风险及应对措施"></el-input>
+                  <el-input type="textarea" v-model="form.evidenceRiskResponse" autocomplete="off"  placeholder="请输入证据风险及应对措施"></el-input>
+                </el-form-item>
+            </div>
+          </template>
+          <template v-if="type.type == 16">
+            <div>
+                <el-form-item label="是否提行政诉讼二审及理由">
+                  <el-input type="textarea" v-model="form.firstInstanceStageReason" autocomplete="off"  placeholder="请输入是否提行政诉讼二审及理由"></el-input>
                 </el-form-item>
             </div>
           </template>
@@ -167,7 +177,8 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
     props:{
         projectId:{
           default:0
-        }
+        },
+        actType:{}
     },
     data() {
       return {
@@ -280,9 +291,7 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
           16:{},
           26:{}
         },
-        evidenceRiskFlowType:[29,30,7,31],
-        evidenceRisk:'',
-        changeEvidenceRisk:false
+        evidenceRiskFlowType:[29,30],
       }
     },
     watch: {
@@ -307,8 +316,7 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
   
     },
     methods: {
-        open(type,form,evidenceRisk) {
-          this.$set(this,'evidenceRisk',evidenceRisk)
+        open(type,form) {
           this.changeEvidenceRisk = false
             let type1 = this.types[type.flowType] || {
               type:type.flowType,
@@ -411,32 +419,10 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
             }
             return this.$api.matchCasePersonQuery(params).then(response=> response.data)
         },
-        //更新报告的证据风险以及应对措施
-        updateReportEvidenceRisk(){
-          if(!this.changeEvidenceRisk){
-            return
-          }
-          var params = {
-            projectId:this.projectId,
-            field:'evidenceRiskResponse',
-            value:this.evidenceRisk
-          }
-          let api = 'updateReportSingleColumn'
-          this.$api[api](params).then(response=>{
-            if(response.code == 200){
-              this.$emit('updateReportEvidenceRisk',this.evidenceRisk)
-            }
-          })
-        },
         // 弹窗确定
         finish() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
-                  if(this.evidenceRiskFlowType.indexOf(Number(this.type.type)) != -1){
-                    //更新报告的证据风险以及应对措施
-                    this.updateReportEvidenceRisk()
-                  }
-
                     var guids = this.$commonJS.checkUploadFile(this.form.systemFileList)
                     if(!guids){
                       return false

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

@@ -72,16 +72,24 @@
               <p><span>法律依据：</span><span>{{ item.invalidDecisionFileVO.legalBase }}</span></p>
               <p><span>决定要点：</span><span>{{ item.invalidDecisionFileVO.decisionKey }}</span></p>
               <p><span>无效结果：</span><span>{{ item.invalidDecisionFileVO.cronNames?item.invalidDecisionFileVO.cronNames.join('、'):'' }}</span></p>
+              <p v-if="item.invalidDecisionFileVO.invalidStageReason"><span>是否提行政诉讼及理由：</span><span>{{ item.invalidDecisionFileVO.invalidStageReason }}</span></p>
             </div>
             <div v-if="item.flowType==16||item.flowType==26">
               <p><span>行诉结果：</span><span>{{ litigationResult[item.judgementVO.conclusion] }}</span></p>
+              <p v-if="item.judgementVO.firstInstanceStageReason"><span>是否提行政诉讼二审及理由：</span><span>{{ item.judgementVO.firstInstanceStageReason }}</span></p>
             </div>
             <div v-if="item.flowType==17||item.flowType==27||item.flowType==28">
               <p><span>文档名称：</span><span>{{ item.otherDocumentsVO.documentName }}</span></p>
             </div>
+            <div v-if="item.evidenceRiskResponse">
+              <p ><span>证据风险及应对措施：</span><span>{{ item.evidenceRiskResponse }}</span></p>
+            </div>
             <div>
               <p>备注：{{ item.description }}</p> 
             </div>
+            <div>
+              <p>添加时间：{{ item.createTime }}</p> 
+            </div>
             <div style="margin-top: 10px;">
               <div v-if="item.systemFileList" class="upload-file">
                 <div v-for="(file, index) in item.systemFileList" :key="index" style="margin:0;display:flex;justify-content:space-around;">
@@ -95,7 +103,7 @@
       </el-timeline>
     </div>
 
-    <responseDialog ref="responseDialog" :projectId="projectId" @save="saveFlowPath" @updateReportEvidenceRisk="updateReportEvidenceRisk"></responseDialog>
+    <responseDialog ref="responseDialog" :projectId="projectId" :actType="actType" @save="saveFlowPath" @updateReportEvidenceRisk="updateReportEvidenceRisk"></responseDialog>
   </div>
 </template>
 
@@ -103,7 +111,7 @@
 import responseDialog from '../dialog/editFlowPath.vue'
 
 export default {
-  props:['projectId','signPatentNo','taskId','actType','evidenceRisk'],
+  props:['projectId','signPatentNo','taskId','actType'],
   components: {
     responseDialog,
   },
@@ -269,7 +277,7 @@ export default {
         flowType:item.flowType,
         documentType:item.documentType
       }
-      this.$refs.responseDialog.open(type,form,this.evidenceRisk)
+      this.$refs.responseDialog.open(type,form)
     },
     // 删除
     dele(item) {
@@ -303,7 +311,7 @@ export default {
       var form = {
         systemFileList:[]
       }
-      this.$refs.responseDialog.open(option,form,this.evidenceRisk)
+      this.$refs.responseDialog.open(option,form)
     },
   },
 }

src/views/report/components/checkPatent/checkPatent.vue

@@ -219,7 +219,7 @@ export default {
     //         return itemValue.value
     //       })
     //     } else {
-    //       params[item.value] = item.searchValue.label
+    //       params[item.value] = item.searchValue.value
     //     }
     //   })
     //   // 返回字符串

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

@@ -113,11 +113,7 @@
                   </el-switch>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="涉诉对象" prop="litigationParty">
-                  <el-input v-model="form.litigationParty" autocomplete="off" placeholder="请输入涉诉对象"></el-input>
-                </el-form-item>
-              </el-col>
+             
               <el-col :span="24">
                 <el-form-item :label="form.reportType == '7'?'无效结果':'报告结果'" prop="cronIds">
                   <el-checkbox-group v-model="form.cronIds" class="reportCheckbox">
@@ -165,16 +161,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="userinfo.roleType == 1 || userinfo.roleType == 2 || userinfo.id == form.created || userinfo.id == form.headId">
-          <el-col :span="24">
-            <el-form-item label="处理人：">
-              <div class="manage">
-                <el-button size="small" @click="showHeadDialog()">选择</el-button>
-                <div v-html="getNames(form.adminPersons)"></div>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="12">
             <template>
@@ -201,12 +187,27 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="userinfo.roleType == 1 || userinfo.roleType == 2 || userinfo.id == form.created || userinfo.id == form.headId">
+          <el-col :span="24">
+            <el-form-item label="查看权限人员：">
+              <div class="manage">
+                <el-button size="small" @click="showHeadDialog()">选择</el-button>
+                <div v-html="getNames(form.adminPersons)"></div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="技术简称" prop="productOrTech">
               <el-input v-model="form.productOrTech" autocomplete="off" placeholder="请输入技术简称"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="form.reportType == 7">
+            <el-form-item label="涉诉对象" prop="litigationParty">
+              <el-input v-model="form.litigationParty" autocomplete="off" placeholder="请输入涉诉对象"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="form.track ? 12 : 24">
@@ -276,7 +277,7 @@
             </el-form-item>
           </div>
         </template>
-        <el-form-item :label="(!form.id && form.status == 3) ? '上传报告文档' : '上传附件'" prop="systemFileList">
+        <el-form-item :label="(!form.id && form.status == 3) ? '上传报告文档' : '其他附件'" prop="systemFileList">
           <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove" style="height: 180px;" :autoUpload="true"></myUpload>
         </el-form-item>
         <el-form-item label="备注" prop="description">
@@ -331,7 +332,7 @@
     </el-dialog>
     
     <!-- 添加无效请求书 -->
-    <addFlowPath ref="addFlowPath" @save="getFlowPath"></addFlowPath>
+    <addFlowPath ref="addFlowPath" :actType="form.actType" @save="getFlowPath"></addFlowPath>
 
     <addEvent ref="addEvent"  @isSuccess="handleSuccess"></addEvent>
 
@@ -1352,7 +1353,7 @@ export default {
     },
     addFlowPath(){
       let type = {
-        "id": 1,
+        "id": 36,
         "flowName": "请求人无效请求书",
         "casePhase": "无效",
         "caseChildPhase": "递交请求人无效请求书",
@@ -1365,7 +1366,7 @@ export default {
       }
       if(this.form.actType == 0){
         type = {
-          "id": 29,
+          "id": 57,
           "flowName": "合议组无效宣告受理通知书",
           "casePhase": "无效",
           "caseChildPhase": "收到合议组无效宣告受理通知书",

src/views/report/components/index.vue

@@ -178,7 +178,17 @@ export default {
       // 子组件新增、编辑报告成功发送的字符串
       handleMessage: '',
       showView: false,
-      type:'reportProject'
+      type:'reportProject',
+      actTypes:[
+        {
+          label:'主动',
+          value:1
+        },
+        {
+          label:'被动',
+          value:0
+        },
+      ]
     };
   },
   watch: {
@@ -354,7 +364,7 @@ export default {
             type: 'type',
           })
           //先获取报告类型，报告状态，相关事件，再为报告类型,报告状态,相关事件添加选项
-          let arr = ['reportType', 'status', 'cronNames','scenarioNames','matterNames','conclusion']
+          let arr = ['reportType', 'status', 'cronNames','scenarioNames','matterNames','conclusion','actType']
           arr.forEach(item => {
             let obj = this.searchFiled.find(item2 => {
               return item2.value == item
@@ -447,6 +457,9 @@ export default {
             ) 
           }
           obj.options = options
+        case 'actType':
+          obj.type = '4'
+          obj.options = this.actTypes
         default:
           break;
       }
@@ -460,7 +473,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回字符串

src/views/report/components/reportFile/reportFileTable.vue

@@ -361,7 +361,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回字符串

src/views/report/components/view/table.vue

@@ -33,6 +33,10 @@
                     <span  v-html="$commonJS.getColumnData(scope.row,item)"></span>
                   </el-link>
                 </div>
+                <div v-else-if="['actType'].includes(item.value)">
+                  <div v-if="scope.row.actType == 1">主动</div>
+                  <div v-if="scope.row.actType == 0">被动</div>
+                </div>
                 <div v-else-if="['eventNames','cronNames'].includes(item.value)" v-html="$commonJS.getColumnData(scope.row,item)"></div>
                 <div v-else-if="['conclusion'].includes(item.value)" v-html="$constants.litigationResult[scope.row.conclusion]"></div>
                 <div v-else v-html="$commonJS.getColumnData(scope.row,item)"></div>

src/views/task/components/index.vue

@@ -207,7 +207,7 @@ export default {
             return itemValue.value
           })
         } else {
-          params[item.value] = item.searchValue.label
+          params[item.value] = item.searchValue.value
         }
       })
       // 返回字符串