韶音需求修改

src/assets/css/main.scss

@@ -241,4 +241,11 @@
 .pizhuLightHeigh{
   position: relative;
   background: #409EFF !important;
+}
+
+.textEmpty{
+  &:empty::after{
+    content: "无数据";
+    color:#c2c5c9;
+  }
 }

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

@@ -2,6 +2,12 @@
     <div class="responseDialog">
       <el-dialog  :title="(form.id?'编辑':'添加') +type.title" :visible.sync="showDialog" width="700px" :close-on-click-modal="false"  :before-close="handleClose" append-to-body>
         <el-form  :model="form" :rules="rules" ref="form" label-width="120px" label-position="left">
+          <template v-if="type.type==8">
+            <el-form-item label="案件子阶段">
+              <el-input  v-model="form.recordDescription" autocomplete="off" placeholder="请输入案件子阶段名称"></el-input>
+            </el-form-item>
+          </template>
+
           <el-form-item :label="type.time">
             <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>
@@ -34,12 +40,15 @@
                 <el-form-item label="决定要点">
                     <el-input v-model="form.decisionKey" autocomplete="off" placeholder="请输入决定要点"></el-input>
                 </el-form-item>
-               
+                <el-form-item label="无效结果">
+                  <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
+                    item.label }}</el-checkbox>
+                </el-form-item>
             </div>
           </template>
-          <template v-if="type.type ==3 || type.type ==5">
+          <template v-if="type.type ==5">
             <div>
-              <el-form-item label="结论">
+              <el-form-item label="行诉结果">
                     <el-input v-model="form.conclusion" autocomplete="off" placeholder="请输入结论"></el-input>
                 </el-form-item>
             </div>
@@ -123,7 +132,11 @@ const defaultSendEmail = ['0','1','3','4','5','7','8']
         showDialog: false,
         loading: false,
         form: {},
-        rules: {},
+        rules: {
+          name: [
+            { required: true, message: '请输入案件子阶段名称', trigger: 'blur' }
+          ],
+        },
         file: [],
         isFinish: false,
         type:{},
@@ -192,12 +205,17 @@ const defaultSendEmail = ['0','1','3','4','5','7','8']
     },
     watch: {
     },
