无效应对的修改

src/api/newApi/common.js

@@ -268,4 +268,20 @@ export default {
   },
   
 
+  /**
+  * 官方无效显示栏位
+  * @param {*} data 
+  * @returns 
+  */
+  getEvidenceReasonTableColumns(data) {
+    return axios.post("/xiaoshi/personField/getEvidenceReasonTableColumns", data);
+  }, 
+  /**
+    * 官方无效显示栏位
+    * @param {*} data 
+    * @returns 
+    */
+  setEvidenceReasonTableColumns(data) {
+    return axios.post("/xiaoshi/personField/setEvidenceReasonTableColumns", data);
+  }, 
 };

src/utils/common.js

@@ -335,13 +335,25 @@ export default {
       )
   },
 
-  //查看显示栏位管理
-  async getCustomField(type, patentObj = {}) {
+  /**
+   * 查看显示栏位管理
+   * @param {*} type //表格类型
+   * @param {*} patentObj 参数配置
+   * @param {*} url 接口名称
+   * @returns 
+   */
+  async getCustomField(type, patentObj = {},url) {
     var params = {
       tableName: type,
       ...patentObj,
     }
-    let apiItem = Object.keys(patentObj).length > 0 ? 'getTableColumns':'getCustomField'
+    var apiItem = ''
+    if(url){
+      apiItem = url
+    }else{
+      apiItem = Object.keys(patentObj).length > 0 ? 'getTableColumns':'getCustomField'
+    }
+    
     var a = []
     await api[apiItem](params).then((response) => {
       if (response.code == 200) {

src/views/components/dialog/fields.vue

@@ -52,6 +52,9 @@ export default {
     },
     productId:{
       default: null
+    },
+    url:{
+      default:null
     }
   },
   data() {
@@ -118,7 +121,13 @@ export default {
         taskId: this.taskId,
         productId:this.productId,
       }
-      let apiItem = (this.projectId == 0|| this.projectId || this.productId) ? 'setTableColumns' : 'setCustomField'
+      var apiItem = ''
+      if(this.url){
+        apiItem = this.url
+      }else{
+        apiItem = (this.projectId == 0|| this.projectId || this.productId) ? 'setTableColumns' : 'setCustomField'
+      }
+      
       // sign为true时是统计栏位
       if (this.sign) {
         apiItem = 'setShowCountColumns'

src/views/patentMining/components/excavateTask/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="height_100">
-    <Table :type="1" :projectId="id" :processId="processId"></Table>
+    <Table :type="1" :projectId="id" :processId="processId" :show="true"></Table>
   </div>
 </template>
 

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog  :title="title" :visible.sync="showDialog" width="1000px" :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="120px" label-position="left">
             <template v-if="['5','4','8'].indexOf(form.statutesId) ==-1">
                 <el-form-item label="权利要求" prop="claimSort">
                     权要{{ form.claimSort+1 }}
@@ -14,7 +14,7 @@
             <el-form-item label="无效理由" prop="statutesContent">
                 {{ form.statutesContent }}
             </el-form-item>
-            <el-form-item label="证据组合" prop="proofGroupDescription">
+            <el-form-item :label="(ifSecondInvalid?'第二次':'第一次') + '证据组合'" prop="proofGroupDescription">
                 <div v-if="['2','3','4','8'].indexOf(form.statutesId) !=-1">
                     <div v-if="editProofGroupDescription" style="display:flex;align-items:center;">
                         <el-input type="textarea" style="width:100%" v-model="descriptions"></el-input>
@@ -225,9 +225,22 @@ export default {
             projectId:this.projectId,
             statutesId:this.form.statutesId,
             claimId:this.form.claimId,
-            descriptions:[this.descriptions],
+            descriptions:[],
             id:this.form.groupId,
         }
+        if(this.ifSecondInvalid){
+            params.descriptions = [
+                {
+                    description2:this.descriptions
+                }
+            ]
+        }else{
+            params.descriptions = [
+                {
+                    description1:this.descriptions
+                }
+            ]
+        }
         this.$api.addProofGroup(params).then(response=>{
             if(response.code == 200){
                 this.cancelContents()

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

@@ -58,7 +58,7 @@
                     </el-form-item>
                     <div class="proofGroup">
                         <div style="display:flex;justify-content:space-between;padding-bottom:10px">
-                            <div>证据组合</div>
+                            <div>{{ifSecondInvalid?'第二次':'第一次'}}证据组合</div>
                             <div>
                                 <el-button type="primary" size="small" @click="add">添加</el-button>
                             </div>
@@ -97,6 +97,9 @@ export default {
         default:()=>{
             return []
         }
+    },
+    ifSecondInvalid:{
+        default:false
     }
   },
   data() {
@@ -210,7 +213,17 @@ export default {
     },
     //添加证据组合
     addProofGroup(){
-        this.form.descriptions = this.form.proofGroups.map(item=>item.descriptions)
+        this.form.descriptions = this.form.proofGroups.map(item=>{
+            if(this.ifSecondInvalid){
+                return {
+                    description2: item.descriptions
+                }
+            }else{
+                return {
+                    description1: item.descriptions
+                }
+            }
+        })
         this.form.projectId = this.projectId
         this.$api.addProofGroup(this.form).then(response=>{
             if(response.code == 200){

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

@@ -38,9 +38,9 @@
                 <div class="right">
                     <div v-if="edit">
                         <el-select v-model="row.rbDecision" @change="(val)=>updatePatentClaimMessage(val,'rbDecision')"  placeholder="请选择">
-                            <el-option label="维持有效"  value="维持有效"></el-option>
-                            <el-option label="部分有效"  value="部分有效"></el-option>
-                            <el-option label="无效"  value="无效"></el-option>
+                            <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                            <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                            <el-option label="全部无效"  value="全部无效"></el-option>
                         </el-select>
                     </div>
                     <div v-else>
@@ -55,9 +55,9 @@
                 <div class="right">
                     <div v-if="edit">
                         <el-select v-model="row.courtDecision1" @change="(val)=>updatePatentClaimMessage(val,'courtDecision1')" placeholder="请选择">
-                            <el-option label="维持有效"  value="维持有效"></el-option>
-                            <el-option label="部分有效"  value="部分有效"></el-option>
-                            <el-option label="无效"  value="无效"></el-option>
+                            <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                            <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                            <el-option label="全部无效"  value="全部无效"></el-option>
                         </el-select>
                     </div>
                     <div v-else>
@@ -72,9 +72,9 @@
                 <div class="right">
                     <div v-if="edit">
                         <el-select v-model="row.courtDecision2" @change="(val)=>updatePatentClaimMessage(val,'courtDecision2')" placeholder="请选择">
-                            <el-option label="维持有效"  value="维持有效"></el-option>
-                            <el-option label="部分有效"  value="部分有效"></el-option>
-                            <el-option label="无效"  value="无效"></el-option>
+                            <el-option label="基于原权要维持有效"  value="基于原权要维持有效"></el-option>
+                            <el-option label="基于修改后权要维持有效"  value="基于修改后权要维持有效"></el-option>
+                            <el-option label="全部无效"  value="全部无效"></el-option>
                         </el-select>
                     </div>
                     <div v-else>
@@ -204,7 +204,7 @@
             </template>
         </template>
         <template  v-if="['2','3','4','8'].indexOf(row.statutesId) !=-1">
-            <div>
+            <!-- <div>
                 <div class="left">
                     组合
                 </div>
@@ -213,7 +213,7 @@
                         <span v-html="row.proofGroupDescription"> </span>
                     </div>
                 </div>
-            </div>
+            </div> -->
             <div v-for="(item, index) in groupValue" :key="index">
                 <div class="left">
                     {{item.label}}
@@ -337,7 +337,14 @@
             </template>
         </template>
     </div>
-    <div v-if="content.showFeature">
+    <!-- 控制隐藏 -->
+    <div class="controlShow">
+        <el-link type="primary" @click="controlShow">
+            {{ content.showFeature?'隐藏':'展开' }}
+        </el-link>
+    </div>
+
+    <div v-if="content.showFeature || edit">
         <div v-for="(item,index) in content.FirstEvidenceReason" :key="index">
             <div class="content" style="background:#ffca00">
                 <div>
@@ -354,94 +361,6 @@
                     </div>
                 </div>
             </div>
-           
-            <!-- <div class="border" v-if="item.evidenceList && item.evidenceList.length>0">
-                <div class="top">无效证据：</div>
-                <div>
-                    <table class="table">
-                        <tr>
-                            <td>无效证据</td>
-                            <td>无效证据详情</td>
-                            <td>答辩意见陈述情况</td>
-                            <td>答辩意见</td>
-                            <td v-if="!ifSecondInvalid">复审委意见结论</td>
-                            <td v-if="!ifSecondInvalid">复审委意见</td>
-                            <td v-if="!ifSecondInvalid">复审委要点提炼</td>
-                        </tr>
-                        <tr v-for="(literature,i) in item.evidenceList" :key="'literatures'+i">
-                            <td>
-                                <span v-for="(evidence,y) in literature.literatures" :key="'evidence'+y">
-                                    <span v-if="evidence.id <= 0">{{ evidence.name }}</span>
-                                    <span v-else>D{{ evidence.sysOrder }}</span>
-                                    <span v-if="y < literature.literatures.length-1"> + </span>
-                                </span>
-                            </td>
-                            <td>
-                                <div v-if="edit">
-                                    <my-RichText v-model="literature.evidenceText" placeholder="请输入无效证据详情" @change="updateEvidenceMessage($event,'evidenceText',item)"></my-RichText>
-                                </div>
-                                <div v-else>
-                                   <span v-html="literature.evidenceText"> </span>
-                                </div>
-                            </td>
-                            <td>
-                                    <div v-if="edit">
-                                        <el-select v-model="literature.erIfPresentOpinions1"  @change="(val)=>updateEvidenceMessage(val,'ifPresentOpinions1',item)" placeholder="请选择">
-                                            <el-option label="已陈述"  :value="true"></el-option>
-                                            <el-option label="未陈述"  :value="false"></el-option>
-                                        </el-select>
-                                    </div>
-                                    <div v-else>
-                                        <span v-if="literature.erIfPresentOpinions1==true">
-                                            已陈述
-                                        </span>
-                                        <span v-else-if="literature.erIfPresentOpinions1==false">
-                                            未陈述
-                                        </span>
-                                        <span v-else>
-                                        </span>
-                                    </div>
-                                </td>
-                            <td>
-                                <div v-if="edit">
-                                    <my-RichText v-model="literature.erPresentOpinions1" placeholder="请输入答辩意见" @change="updateEvidenceMessage($event,'presentOpinions1',item)"></my-RichText>
-                                </div>
-                                <div v-else>
-                                   <span v-html="literature.erPresentOpinions1"> </span>
-                                </div>
-                            </td>
-                            <td v-if="!ifSecondInvalid" >
-                                <div v-if="edit">
-                                        <el-select v-model="literature.erRbSummary"  @change="(val)=>updateEvidenceMessage(val,'rbSummary',item.secondEvidenceReason)" placeholder="请选择">
-                                            <el-option label="认可请求人意见"  value="认可请求人意见"></el-option>
-                                            <el-option label="认可权利人意见"  value="认可权利人意见"></el-option>
-                                            <el-option label="均不认可"  value="均不认可"></el-option>
-                                        </el-select>
-                                    </div>
-                                    <div v-else>
-                                        {{ literature.erRbSummary }}
-                                    </div>
-                                </td>
-                            <td v-if="!ifSecondInvalid">
-                                <div v-if="edit">
-                                    <my-RichText v-model="literature.erRbOpinions" placeholder="请输入复审委意见" @change="updateEvidenceMessage($event,'rbOpinions',item)"></my-RichText>
-                                </div>
-                                <div v-else>
-                                   <span v-html="literature.erRbOpinions"> </span>
-                                </div>
-                            </td>
-                            <td v-if="!ifSecondInvalid">
-                                <div v-if="edit">
-                                    <my-RichText v-model="literature.erRbDecisionKey" placeholder="请输入复审委要点提炼" @change="updateEvidenceMessage($event,'rbDecisionKey',item)"></my-RichText>
-                                </div>
-                                <div v-else>
-                                    <span v-html="literature.erRbDecisionKey"> </span>
-                                </div>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div> -->
             <div class="border"  v-if="['2','3','4','8'].indexOf(row.statutesId) !=-1">
                 <div class="top">无效证据</div>
                 <div class="content" v-for="(literature,i) in item.evidenceList" :key="'literatures'+i">
@@ -474,13 +393,13 @@
                             <div class="right">
                                 <div v-if="edit">
                                     <el-select v-model="literature.erIfPresentOpinions1"  @change="(val)=>updateEvidenceMessage(val,'ifPresentOpinions1',item)" placeholder="请选择">
-                                        <el-option label="已陈述"  :value="true"></el-option>
-                                        <el-option label="未陈述"  :value="false"></el-option>
+                                        <el-option label="针对性陈述"  :value="true"></el-option>
+                                        <el-option label="未针对性陈述"  :value="false"></el-option>
                                     </el-select>
                                 </div>
                                 <div v-else>
-                                    <span v-if="literature.erIfPresentOpinions1==true"> 已陈述</span>
-                                    <span v-else-if="literature.erIfPresentOpinions1==false">未陈述</span>
+                                    <span v-if="literature.erIfPresentOpinions1==true"> 针对性陈述</span>
+                                    <span v-else-if="literature.erIfPresentOpinions1==false">未针对性陈述</span>
                                     <span v-else></span>
                                 </div>
                             </div>
@@ -661,13 +580,13 @@
                     <div class="right">
                         <div v-if="edit">
                             <el-select v-model="item.feIfPresentOpinions1"  @change="(val)=>updateFeatureMessage(val,'ifPresentOpinions1',item)" placeholder="请选择">
-                                <el-option label="已陈述"  :value="true"></el-option>
-                                <el-option label="未陈述"  :value="false"></el-option>
+                                <el-option label="针对性陈述"  :value="true"></el-option>
+                                <el-option label="未针对性陈述"  :value="false"></el-option>
                             </el-select>
                         </div>
                         <div v-else>
-                            <span v-if="item.feIfPresentOpinions1==true"> 已陈述</span>
-                            <span v-else-if="item.feIfPresentOpinions1==false">未陈述</span>
+                            <span v-if="item.feIfPresentOpinions1==true"> 针对性陈述</span>
+                            <span v-else-if="item.feIfPresentOpinions1==false">未针对性陈述</span>
                             <span v-else></span>
                         </div>
                     </div>
@@ -687,93 +606,6 @@
                 </div>
             </div>
             <template v-if="ifSecondInvalid">
-                <!-- <div class="border" v-if="item.secondEvidenceReason&&item.secondEvidenceReason.evidenceList && item.secondEvidenceReason.evidenceList.length>0">
-                    <div class="top">第二次无效证据：</div>
-                    <div>
-                        <table class="table">
-                            <tr>
-                                <td>无效证据</td>
-                                <td>无效证据详情</td>
-                                <td>答辩意见陈述情况</td>
-                                <td>答辩意见</td>
-                                <td>复审委意见结论</td>
-                                <td>复审委意见</td>
-                                <td>复审委要点提炼</td>
-                            </tr>
-                            <tr v-for="(literature,i) in item.secondEvidenceReason.evidenceList" :key="'literatures'+i">
-                                <td>
-                                    <span v-for="(evidence,y) in literature.literatures" :key="'evidence'+y">
-                                        <span v-if="evidence.id <= 0">{{ evidence.name }}</span>
-                                        <span v-else>D{{ evidence.sysOrder }}</span>
-                                        <span v-if="y < literature.literatures.length-1"> + </span>
-                                    </span>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <my-RichText v-model="literature.evidenceText" placeholder="请输入无效证据详情" @change="updateEvidenceMessage($event,'evidenceText',item.secondEvidenceReason)"></my-RichText>
-                                    </div>
-                                    <div v-else>
-                                        <span v-html="literature.evidenceText"> </span>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <el-select v-model="literature.erIfPresentOpinions1"  @change="(val)=>updateEvidenceMessage(val,'ifPresentOpinions1',item.secondEvidenceReason)" placeholder="请选择">
-                                            <el-option label="已陈述"  :value="true"></el-option>
-                                            <el-option label="未陈述"  :value="false"></el-option>
-                                        </el-select>
-                                    </div>
-                                    <div v-else>
-                                        <span v-if="literature.erIfPresentOpinions1==true">
-                                            已陈述
-                                        </span>
-                                        <span v-else-if="literature.erIfPresentOpinions1==false">
-                                            未陈述
-                                        </span>
-                                        <span v-else>
-                                        </span>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <my-RichText v-model="literature.erPresentOpinions1" placeholder="请输入答辩意见" @change="updateEvidenceMessage($event,'presentOpinions1',item.secondEvidenceReason)"></my-RichText>
-                                    </div>
-                                    <div v-else>
-                                        <span v-html="literature.erPresentOpinions1"> </span>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <el-select v-model="literature.erRbSummary"  @change="(val)=>updateEvidenceMessage(val,'rbSummary',item.secondEvidenceReason)" placeholder="请选择">
-                                            <el-option label="认可请求人意见"  value="认可请求人意见"></el-option>
-                                            <el-option label="认可权利人意见"  value="认可权利人意见"></el-option>
-                                            <el-option label="均不认可"  value="均不认可"></el-option>
-                                        </el-select>
-                                    </div>
-                                    <div v-else>
-                                        {{ literature.erRbSummary }}
-                                    </div>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <my-RichText v-model="literature.erRbOpinions" placeholder="请输入复审委意见" @change="updateEvidenceMessage($event,'rbOpinions',item.secondEvidenceReason)"></my-RichText>
-                                    </div>
-                                    <div v-else>
-                                        <span v-html="literature.erRbOpinions"> </span>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div v-if="edit">
-                                        <my-RichText v-model="literature.erRbDecisionKey" placeholder="请输入复审委要点提炼" @change="updateEvidenceMessage($event,'rbDecisionKey',item.secondEvidenceReason)"></my-RichText>
-                                    </div>
-                                    <div v-else> 
-                                        <span v-html="literature.erRbDecisionKey"> </span>
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                </div> -->
                 <div class="border" v-if="['2','3','4','8'].indexOf(row.statutesId) !=-1 && item.secondEvidenceReason&&item.secondEvidenceReason.evidenceList && item.secondEvidenceReason.evidenceList.length>0">
                     <div class="top">第二次无效证据</div>
                     <div class="content" v-for="(literature,i) in item.secondEvidenceReason.evidenceList" :key="'literatures'+i">
@@ -806,13 +638,13 @@
                                 <div class="right">
                                     <div v-if="edit">
                                         <el-select v-model="literature.erIfPresentOpinions1"  @change="(val)=>updateEvidenceMessage(val,'ifPresentOpinions1',item.secondEvidenceReason,2)" placeholder="请选择">
-                                            <el-option label="已陈述"  :value="true"></el-option>
-                                            <el-option label="未陈述"  :value="false"></el-option>
+                                            <el-option label="针对性陈述"  :value="true"></el-option>
+                                            <el-option label="未针对性陈述"  :value="false"></el-option>
                                         </el-select>
                                     </div>
                                     <div v-else>
-                                        <span v-if="literature.erIfPresentOpinions1==true"> 已陈述</span>
-                                        <span v-else-if="literature.erIfPresentOpinions1==false">未陈述</span>
+                                        <span v-if="literature.erIfPresentOpinions1==true"> 针对性陈述</span>
+                                        <span v-else-if="literature.erIfPresentOpinions1==false">未针对性陈述</span>
                                         <span v-else></span>
                                     </div>
                                 </div>
@@ -993,13 +825,13 @@
                         <div class="right">
                             <div v-if="edit">
                                 <el-select v-model="item.feIfPresentOpinions2"  @change="(val)=>updateFeatureMessage(val,'ifPresentOpinions2',item,2)" placeholder="请选择">
-                                    <el-option label="已陈述"  :value="true"></el-option>
-                                    <el-option label="未陈述"  :value="false"></el-option>
+                                    <el-option label="针对性陈述"  :value="true"></el-option>
+                                    <el-option label="未针对性陈述"  :value="false"></el-option>
                                 </el-select>
                             </div>
                             <div v-else>
-                                <span v-if="item.feIfPresentOpinions2==true"> 已陈述</span>
-                                <span v-else-if="item.feIfPresentOpinions2==false">未陈述</span>
+                                <span v-if="item.feIfPresentOpinions2==true"> 针对性陈述</span>
+                                <span v-else-if="item.feIfPresentOpinions2==false">未针对性陈述</span>
                                 <span v-else></span>
                             </div>
                         </div>
@@ -1223,14 +1055,22 @@ export default {
         },
         groupValue:[
             {
-                label:'总无效理由',
+                label:'第一次证据组合',
+                field:'description'
+            },
+            {
+                label:'第一次总无效理由',
                 field:'invalidReasonDetail1'
             },
             {
-                label:'总答辩意见',
+                label:'第一次总答辩意见',
                 field:'presentOpinions1'
             },
             {
+                label:'第二次证据组合',
+                field:'description2'
+            },
+            {
                 label:'第二次总无效理由',
                 field:'invalidReasonDetail2'
             },
@@ -1262,6 +1102,9 @@ export default {
         this.getData()
   },
   methods: {
+    controlShow(){
+        this.$set(this.content,'showFeature',!this.content.showFeature)
+    },
     toTop(){
         let target = this.$refs.detailsHead
         target.scrollTo(
@@ -1288,8 +1131,8 @@ export default {
         this.getData()
     },
     updateData(field,val,type,row,num){
-        var arr = ['evidenceText','ifPresentOpinions1','ifPresentOpinions2','rbSummary','rbDecision','courtDecision1','courtDecision1']
-        var types = [5,1]
+        var arr = ['evidenceText','ifPresentOpinions1','ifPresentOpinions2','rbSummary','rbDecision','courtDecision1','courtDecision1','description','description2']
+        var types = [5,1,3]
         var ifGroup = ['2','3','4','8'].indexOf(this.row.statutesId) !=-1
         if(arr.indexOf(field)!=-1 && types.includes(type)){
             this.$emit('update',field,val,row,num,ifGroup)
@@ -1350,7 +1193,7 @@ export default {
             if(response.code == 200){
                 this.$message.success('编辑成功')
                 this.$forceUpdate()
-                this.updateData(field,val,3)
+                this.updateData(field,val,3,this.content.proofGroupMessage)
             }
         }).catch(error=>{
             this.$message.error('编辑失败')
@@ -1428,15 +1271,14 @@ export default {
             obj[item].feRbDecisionKey = (obj2[item]?obj2[item].feRbDecisionKey:'') || obj[item].feRbDecisionKey
            })
             this.content.FirstEvidenceReason = Object.values(obj)
-            this.content.showFeature = false
+            this.content.showFeature = true
             this.$nextTick(()=>{
-                this.content.showFeature = true
+                this.content.showFeature = false
             })
             this.row.details = this.content
         }else{
            this.content = this.row.details 
         }
-        
     },
     //装载数据
     freightData(FirstEvidenceReason1){
@@ -1489,7 +1331,11 @@ export default {
     --padding:10px;
     padding:15px;
     overflow-y: auto;
-    
+    .controlShow{
+        display: flex;
+        justify-content: flex-start;
+        padding:10px
+    }
     .head{
         width: 100%;
         display: flex;

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

@@ -3,11 +3,12 @@
     <el-container>
         <el-header>
             <div class="head">
-                <el-dropdown split-button type="primary" size="small" @command="handleCommand"  @click="handleCommand('1')">
+                <el-dropdown split-button type="primary" size="small" @command="handleCommand"  @click="handleCommand('0')">
                     <span>
-                        添加无效理由
+                        显示栏位管理
                     </span>
                     <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="1">添加无效理由</el-dropdown-item>
                         <el-dropdown-item command="2">添加证据组合</el-dropdown-item>
                         <el-dropdown-item command="3">添加复审委决定</el-dropdown-item>
                         <el-dropdown-item command="4">添加法院决定</el-dropdown-item>
@@ -26,7 +27,189 @@
                         
                     </template>
                 </el-table-column>
-                <el-table-column prop="claimSort" label="权要/说明书/附图" width="120" align="center">
+
+
+                <el-table-column v-for="item in columnList.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.field" :label="item.name"  align="center">
+                    <template slot-scope="scope">
+                        <div>
+                            <!-- 权要/说明书/附图 -->
+                            <template v-if="item.value == 'claimSort'">
+                                <div>
+                                    <span v-if="scope.row.relatedContent == 1">
+                                        <span :class="getClaimDel(scope.row)?'del':''">权要{{ scope.row.claimSort + 1}} </span>
+                                        <span v-if="['5','4','8'].indexOf(scope.row.statutesId) ==-1">
+                                            <el-popover
+                                                popper-class="reasonAndEvidence"
+                                                placement="bottom"
+                                                width="100"
+                                                trigger="click"
+                                            >
+                                                <div class="menuList">
+                                                    <div class="menuListLi" v-if="!getClaimDel(scope.row)" @click="delClaim(scope.row)">删除</div>
+                                                    <div class="menuListLi" @click="checkHistory(scope.row,1)">查看</div>
+                                                    <div class="menuListLi"  v-if="!getClaimDel(scope.row)" @click="addClaimFeature(scope.row)">添加特征</div>
+                                                </div>
+                                                <i slot="reference" class="el-icon-caret-bottom"></i>
+                                            </el-popover>
+                                        </span>
+                                    </span>
+                                    <span v-else-if="scope.row.relatedContent == 0">说明书</span>
+                                    <span v-else>附图</span>
+                                </div>
+                            </template>
+                            <!-- 无效法条 -->
+                            <template v-if="item.value == 'statutesId'">
+                                <div>
+                                    <span>{{ getProvisionName(scope.row.statutesId) }}</span>
+                                </div>
+                            </template>
+                            <!-- 证据组合 -->
+                            <template v-if="item.value == 'proofGroup'">
+                                <div>
+                                    <div v-if="scope.row.proofGroupDescription">第一次证据组合：{{ scope.row.proofGroupDescription }}</div>
+                                    <div v-if="scope.row.proofGroupDescription2">第二次证据组合：{{ scope.row.proofGroupDescription2 }}</div>
+                                </div>
+                            </template>
+                            <!-- 原权要特征内容 -->
+                            <template v-if="item.value == 'feature'">
+                                <div v-if="scope.row.featureText && ['4','8'].indexOf(scope.row.statutesId) ==-1">
+                                    <span :class="getFeatureDel(scope.row)?'del':''">{{ scope.row.featureText }}</span> 
+                                        <span v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                            <el-popover
+                                                popper-class="reasonAndEvidence"
+                                                placement="bottom"
+                                                width="100"
+                                                trigger="click"
+                                            >
+                                                <div class="menuList">
+                                                    <div class="menuListLi" v-if="!getFeatureDel(scope.row)" @click="delFeature(scope.row)">删除</div>
+                                                    <div class="menuListLi" @click="checkHistory(scope.row,2)">查看</div>
+                                                </div>
+                                                <i slot="reference" class="el-icon-caret-bottom"></i>
+                                            </el-popover>
+                                        </span>  
+                                </div>
+                                <div v-else>
+                                    <div v-if="scope.row.featureText">
+                                        <el-image style="width:120px" :src="$commonJS.checkViewer(scope.row.featureText)" :preview-src-list="[$commonJS.checkViewer(scope.row.featureText)]"></el-image>
+                                    </div>
+                                </div>
+                            </template>
+                            <!-- 第一次无效及补充证据 -->
+                            <template v-if="item.value == 'evidenceText'">
+                                <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                    <span v-for="(item,index) in scope.row.literatures" :key="item.id">
+                                            <span v-if="item.id <= 0">{{ item.name }}</span>
+                                            <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ item.sysOrder }}</span>
+                                            <span v-if="index < scope.row.literatures.length-1"> + </span>
+                                    </span>
+                                    <span v-if="['4','8'].indexOf(scope.row.statutesId) !=-1" v-html="getImageHTML(scope.row.evidenceText)"></span>
+                                </div>
+                                <div v-else>
+                                    <span v-html="getEvidenceDescription(scope.row,1)"></span>
+                                </div>
+                            </template>
+                            <!-- 修改后权要特征 -->
+                            <template v-if="item.value == 'feature1'">
+                                <div>
+                                    {{ getFeatureCommon(scope.row,1) }}
+                                </div>
+                            </template>
+                            <!-- 第一次答辩意见 -->
+                            <template v-if="item.value == 'erIfPresentOpinions1'">
+                                <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                    <span v-if="scope.row.erIfPresentOpinions1==true">
+                                        针对性陈述
+                                    </span>
+                                    <span v-else-if="scope.row.erIfPresentOpinions1==false">
+                                        未针对性陈述
+                                    </span>
+                                    <span v-else></span>
+                                </div>
+                                <div v-else>
+                                    <span v-if="scope.row.feIfPresentOpinions1==true">
+                                        针对性陈述
+                                    </span>
+                                    <span v-else-if="scope.row.feIfPresentOpinions1==false">
+                                        未针对性陈述
+                                    </span>
+                                    <span v-else></span>
+                                </div>
+                            </template>
+                            <!-- 第二次无效证据 -->
+                            <template v-if="item.value == 'secondEvidence'">
+                                <div  v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                    <span v-for="(item,index) in scope.row.secondLiteratures" :key="item.id">
+                                            <span v-if="item.id <= 0">{{ item.name }}</span>
+                                            <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ item.sysOrder }}</span>
+                                            <span v-if="index < scope.row.secondLiteratures.length-1"> + </span>
+                                    </span>
+                                    <span v-if="['4','8'].indexOf(scope.row.statutesId) !=-1" v-html="getImageHTML(scope.row.secondEvidenceText)"></span>
+                                </div>
+                                <div v-else>
+                                    <span v-html="getEvidenceDescription(scope.row,2)"></span>
+                                </div>
+                            </template>
+                            <!-- 第二次修改后权要特征 -->
+                            <template v-if="item.value == 'feature2'">
+                                <div>
+                                    {{ getFeatureCommon(scope.row,2) }}
+                                </div>
+                            </template>
+                            <!-- 第二次答辩意见 -->
+                            <template v-if="item.value == 'secondErIfPresentOpinions1'">
+                                <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                    <span v-if="scope.row.secondErIfPresentOpinions1==true">
+                                        针对性陈述
+                                    </span>
+                                    <span v-else-if="scope.row.secondErIfPresentOpinions1==false">
+                                        未针对性陈述
+                                    </span>
+                                    <span v-else></span>
+                                </div>
+                                <div v-else>
+                                    <span v-if="scope.row.feIfPresentOpinions2==true">
+                                        针对性陈述
+                                    </span>
+                                    <span v-else-if="scope.row.feIfPresentOpinions2==false">
+                                        未针对性陈述
+                                    </span>
+                                    <span v-else></span>
+                                </div>
+                            </template>
+                            <!-- 复审委意见 -->
+                            <template v-if="item.value == 'erRbSummary'">
+                                <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
+                                    <span v-html="scope.row.erRbSummary"></span>
+                                </div>
+                                <div>
+                                    <span v-html="scope.row.feRbSummary"></span>
+                                </div>
+                            </template>
+                            <!-- 复审委决定 -->
+                            <template v-if="item.value == 'rbDecision'">
+                                <div>
+                                    <span v-html="scope.row.rbDecision"></span>
+                                </div>
+                            </template>
+                            <!-- 一审法院决定 -->
+                            <template v-if="item.value == 'courtDecision1'">
+                                <div>
+                                    <span v-html="scope.row.courtDecision1"></span>
+                                </div>
+                            </template>
+                            <!-- 二审法院决定 -->
+                            <template v-if="item.value == 'courtDecision2'">
+                                <div>
+                                    <span v-html="scope.row.courtDecision2"></span>
+                                </div>
+                            </template>
+                        </div>
+                    </template>
+                </el-table-column>
+
+
+                <!-- <el-table-column prop="claimSort" label="权要/说明书/附图" width="120" align="center">
                     <template slot-scope="scope">
                         <div>
                             <span v-if="scope.row.relatedContent == 1">
@@ -59,8 +242,15 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="proofGroupDescription" label="证据组合" align="center"></el-table-column>
-                <el-table-column prop="featureOrder" label="特征内容">
+                <el-table-column prop="proofGroupDescription" label="证据组合" align="center">
+                    <template slot-scope="scope">
+                        <div>
+                            <div v-if="scope.row.proofGroupDescription">第一次证据组合：{{ scope.row.proofGroupDescription }}</div>
+                            <div v-if="scope.row.proofGroupDescription2">第二次证据组合：{{ scope.row.proofGroupDescription2 }}</div>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="featureOrder" label="特征内容" min-width="250">
                     <template slot-scope="scope" >
                         <div v-if="scope.row.featureText && ['4','8'].indexOf(scope.row.statutesId) ==-1">
                            <span :class="getFeatureDel(scope.row)?'del':''">{{ scope.row.featureText }}</span> 
@@ -113,19 +303,19 @@
                     <template slot-scope="scope">
                         <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
                            <span v-if="scope.row.erIfPresentOpinions1==true">
-                                已陈述
+                                针对性陈述
                             </span>
                             <span v-else-if="scope.row.erIfPresentOpinions1==false">
-                                未陈述
+                                未针对性陈述
                             </span>
                             <span v-else></span>
                         </div>
                         <div v-else>
                             <span v-if="scope.row.feIfPresentOpinions1==true">
-                                已陈述
+                                针对性陈述
                             </span>
                             <span v-else-if="scope.row.feIfPresentOpinions1==false">
-                                未陈述
+                                未针对性陈述
                             </span>
                             <span v-else></span>
                         </div>
@@ -158,19 +348,19 @@
                             <template slot-scope="scope">
                                 <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
                                     <span v-if="scope.row.secondErIfPresentOpinions1==true">
-                                        已陈述
+                                        针对性陈述
                                     </span>
                                     <span v-else-if="scope.row.secondErIfPresentOpinions1==false">
-                                        未陈述
+                                        未针对性陈述
                                     </span>
                                     <span v-else></span>
                                 </div>
                                 <div v-else>
                                     <span v-if="scope.row.feIfPresentOpinions2==true">
-                                        已陈述
+                                        针对性陈述
                                     </span>
                                     <span v-else-if="scope.row.feIfPresentOpinions2==false">
-                                        未陈述
+                                        未针对性陈述
                                     </span>
                                     <span v-else></span>
                                 </div>
@@ -207,7 +397,7 @@
                             <span v-html="scope.row.courtDecision2"></span>
                         </div>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column prop="proofGroupDescription" label="操作" align="center" min-width="130px">
                     <template slot-scope="scope">
                         <div>
@@ -232,6 +422,7 @@
     <ReviewCommittee ref="ReviewCommittee" :projectId="projectId" :ifSecondInvalid="ifSecondInvalid" @save="getList"></ReviewCommittee>
     <addFeature ref="addFeature" :projectId="projectId" :ifSecondInvalid="ifSecondInvalid" @save="getList"></addFeature>
 
+    <fields ref="field" :projectId="projectId" url="setEvidenceReasonTableColumns" @getFieldList="getFieldList"></fields>
   </div>
 </template>
 
@@ -242,6 +433,7 @@ import claimAndFeatureHistory from '../dialog/claimAndFeatureHistory.vue';
 import reasonsAndEvidenceDetails from './details.vue'
 import ReviewCommittee from '../dialog/ReviewCommittee.vue';
 import addFeature from '../dialog/addFeature.vue'
+import fields from '@/views/components/dialog/fields.vue';
 import { getTableHeight } from '@/views/components/mixins'
 import mixins from './mixins';
 export default {
@@ -251,12 +443,13 @@ export default {
     claimAndFeatureHistory,
     reasonsAndEvidenceDetails,
     ReviewCommittee,
-    addFeature
+    addFeature,
+    fields
   },
   mixins:[getTableHeight,mixins],
   props: {
     projectId:{
-        default:0
+        default:null
     },
     ifSecondInvalid:{
         default:false
@@ -275,7 +468,8 @@ export default {
         mergeArr: ['claimSort','statutesId','proofGroupDescription','featureOrder'],
         expends:[],
         refreshData:true,
-        claims:[]
+        claims:[],
+        columnList:[]
     };
   },
   watch: {},
@@ -285,7 +479,8 @@ export default {
     }
   },
   created() {},
-  mounted() {
+  async mounted() {
+    this.columnList = await this.$commonJS.getCustomField(null,{projectId:this.projectId},'getEvidenceReasonTableColumns')
     this.getList()
     this.getClaims()
   },
@@ -427,6 +622,18 @@ export default {
     },
     //更新数据
     updateData(field,val,row,num,ifGroup){
+        if(['description2','description'].includes(field)){
+            var proofGroupId = row.id
+            var obj = {
+                description2:'proofGroupDescription2',
+                description:'proofGroupDescription',
+            }
+            var index = this.tableData.findIndex(item=>{
+                return item.proofGroupId == proofGroupId
+            })
+            this.tableData[index][obj[field]] = val
+            return false
+        }
         if(['rbDecision','courtDecision1','courtDecision1'].includes(field)){
             var claimId = row.claimId
             var index = this.tableData.findIndex(item=>{
@@ -542,6 +749,7 @@ export default {
                             ...obj,
                             proofGroupId : obj.proofGroups[j].id,
                             proofGroupDescription : obj.proofGroups[j].description,
+                            proofGroupDescription2 : obj.proofGroups[j].description2,
                             evidenceReason:obj.proofGroups[j].evidenceReason
                         }
                         if( obj.proofGroups[j].evidenceReason &&  obj.proofGroups[j].evidenceReason.length>0){
@@ -876,6 +1084,9 @@ export default {
             return false
         }
         switch(option){
+            case '0':// 显示栏位管理
+                this.showField()
+                break;
             case '1'://添加无效理由（无效法条）
             case '2'://添加证据组合
                 this.addInvalidResponse(option)
@@ -891,6 +1102,14 @@ export default {
                 break;
         }
     },
+    // 显示栏位管理
+    showField() {
+      this.$refs.field.open(this.columnList)
+    },
+    // 显示栏位管理组件返回数据
+    getFieldList(val) {
+      this.columnList = val
+    },
     //添加无效理由、证据组合
     addInvalidResponse(type){
         var titles = {
@@ -933,7 +1152,11 @@ export default {
         if(statutes.indexOf(row.statutesId)==-1 && !row.proofGroupId){
             var params = {
                 projectId:this.projectId,
-                descriptions:[''],
+                descriptions:[
+                    {
+                        description1:'',
+                    }
+                ],
                 statutesId:row.statutesId,
                 claimId:row.claimId
             }
@@ -941,12 +1164,13 @@ export default {
                 if(response.code == 200){
                    row.proofGroupId = response.data.data[0]
                    row.proofGroupDescription = ''
+                   row.proofGroupDescription2 = ''
                    var form = {
                         groupId:row.proofGroupId,
                         claimSort:row.claimSort,
                         claimId:row.claimId,
                         claimText:row.claimText,
-                        proofGroupDescription:row.proofGroupDescription,
+                        proofGroupDescription:this.ifSecondInvalid?row.proofGroupDescription2:row.proofGroupDescription,
                         statutesId:row.statutesId,
                         statutesContent:this.getProvisionName(row.statutesId),
                     }
@@ -971,13 +1195,12 @@ export default {
         var data = this.tableData.filter(item=>{
             return item.proofGroupId == row.proofGroupId && item.featureId
         })
-        console.log(data)
         var form = {
             groupId:row.proofGroupId,
             claimSort:row.claimSort,
             claimId:row.claimId,
             claimText:row.claimText,
-            proofGroupDescription:row.proofGroupDescription,
+            proofGroupDescription:this.ifSecondInvalid?row.proofGroupDescription2:row.proofGroupDescription,
             statutesId:row.statutesId,
             statutesContent:this.getProvisionName(row.statutesId),
         }

src/views/task/components/index.vue

@@ -6,7 +6,7 @@
           <mySearch :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch>
         </div>
         <div>
-          <el-button v-if="!show" class="margin-right_10" type="primary" size="small" @click="createTask">创建任务</el-button>
+          <el-button v-if="show" class="margin-right_10" type="primary" size="small" @click="createTask">创建任务</el-button>
         </div>
       </el-header>
       <el-main class="height_100">

src/views/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Table :projectId="projectId" :show="true"></Table>
+    <Table :projectId="projectId"></Table>
   </div>
 </template>