解决创建报告弹窗不关闭问题

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

@@ -37,8 +37,6 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown" style="margin-top:0px">
                   <!-- 遍历按钮 -->
-                  <el-dropdown-item @click.native="handleAnalyse(0)"
-                    v-if="$permission('/workspace/createReport/invalid')">无效分析</el-dropdown-item>
                   <el-dropdown-item @click.native="handleAnalyse(1)"
                     v-if="$permission('/workspace/createReport/invalid')">第三方意见</el-dropdown-item>
                   <el-dropdown-item @click.native="handleAnalyse(2)"
@@ -47,8 +45,7 @@
                     v-if="$permission('/workspace/createReport/tort')">侵权分析</el-dropdown-item>
                   <el-dropdown-item @click.native="handleAnalyse(5)"
                     v-if="$permission('/workspace/createReport/avoidDesign')">回避设计</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAnalyse(7)"
-                    v-if="$permission('/workspace/createReport/reInvalid')">无效应对</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAnalyse(7)">官方无效</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <el-button type="primary" size="small" @click="handleSelect('PatentExport')">导出文档</el-button>
@@ -115,6 +112,8 @@
         </div>
       </el-main>
     </el-container>
+    <!-- 创建报告 -->
+    <addAndEditReport ref="addAndEditReport"></addAndEditReport>
   </div>
 </template>
 
@@ -129,7 +128,7 @@ import PatentPDF from './patentMessage/PatentPDF.vue'
 import { projectData, handleData } from '../../patentCollection/components/mixins/index'
 
 import PatentField from './PatentField.vue'