+    computed:{
+      conclusion() {
+        return this.$store.state.dictMessage.dictMessage.REINVALID_ASSESS
+      },
+    },
     mounted() {
   
     },
     methods: {
         open(type,form) {
-            this.type = this.types[type]
+            this.type = this.types[type] || {}
             this.form = JSON.parse(JSON.stringify(form))
             this.otherPerson = []
             if(this.$permission.FunPermissions('xiaoshi/sendEmail')){

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

@@ -3,9 +3,9 @@
     <!-- 无效流程 -->
     <div style="display: flex;justify-content: end;margin-bottom: 10px;" v-if="!taskId">
       <!-- <el-button type="primary" size="small" @click="addOption">添加陈述意见</el-button> -->
-      <el-dropdown @command="handleCommand">
+      <!-- <el-dropdown @command="handleCommand">
         <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" >
           <el-dropdown-item command="1">添加无效请求书</el-dropdown-item>
@@ -18,7 +18,27 @@
           <el-dropdown-item command="5">添加行政诉讼判决书</el-dropdown-item>
           <el-dropdown-item command="8">添加其他文档</el-dropdown-item>
         </el-dropdown-menu>
+      </el-dropdown> -->
+      <el-dropdown trigger="click">
+        <el-button type="primary" size="small">
+          上传案件子阶段文件<i class="el-icon-arrow-down el-icon--right"></i>
+        </el-button>
+        <el-dropdown-menu slot="dropdown" >
+          <template v-for="(menu,index) in menuList">
+            <el-dropdown-item :key="'menu1'+index" v-if="menu.children && menu.children.length">
+              <el-dropdown placement="left-start" >
+                  <span>{{ menu.title }}<i class="el-icon-arrow-right"></i></span>
+                <el-dropdown-menu slot="dropdown" >
+                  <el-dropdown-item v-for="menuItem in menu.children" :key="menuItem.id" :command="menuItem.id" @click.native="handleCommand(menuItem)">{{menuItem.title}}</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-dropdown-item>
+            <el-dropdown-item v-else :key="'menu2'+index" :command="menu.id" @click.native="handleCommand(menu)">{{menu.title}}</el-dropdown-item>
+          </template>
+        </el-dropdown-menu>
+        
       </el-dropdown>
+      
     </div>
     <div >
       <el-timeline>
@@ -44,10 +64,10 @@
               <p><span>决定书号码：</span><span>{{ item.invalidDecisionFileVO.fileNo }}</span></p>
               <p><span>法律依据：</span><span>{{ item.invalidDecisionFileVO.legalBase }}</span></p>
               <p><span>决定要点：</span><span>{{ item.invalidDecisionFileVO.decisionKey }}</span></p>
-              <p><span>结论：</span><span>{{ item.invalidDecisionFileVO.conclusion }}</span></p>
+              <p><span>无效结果：</span><span>{{ item.invalidDecisionFileVO.conclusion }}</span></p>
             </div>
             <div v-if="item.affairType==5">
-              <p><span>结论：</span><span>{{ item.judgementVO.conclusion }}</span></p>
+              <p><span>行诉结果：</span><span>{{ item.judgementVO.conclusion }}</span></p>
             </div>
             <div v-if="item.affairType==8">
               <p><span>文档名称：</span><span>{{ item.otherDocumentsVO.documentName }}</span></p>
@@ -98,6 +118,59 @@ export default {
         '7':  '补充证据和理由时间',
         '8':'文档时间'
       },
+      menuList:[
+        {
+          title:'无效',
+          children:[
+            {
+              title:'添加无效请求书',
+              id:1,
+              stage:'无效',
+              childStage:'无效受理'
+            },
+            {
+              title:'添加权要修改记录',
+              id:2,
+              stage:'无效',
+              childStage:'专利权人提交权要修改'
+            }
+          ]
+        },
+        {
+          title:'行诉一审',
+          children:[
+            {
+              title:'添加行政诉讼起诉状',
+              id:3,
+              stage:'行诉一审',
+              childStage:'行诉一审立案'
+            },
+            {
+              title:'添加行政诉讼判决书',
+              id:4,
+              stage:'行诉一审',
+              childStage:'已出一审判决'
+            }
+          ]
+        },
+        {
+          title:'行诉二审',
+          children:[
+            {
+              title:'添加行政诉讼起诉状',
+              id:5,
+              stage:'行诉一审',
+              childStage:'行诉一审立案'
+            },
+            {
+              title:'添加行政诉讼判决书',
+              id:6,
+              stage:'行诉一审',
+              childStage:'已出一审判决'
+            }
+          ]
+        },
+      ]
     }
   },
   computed: {},
@@ -182,6 +255,9 @@ export default {
         this.$showPermissionDialog()
         return false
       }
+      if(!option){
+        return
+      }
       var form = {
         systemFileList:[]
       }

src/views/report/InvalidResponse/components/litigation/components/form.vue

@@ -0,0 +1,64 @@
+<template>
+    <div>
+        <el-form style="width:100%" :model="form" label-width="140px">
+            <template>
+                <div>
+                    <el-row>
+                        <el-col v-for="(column,index) in columnList" :key="index" :span="column.span || 12">
+                            <el-form-item :label="`${column.label}：`">
+                                <div v-if="model=='view' || column.noEdit" class="box1 textEmpty" v-html="$commonJS.getColumnData(form, { type: 'String', value: column.field })"></div>
+                                <template v-if="model=='edit' && !column.noEdit">
+                                    <el-date-picker v-if="column.type=='date'"  v-model="form[column.field]" value-format="yyyy-MM-dd" type="date"  placeholder="请选择时间" style="width: 100%;"></el-date-picker>
+                                    <el-input v-else v-model="form[column.field]" autocomplete="off" :placeholder="`请输入${column.label}`"></el-input>
+                                </template>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </div>
+            </template>
+            
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {
+    columnList:{
+        type:Array,
+        default:()=>{
+            return []
+        }
+    },
+    form:{
+        type:Object,
+        default:()=>{
+            return {}
+        }
+    },
+    model:{
+        type:String,
+        default:'view'
+    }
+  },
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+.box1{
+    // border: 2px solid var(--color1);
+    // border-radius: 5px;
+    padding: 0px 10px;
+    color: var(--color1);
+    font-size: medium;
+}
+</style>

src/views/report/InvalidResponse/components/litigation/index.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="height_100">
+      <litigation :projectId="projectId"></litigation>
+    </div>
+</template>
+  
+<script>
+import litigation from './litigation.vue';
+export default {
+    components: {
+        litigation
+    },
+    props: {},
+    data() {
+      return {
+      };
+    },
+    watch: {},
+    computed: {
+      projectId(){
+          return this.$route.query.projectId
+      }
+    },
+    created() {},
+    mounted() {},
+    methods: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,204 @@
+<template>
+  <div class="litigation">
+    <div class="item">
+        <div class="title">
+            <div>
+                行诉一审
+                <span>
+                    <i v-if="!show.litigation1" class="el-icon-caret-right" @click="show.litigation1 = !show.litigation1"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.litigation1 = !show.litigation1"></i>
+                </span>
+            </div>
+            <div>
+                <el-button v-if="litigation1.model=='view'" type="text" @click="edit('litigation1')">编辑</el-button>
+                <template v-else-if="litigation1.model=='edit'">
+                    <el-button type="text" @click="save('litigation1')">保存</el-button>
+                    <el-button type="text" @click="cancel('litigation1')">取消修改</el-button>
+                </template>
+            </div>
+        </div>
+        <div v-show="show.litigation1" class="content">
+            <litigationForm :columnList="litigation1.columnList" :model="litigation1.model" :form="litigation1.data"></litigationForm>
+        </div>
+    </div>
+    <div class="item">
+        <div class="title">
+            <div>
+                行诉二审
+                <span>
+                    <i v-if="!show.litigation2" class="el-icon-caret-right" @click="show.litigation2 = !show.litigation2"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.litigation2 = !show.litigation2"></i>
+                </span>
+            </div>
+            <div>
+                <el-button v-if="litigation2.model=='view'" type="text" @click="edit('litigation2')">编辑</el-button>
+                <template v-else-if="litigation2.model=='edit'">
+                    <el-button type="text" @click="save('litigation2')">保存</el-button>
+                    <el-button type="text" @click="cancel('litigation2')">取消修改</el-button>
+                </template>
+            </div>
+        </div>
+        <div  v-show="show.litigation2" class="content">
+            <litigationForm :columnList="litigation2.columnList" :model="litigation2.model" :form="litigation2.data"></litigationForm>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+const litigation1 = [
+    {
+        label:'行诉一审案号',
+        field:'value1'
+    },
+    {
+        label:'一审立案时间',
+        field:'value2',
+        type:'date'
+    },
+    {
+        label:'一审原告',
+        field:'value3'
+    },
+    {
+        label:'一审被告',
+        field:'value4'
+    },
+    {
+        label:'第三人',
+        field:'value5'
+    },
+    {
+        label:'合议庭成员',
+        field:'value6'
+    },
+    {
+        label:'原告代理人',
+        field:'value7'
+    },
+    {
+        label:'第三人代理人',
+        field:'value8'
+    },
+    {
+        label:'一审进展/结果',
+        field:'value9',
+        noEdit:true
+    },
+]
+const litigation2 = [
+    {
+        label:'行诉二审案号',
+        field:'value1'
+    },
+    {
+        label:'二审立案时间',
+        field:'value2',
+        type:'date'
+    },
+    {
+        label:'二审原告',
+        field:'value3'
+    },
+    {
+        label:'二审被告',
+        field:'value4'
+    },
+    {
+        label:'第三人',
+        field:'value5'
+    },
+    {
+        label:'合议庭成员',
+        field:'value6'
+    },
+    {
+        label:'原告代理人',
+        field:'value7'
+    },
+    {
+        label:'第三人代理人',
+        field:'value8'
+    },
+    {
+        label:'二审进展/结果',
+        field:'value9',
+        noEdit:true
+    },
+]
+import litigationForm from './components/form.vue'
+export default {
+  components: {
+    litigationForm
+  },
+  props: {
+    projectId:{
+
+    }
+  },
+  data() {
+    return {
+        litigation1:{
+            columnList:litigation1,
+            model:'view',
+            data:{}
+        },
+        litigation2:{
+            columnList:litigation2,
+            model:'view',
+            data:{}
+        },
+        editMessage:{},
+        show:{
+            litigation1:true,
+            litigation2:true
+        }
+    };
+  },
+  watch: {
+    projectId(){
+        this.getData()
+    }
+  },
+  computed: {},
+  created() {},
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData(){
+
+    },
+    //编辑数据
+    edit(field){
+        this.editMessage[field] = JSON.stringify(this[field].data)
+        this[field].model = 'edit'
+    },
+    //保存数据
+    save(field){
+        this.editMessage[field] = null
+        this[field].model = 'view'
+    },
+    // 取消修改
+    cancel(field){
+        if(this.editMessage[field]){
+            this[field].data = JSON.parse(this.editMessage[field])
+            this.editMessage[field] = null
+        }
+        this[field].model = 'view'
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.litigation{
+    .item{
+        .title{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            font-weight: bold;
+        }
+    }
+}
+</style>

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

@@ -59,7 +59,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="发文序号：">
+              <el-form-item label="无效决定号：">
                 <div class="box1" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'issueNumber' })"></div>
               </el-form-item>
             </el-col>

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

@@ -27,7 +27,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="专利名称：">
-                                    <div class="box1" v-html="getView(patentMessage, 'title')"></div>
+                                    <div class="box1 textEmpty" v-html="getView(patentMessage, 'title')"></div>
                                     <el-link v-if="haveTranslatedText(patentMessage, 'title')" type="primary" @click.native="handleChange(patentMessage, 'title')"
                                         style="margin-left: 10px;margin-top: -3px;">
                                         <span v-if="!patentMessage.change">切换译文</span>
@@ -42,7 +42,7 @@
                                     <div>
                                         <el-form-item label="专利权人：">
                                             <div class="box1">
-                                                <div class="box1" v-html="$commonJS.getColumnData(patentMessage, { type: 'Array', value: 'rightHolder' })"></div>
+                                                <div class="box1 textEmpty" v-html="$commonJS.getColumnData(patentMessage, { type: 'Array', value: 'rightHolder' })"></div>
                                             </div>
                                         </el-form-item>
                                     </div>
@@ -50,7 +50,7 @@
                             </el-col>
                             <el-col :span="12" v-if="patentMessage.simpleStatus">
                                 <el-form-item label="法律状态：">
-                                    <div class="box1" v-html="simpleStatus[patentMessage.simpleStatus]"></div>
+                                    <div class="box1 textEmpty" v-html="simpleStatus[patentMessage.simpleStatus]"></div>
                                     
                                 </el-form-item>
                             </el-col>
@@ -73,7 +73,7 @@
                             </el-col>
                             <el-col :span="24" v-if="patentMessage.abstractStr">
                                 <el-form-item label="摘要：">
-                                    <div class="box1" v-html="getView(patentMessage, 'abstractStr','摘要'+(patentMessage.change2?'译文':'原文'))"></div>
+                                    <div class="box1 textEmpty" v-html="getView(patentMessage, 'abstractStr','摘要'+(patentMessage.change2?'译文':'原文'))"></div>
                                     <span v-if="haveTranslatedText(patentMessage, 'abstractStr')">
                                         <el-link type="primary" @click.native="handleChange(patentMessage, 'abstractStr')" >
                                         <span v-if="!patentMessage.change2">切换译文</span>
@@ -90,7 +90,7 @@
         </div>
         <div class="message">
             <div class="title">
-                案件信息
+                无效信息
                 <span>
                     <i v-if="!show.showCaseMessage" class="el-icon-caret-right" @click="show.showCaseMessage = !show.showCaseMessage"></i>
                     <i v-else class="el-icon-caret-bottom" @click="show.showCaseMessage = !show.showCaseMessage"></i>
@@ -100,7 +100,10 @@
                 <el-card shadow="always">
                     <el-form style="width:100%" :model="reportMessage" label-width="140px">
                         <el-form-item label="专题名称：">
-                            <div class="box1" v-html="reportMessage.name"></div>
+                            <div class="box1 textEmpty" v-html="reportMessage.name"></div>
+                        </el-form-item>
+                        <el-form-item label="结论论述：">
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
                         </el-form-item>
                         <el-form-item label="核心结论：" >
                             <div  v-if="!editField.cardingOpinion" style="display:flex;align-items:center">
@@ -118,7 +121,7 @@
                             </div>
                         </el-form-item>
                         <el-form-item label="无效法条：">
-                            <div class="box1">
+                            <div class="box1 textEmpty">
                                 <div v-if="statutes.invalidStatutes1.length>0">
                                    三性法条： {{ statutes.invalidStatutes1.join('、') }}
                                 </div>
@@ -127,11 +130,81 @@
                                 </div>
                             </div>
                         </el-form-item>
+                        <el-form-item label="无效结果：">
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
+                        </el-form-item>
+                        <el-form-item label="附件：">
+                            <div class="box1 textEmpty">
+                                <div v-for="item in reportMessage.systemFileList" style="display:flex;align-items:center" :key="item.guid">
+                                    <div style="margin-right:20px">{{ item.originalName }}</div>
+                                    <my-menu :data="item" :deleted="false"></my-menu>
+                                </div>
+                            </div>
+                        </el-form-item>
+                        <template v-if="reportMessage.reportType == 7">
+                            <div>
+                                <el-row>
+                                    <el-col :span="12">
+                                    <el-form-item label="案件编号：">
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseNumber' })"></div>
+                                    </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                    <el-form-item label="无效宣告请求人：">
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'invalidApplication' })"></div>
+                                    </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="无效决定号：">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'issueNumber' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="发明创造名称：">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'inventionName' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="案件阶段：" prop="caseStage">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseStage' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="国知局受理年份：" prop="acceptYear">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'acceptYear' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="12">
+                                        <el-form-item label="请求人代理所：" prop="applicantAgency">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'applicantAgency' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="专利权人代理所：" prop="rightHolderAgency">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'rightHolderAgency' })"></div>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </template>
+                        <el-form-item label="负责人：" prop="headId">
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'headName' })"></div>
+                        </el-form-item>
+                        <el-form-item label="备注：" prop="description">
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'description' })"></div>
+                        </el-form-item>
                     </el-form>
                 </el-card>
             </div>
         </div>
