优化

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/index.vue

@@ -3,7 +3,7 @@
         
         <div style="background:white;display:flex; justify-content:flex-end;align-items: center;">
             <!-- <el-button type="primary" size="small" @click="checkInvalid" style="margin-right:10px;height:32px;"> 查看无效请求书/标的专利 </el-button> -->
-            <el-button type="primary" size="small" @click="addOpinion" style="margin-right:10px;height:32px;"> 添加陈述意见 </el-button>
+            <el-button type="primary" size="small" @click="addOpinion" style="margin-right:10px;height:32px;"> 陈述意见 </el-button>
             <el-switch
                 v-model="value"
                 :disabled="!$permission('/workspace/details/comparison')"

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

@@ -140,7 +140,7 @@
                 <!-- <span >{{ rightList.find(item => item.sort == this.form.content).content }}</span> -->
             </el-form-item>
           </template>
-          <el-form-item label="相关证据：" v-if="form.content == 0 || form.content">
+          <el-form-item label="相关证据：" v-if="form.content == 0 || form.content || form.invalidName == 1">
             <span v-if="form.invalidName == 0 || form.invalidName == 1">
               <el-input type="text" v-model="form.proofStr" placeholder="请输入相关证据" style="width:100%"></el-input>
             </span>

RMS-FrontEnd/src/views/report/InvalidResponse/components/addOrEditField.vue

@@ -109,6 +109,7 @@ export default {
     submitField(){
       this.btnLoading2 = true
       this.form.reportId = this.reportId
+      this.form.fieldState = 1
       this.$api.addOrUpdateInvalidFields(this.form).then(response=>{
         if(response.code == 200){
           this.btnLoading2 = false

RMS-FrontEnd/src/views/report/InvalidResponse/components/evidenceAndRequest.vue

@@ -1,9 +1,10 @@
 <template>
   <div>
     <div style="margin-bottom: 10px;float: right;">
+      <el-button type="primary" size="small" v-if="examine" @click="andClick('1')">上传无效请求书</el-button>
       <el-dropdown trigger="click" @command="andClick($event)" :hide-on-click="false" type="primary" size="small">
       <el-button type="primary" size="small">
-        上传文件<i class="el-icon-arrow-down el-icon--right"></i>
+        上传证据文献<i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
       <el-dropdown-menu slot="dropdown" class="text-align_center">
         <el-dropdown-item>
@@ -16,13 +17,13 @@
             </el-dropdown>
           </el-dropdown-item>
           <el-dropdown-item command="5">上传非专利文件</el-dropdown-item>
-          <el-dropdown-item command="1" v-if="examine">上传无效请求书</el-dropdown-item>
+          <!-- <el-dropdown-item command="1" v-if="examine">上传无效请求书</el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
 
 
 
-      <!-- <el-button type="primary" size="small" v-if="examine" @click="andClick(1)">上传无效请求书</el-button>
+      <!-- 
       <el-button type="primary" size="small"  @click="andClick()">上传专利文件</el-button>
       <el-button type="primary" size="small"  @click="andClick(5)">上传非专利文件</el-button> -->
       <el-button class="margin-left_10" type="primary" size="small" v-if="examine"  @click="isExamine">报告审核</el-button>

RMS-FrontEnd/src/views/report/components/Card.vue

@@ -24,7 +24,7 @@
                         <el-dropdown-item command="11" v-if="[1,2].includes(item.status) && $reportPermission(item.id,[0,1])"> 完成报告</el-dropdown-item>
                         <el-dropdown-item command="12"  v-if="[3].includes(item.status) && $reportPermission(item.id,[0,1])">添加追踪报告</el-dropdown-item>
                         <el-dropdown-item command="13" v-if="(item.type == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">添加无效理由和证据</el-dropdown-item>
-                        <el-dropdown-item command="14" v-if="(item.type == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">导入无效证据</el-dropdown-item>
+                        <el-dropdown-item command="14" v-if="(item.type == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">证据文献</el-dropdown-item>
                         <!-- <el-dropdown-item command="6" v-if="[2,3].includes(item.status)&& item.type != 4">导入 </el-dropdown-item> -->
                         <el-dropdown-item command="7" divided style="color: red; " v-if="$reportPermission(item.id,[0,1])">删除 </el-dropdown-item>
                         <!-- <el-dropdown-item command="0">分享</el-dropdown-item> -->

RMS-FrontEnd/src/views/report/components/CreateReport.vue

@@ -287,6 +287,7 @@ export default {
         "3":"FTO_ASSESS",
         "4":"TORT_ASSESS",
         "5":"AVOID_ASSESS",
+        "7":"REINVALID_ASSESS",
       },
       reportAsDicItemCopy:{
         "0":"INVALID_COPY",

RMS-FrontEnd/src/views/report/components/Tabel.vue

@@ -58,7 +58,7 @@
               <el-dropdown-item command="11" v-if="[1,2].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])"> 完成报告</el-dropdown-item>
               <el-dropdown-item command="12" v-if="[3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">添加追踪报告</el-dropdown-item>
               <el-dropdown-item command="13" v-if="(scope.row.type == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">添加无效理由和证据</el-dropdown-item>
-              <el-dropdown-item command="14" v-if="(scope.row.type == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">导入无效证据</el-dropdown-item>
+              <el-dropdown-item command="14" v-if="(scope.row.type == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">证据文献</el-dropdown-item>
               <!-- <el-dropdown-item command="6" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">导入 </el-dropdown-item> -->
               <el-dropdown-item command="7" divided style="color: red;" v-if=" $reportPermission(scope.row.id,[0,1])">删除 </el-dropdown-item>
             </el-dropdown-menu>