-
+import addAndEditReport from '@/views/report/components/dialog/addAndEditReport.vue'
 export default {
   components: {
     PatentBasic,
@@ -140,6 +139,7 @@ export default {
     PatentStatus,
     PatentPDF,
     PatentField,
+    addAndEditReport
   },
   mixins: [projectData, handleData],
   props: {
@@ -309,19 +309,19 @@ export default {
     },
     // 创建报告：无效分析等点击事件
     handleAnalyse(id) {
-      this.$api.getProject({ id: this.projectId }).then(response => {
-        var form = {
-          type: id,
-          signPatentNo: this.pNo,
+      var form = {
+          reportType: id,
+          signPatentNo: this.patent.patentNo,
           projectId: this.projectId,
-          departmentId: response.data[0].departmentId,
-          personId: response.data[0].personnelId,
-          clientId: response.data[0].clientId,
-          proTec: response.data[0].technicalTheme,
-          scenarioList: response.data[0].scenarioList
+          // departmentId: response.data[0].departmentId,
+          // personId: response.data[0].personnelId,
+          // clientId: response.data[0].clientId,
+          matterId: [],
+          scenarioId: [],
+          inventionName:this.getView(this.patent, 'title')
         }
-        this.$refs.ReportForm.open(form)
-      })
+        this.$refs.addAndEditReport.open(form)
+
     },
     handleSelect(index) {
       if (index === 'PatentExport') {

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

@@ -37,24 +37,24 @@
           <div>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="案件编号">
+                <el-form-item label="案件编号" prop="caseNumber">
                   <el-input v-model="form.caseNumber" @change="getPatentNo" autocomplete="off" placeholder="请输入案件编号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="无效宣告请求人">
+                <el-form-item label="无效宣告请求人" prop="invalidApplication">
                     <el-input v-model="form.invalidApplication" autocomplete="off" placeholder="请输入无效宣告请求人"></el-input>
                   </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="发文序号">
+                <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">
-                <el-form-item label="发明创造名称">
+                <el-form-item label="发明创造名称" prop="inventionName">
                   <el-input v-model="form.inventionName" autocomplete="off" placeholder="请输入发明创造名称"></el-input>
                 </el-form-item>
               </el-col>
@@ -63,7 +63,7 @@
         </template>
         <el-row>
               <el-col :span="12">
-                <el-form-item label="主被动类型">
+                <el-form-item label="主被动类型" prop="actType">
                   <el-select v-model="form.actType" placeholder="请选择" style="width:100%">
                     <el-option
                       v-for="item in actTypes "
@@ -75,7 +75,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="是否完成" v-if="!form.id">
+                <el-form-item label="是否完成" v-if="!form.id" prop="status">
                   <el-switch v-model="form.status" active-color="#13ce66" inactive-color="#ff4949" @change="changeStatus"
                     :active-value="3" :inactive-value="2">
                   </el-switch>
@@ -85,16 +85,16 @@
         
         <template v-if="!form.id && form.status == 3">
           <div>
-            <el-form-item label="核心结论">
+            <el-form-item label="核心结论" prop="cronIds">
               <el-checkbox-group v-model="form.cronIds">
                 <el-checkbox v-for="item in conclusion" :key="item.value" :label="item.value">{{
                   item.label }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-            <el-form-item label="结论论述">
+            <el-form-item label="结论论述" prop="cronDescription">
               <el-input v-model="form.cronDescription" type="textarea" placeholder="请输入结论论述"></el-input>
             </el-form-item>
-            <el-form-item label="后续跟进事项" v-if="$permission('/rms/matter')">
+            <el-form-item label="后续跟进事项" v-if="$permission('/rms/matter')" prop="followUps">
               <span v-if="form.followUps"><span v-for="item in form.followUps" :key="item.followUpName"
                   style="margin-right:10px">{{ item.followUpName }}</span></span>
               <span>
@@ -153,19 +153,19 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="产品/技术">
+            <el-form-item label="产品/技术" prop="productOrTech">
               <el-input v-model="form.productOrTech" autocomplete="off" placeholder="请输入产品/技术"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="form.track ? 12 : 24">
-            <el-form-item label="关联报告">
+            <el-form-item label="关联报告" prop="associateReportName">
               <el-input v-model="form.associateReportName" autocomplete="off" placeholder="请输入关联报告"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="需要复制的选项" v-show="form.track">
+            <el-form-item label="需要复制的选项" v-show="form.track" prop="copyIds">
               <el-select v-model="form.copyIds" multiple clearable placeholder="请选择需要复制的选项" :popper-append-to-body="false"
                 @change="changeCopyIds">
                 <el-option v-for="item in copyList" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -177,7 +177,7 @@
           <div>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="事件：">
+                <el-form-item label="事件：" prop="eventId">
                   <mySelectButton size='large' style="width:100%" @click="addEvent">
                     <div style="width:100%">
                       <el-select style="width:100%" v-model="form.eventId" @change="changeEvent" filterable remote
@@ -193,7 +193,7 @@
             </el-row>
             <el-row v-if="show == true">
               <el-col :span="24">
-                <el-form-item label="调查类型：" prop="matterIds">
+                <el-form-item label="调查类型：" prop="matterIds" >
                   <el-checkbox-group v-model="form.matterIds">
                     <template>
                       <el-checkbox v-for="item in dictAssociates" :key="item.id" :label="parseInt(item.id)">
@@ -208,7 +208,7 @@
         </template>
         <template v-if="form.reportType == 7 && !form.id">
           <div>
-            <el-form-item label="无效请求书">
+            <el-form-item label="无效请求书" prop="flowPath">
               <div v-if="form.flowPath">
                 <div v-if="form.flowPath.systemFileList && form.flowPath.systemFileList.length>0">
                   <div v-for="item in form.flowPath.systemFileList" :key="item.guid">
@@ -223,7 +223,7 @@
             </el-form-item>
           </div>
         </template>
-        <el-form-item :label="(!form.id && form.status == 3) ? '上传报告文档' : '上传附件'">
+        <el-form-item :label="(!form.id && form.status == 3) ? '上传报告文档' : '上传附件'" prop="systemFileList">
           <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove" style="height: 180px;" :autoUpload="true"></myUpload>
         </el-form-item>
         <el-form-item label="备注" prop="description">