-        <div class="message">
+        <!-- <div class="message">
             <div class="title">
                 更多信息
                 <span>
@@ -147,24 +220,24 @@
                                 <el-row>
                                     <el-col :span="12">
                                     <el-form-item label="案件编号：">
-                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseNumber' })"></div>
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseNumber' })"></div>
                                     </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
                                     <el-form-item label="无效宣告请求人：">
-                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'invalidApplication' })"></div>
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'invalidApplication' })"></div>
                                     </el-form-item>
                                     </el-col>
                                 </el-row>
                                 <el-row>
                                     <el-col :span="12">
-                                        <el-form-item label="发文序号：">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'issueNumber' })"></div>
+                                        <el-form-item label="无效决定号：">
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'issueNumber' })"></div>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="发明创造名称：">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'inventionName' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'inventionName' })"></div>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
@@ -172,51 +245,51 @@
                                 <el-row>
                                     <el-col :span="12">
                                         <el-form-item label="案件阶段" prop="caseStage">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseStage' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'caseStage' })"></div>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="国知局受理年份" prop="acceptYear">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'acceptYear' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'acceptYear' })"></div>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                                 <el-row>
                                     <el-col :span="12">
                                         <el-form-item label="请求人代理所" prop="applicantAgency">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'applicantAgency' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'applicantAgency' })"></div>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="专利权人代理所" prop="rightHolderAgency">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'rightHolderAgency' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'rightHolderAgency' })"></div>
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                             </div>
                         </template>
                         <el-form-item label="是否完成：">
-                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'status' })==3?'是':'否'"></div>
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'status' })==3?'是':'否'"></div>
                         </el-form-item>
                         <template>
                             <div>
-                                <el-form-item label="报告结果：">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
+                                <el-form-item label="无效结果：">
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'cronNames' })"></div>
                                 </el-form-item>
                                 <el-form-item label="结论论述：">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'cronDescription' })"></div>
                                 </el-form-item>
                             </div>
                         </template>
                         <el-row>
                             <el-col :span="12">
                                 <el-form-item label="承担部门：" prop="departmentId">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="负责人：" prop="headId">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'headName' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'headName' })"></div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -225,31 +298,31 @@
                                 <template>
                                     <div>
                                         <el-form-item label="委托方：" prop="entrustId" v-if="userinfo.tenantType == 1">
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'entrustName' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'entrustName' })"></div>
                                         </el-form-item>
                                         <el-form-item label="委托部门：" prop="departmentId" v-else>
-                                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
+                                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'departmentName' })"></div>
                                         </el-form-item>
                                     </div>
                                 </template>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="卷号：" prop="volumeNumber">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'volumeNumber' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'volumeNumber' })"></div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row>
                             <el-col :span="24">
                                 <el-form-item label="产品/技术：">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'productOrTech' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'productOrTech' })"></div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row>
                             <el-col :span="24">
                                 <el-form-item label="关联报告：">
-                                    <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'associateReportName' })"></div>
+                                    <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'associateReportName' })"></div>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -258,21 +331,21 @@
                             <el-row>
                                 <el-col :span="24">
                                     <el-form-item label="事件：">
-                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'eventNames' })"></div>
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'eventNames' })"></div>
                                     </el-form-item>
                                 </el-col>
                             </el-row>
                             <el-row>
                                 <el-col :span="24">
                                     <el-form-item label="调查类型：" prop="matterIds">
-                                        <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'matterNames' })"></div>
+                                        <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'Array', value: 'matterNames' })"></div>
                                     </el-form-item>
                                 </el-col>
                             </el-row>
                             </div>
                         </template>
                         <el-form-item label="附件：">
-                            <div class="box1">
+                            <div class="box1 textEmpty">
                                 <div v-for="item in reportMessage.systemFileList" style="display:flex;align-items:center" :key="item.guid">
                                     <div style="margin-right:20px">{{ item.originalName }}</div>
                                     <my-menu :data="item" :deleted="false"></my-menu>
@@ -280,11 +353,25 @@
                             </div>
                         </el-form-item>
                         <el-form-item label="备注：" prop="description">
-                            <div class="box1" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'description' })"></div>
+                            <div class="box1 textEmpty" v-html="$commonJS.getColumnData(reportMessage, { type: 'String', value: 'description' })"></div>
                         </el-form-item>
                     </el-form>
                 </el-card>
             </div>
+        </div> -->
+        <div class="message">
+            <div class="title">
+                行政诉讼
+                <span>
+                    <i v-if="!show.showLitigation" class="el-icon-caret-right" @click="show.showLitigation = !show.showLitigation"></i>
+                    <i v-else class="el-icon-caret-bottom" @click="show.showLitigation = !show.showLitigation"></i>
+                </span>
+            </div>
+            <div v-show="show.showLitigation">
+                <el-card shadow="always">
+                    <litigationVue :projectId="projectId"></litigationVue>
+                </el-card>
+            </div>
         </div>
         <div class="message">
             <div class="title">
@@ -307,9 +394,11 @@
 import { mapGetters } from 'vuex';
 import flowPath from '@/views/report/InvalidResponse/components/flowPath/flowPath.vue';
 import { handleData } from '@/views/project/patentCollection/components/mixins/index'
+import litigationVue from '@/views/report/InvalidResponse/components/litigation/litigation.vue';
 export default {
   components: {
-    flowPath
+    flowPath,
+    litigationVue
   },
   mixins:[handleData],
   props: {
@@ -332,7 +421,8 @@ export default {
             showPatentMessage:true,
             showCaseMessage:true,
             showOtherMessage:false,
-            showFlowPath:true
+            showFlowPath:true,
+            showLitigation:true
         },
         statutes:{
             invalidStatutes1:[],

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

@@ -49,8 +49,8 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="发文序号" prop="issueNumber">
-                  <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入发文序号"></el-input>
+                <el-form-item label="无效决定号" prop="issueNumber">
+                  <el-input v-model="form.issueNumber" autocomplete="off" placeholder="请输入无效决定号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -120,7 +120,7 @@
         
         <template>
           <div>
-            <el-form-item label="报告结果" prop="cronIds">
+            <el-form-item :label="form.reportType == '7'?'无效结果':'报告结果'" prop="cronIds">
               <el-checkbox-group v-model="form.cronIds">
                 <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{
                   item.label }}</el-checkbox>

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

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <el-dialog width="800px" title="添加报告结果" :visible.sync="showDialog" :before-close="resetForm">
+        <el-dialog width="800px" :title="form.reportType==7?'添加无效结果':'添加报告结果'" :visible.sync="showDialog" :before-close="resetForm">
             <el-form :model="form" label-width="120px">
-                <el-form-item label="报告结果">
+                <el-form-item :label="form.reportType==7?'无效结果':'报告结果'">
                 <el-checkbox-group v-model="form.cronIds">
                     <el-checkbox v-for="item in conclusion" :key="parseInt(item.value)" :label="parseInt(item.value)">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
@@ -126,12 +126,12 @@ export default {
           let formData = this.form
             this.$api.updateReportProject(formData).then(response=>{
                 if(response.code == 200){
-                    this.$message.success('报告结果添加成功')
+                    this.$message.success('请求成功')
                     this.resetForm()
                     this.$emit('save',true)
                 }
             }).catch(error=>{
-                this.$message.error('报告结果添加失败')
+                this.$message.error('请求失败')
             })
         },
         //关闭弹窗