Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/router/index.js

@@ -268,7 +268,7 @@ const routes = [
        {
          path: "/relatedPatentsIndex",
          meta: {
-          title: '产品相关价值专利',
+          title: '产品相关专利',
           button: [],
           aside: true,
           hiddenHeader:true

RMS-FrontEnd/src/views/product/components/category.vue

@@ -33,7 +33,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="productCategoryName" label="产品类别名称"   sortable="custom" align="center"> </el-table-column>
-      <el-table-column prop="licenseRate" label="许可费率" sortable="custom" align="center" width="180"> </el-table-column>
+      <el-table-column prop="licenseRate" label="参考许可费率" sortable="custom" align="center" width="180"> </el-table-column>
       <el-table-column prop="createPersonName" label="创建人" sortable="custom" align="center"> </el-table-column>
       <!-- <el-table-column prop="pictures" label="图片" align="center"> 
         <template slot-scope="scope">
@@ -82,8 +82,8 @@
         <el-form-item label="名称 " prop="productCategoryName">
           <el-input v-model="categoryForm.productCategoryName" placeholder="请输入名称"></el-input>
         </el-form-item>
-        <el-form-item label="许可费率 " prop="licenseRate">
-          <el-input v-model="categoryForm.licenseRate" placeholder="请输入许可费率(许可费率介于0-1之间)"></el-input>
+        <el-form-item label="参考许可费率 " prop="licenseRate">
+          <el-input v-model="categoryForm.licenseRate" placeholder="请输入参考许可费率(参考许可费率介于0-1之间)"></el-input>
           <!-- <el-input-number v-model="categoryForm.licenseRate" :precision="2" :step="0.05" :max="1" :min="0" placeholder="请输入许可费率" style="width: 100%;"></el-input-number> -->
         </el-form-item>
         <el-form-item label="图片 ">
@@ -138,11 +138,11 @@ export default {
             // } else {
             //   this.categoryForm.licenseRate=0
             // }
-            callback(new Error('输入错误，许可费率介于0-1之间'))
+            callback(new Error('输入错误，参考许可费率介于0-1之间'))
           }
         } else {
           // this.categoryForm.licenseRate=this.categoryForm.licenseRateA
-          callback(new Error('输入错误，许可费率介于0-1之间'))
+          callback(new Error('输入错误，参考许可费率介于0-1之间'))
         }
       }else{
         callback()

RMS-FrontEnd/src/views/product/components/product.vue

@@ -48,7 +48,7 @@
         </template>
        </el-table-column>
       <el-table-column prop="companyName" label="所属公司" align="center"> </el-table-column>
-      <el-table-column prop="licenseRate" label="许可费率" sortable="custom" align="center" width="180"> </el-table-column>
+      <el-table-column prop="licenseRate" label="参考许可费率" sortable="custom" align="center" width="180"> </el-table-column>
       <el-table-column prop="productCategory.createPersonName" label="创建人" sortable="custom" align="center"> </el-table-column>
       <el-table-column prop="productExplain" label="产品说明" align="center"> </el-table-column>
       <el-table-column prop="productCategory.productCategoryName" label="产品类别名称"   sortable="custom" align="center">
@@ -72,11 +72,11 @@
             <p>编辑</p> 
             <el-dropdown-menu slot="dropdown" style="text-align: center;">
               <el-dropdown-item command="7">预览图片</el-dropdown-item>
-              <el-dropdown-item command="1">产品的架构</el-dropdown-item>
+              <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>
-              <el-dropdown-item command="5">产品相关价值专利</el-dropdown-item>
+              <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
+              <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
+              <el-dropdown-item command="5">相关专利</el-dropdown-item>
               <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -135,8 +135,8 @@
           <el-input v-model="productForm.companyName" :disabled="productForm.tenantId?true:false" placeholder="请输入所属公司"></el-input>
         </el-form-item>
        
-        <el-form-item label="许可费率 " prop="licenseRates">
-          <el-input v-model="productForm.licenseRates" placeholder="请输入许可费率(许可费率介于0-1之间)"></el-input>
+        <el-form-item label="参考许可费率 " prop="licenseRates">
+          <el-input v-model="productForm.licenseRates" placeholder="请输入参考许可费率(参考许可费率介于0-1之间)"></el-input>
         </el-form-item>
         <el-form-item label="图片 ">
           <el-upload ref="upload"  action="#" :auto-upload="false"  :on-change="handleChange"  list-type="picture" :show-file-list="false">
@@ -178,8 +178,8 @@
         <el-form-item label="名称 " prop="productCategoryName">
           <el-input v-model="categoryForm.productCategoryName" placeholder="请输入名称"></el-input>
         </el-form-item>
-        <el-form-item label="许可费率 " prop="licenseRate">
-          <el-input v-model="categoryForm.licenseRate" placeholder="请输入许可费率(许可费率介于0-1之间)"></el-input>
+        <el-form-item label="参考许可费率 " prop="licenseRate">
+          <el-input v-model="categoryForm.licenseRate" placeholder="请输入参考许可费率(许可费率介于0-1之间)"></el-input>
         </el-form-item>
         <el-form-item label="图片 ">
           <el-upload ref="upload"  action="#" :auto-upload="false"  :on-change="handleChange"  list-type="picture" :show-file-list="false">
@@ -228,10 +228,10 @@ export default {
             this.productForm.licenseRate=this.productForm.licenseRates
             callback()
           } else {
-            callback(new Error('输入错误，许可费率介于0-1之间'))
+            callback(new Error('输入错误，参考许可费率介于0-1之间'))
           }
         } else {
-          callback(new Error('输入错误，许可费率介于0-1之间'))
+          callback(new Error('输入错误，参考许可费率介于0-1之间'))
         }
       }else{
         callback()

RMS-FrontEnd/src/views/product/components/productCollapse.vue

@@ -22,7 +22,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="companyName" label="所属公司" align="center"> </el-table-column>
-            <el-table-column prop="licenseRate" label="许可费率" sortable="custom" align="center" width="100"> </el-table-column>
+            <el-table-column prop="licenseRate" label="参考许可费率" sortable="custom" align="center" width="100"> </el-table-column>
             <el-table-column prop="productCategory.createPersonName" label="创建人" sortable="custom" align="center"> </el-table-column>
             <el-table-column prop="productExplain" label="产品说明" align="center"> </el-table-column>
             <el-table-column prop="productCategory.productCategoryName" label="产品类别名称"   sortable="custom" align="center"> 
@@ -45,11 +45,11 @@
                   <p>编辑</p> 
                   <el-dropdown-menu slot="dropdown" style="text-align: center;">
                     <el-dropdown-item command="7">预览图片</el-dropdown-item>
-                    <el-dropdown-item command="1">产品的架构</el-dropdown-item>
+                    <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>
-                    <el-dropdown-item command="5">产品相关价值专利</el-dropdown-item>
+                    <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
+                    <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
+                    <el-dropdown-item command="5">相关专利</el-dropdown-item>
                     <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>

RMS-FrontEnd/src/views/product/components/products.vue

@@ -37,7 +37,7 @@
         </template>
        </el-table-column>
       <el-table-column prop="companyName" label="所属公司或租户名称" align="center"> </el-table-column>
-      <el-table-column prop="licenseRate" label="许可费率" sortable="custom" align="center" width="180"> </el-table-column>
+      <el-table-column prop="licenseRate" label="参考许可费率" sortable="custom" align="center" width="180"> </el-table-column>
       <!-- <el-table-column prop="pictures" label="产品图片" align="center"> </el-table-column> -->
       <el-table-column prop="productExplain" label="产品说明" align="center"> </el-table-column>
       <el-table-column label="操作" width="180" align="center"> 
@@ -47,11 +47,11 @@
             <p>编辑</p> 
             <el-dropdown-menu slot="dropdown" style="text-align: center;">
               <el-dropdown-item command="7">预览图片</el-dropdown-item>
-              <el-dropdown-item command="1">产品的架构</el-dropdown-item>
+              <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>
-              <el-dropdown-item command="5">产品相关价值专利</el-dropdown-item>
+              <el-dropdown-item command="3">营销数据的趋势图</el-dropdown-item>
+              <el-dropdown-item command="4">专利布局可视化</el-dropdown-item>
+              <el-dropdown-item command="5">相关专利</el-dropdown-item>
               <el-dropdown-item :divided="true" command="6"> <span style="color: red;">删除</span> </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -98,8 +98,8 @@
           <el-input v-model="productForm.companyName" :disabled="productForm.tenantId?true:false" placeholder="请输入所属公司或租户名称"></el-input>
         </el-form-item>
        
-        <el-form-item label="许可费率 " prop="licenseRates">
-          <el-input v-model="productForm.licenseRates" placeholder="请输入许可费率(许可费率介于0-1之间)"></el-input>
+        <el-form-item label="参考许可费率 " prop="licenseRates">
+          <el-input v-model="productForm.licenseRates" placeholder="请输入参考许可费率(参考许可费率介于0-1之间)"></el-input>
           <!-- <el-input-number v-model="productForm.licenseRate" :precision="2" :step="0.05" :max="1" :min="0" placeholder="请输入许可费率" style="width: 100%;"></el-input-number> -->
         </el-form-item>
         <el-form-item label="图片 ">
@@ -152,10 +152,10 @@ export default {
             this.productForm.licenseRate=this.productForm.licenseRates
             callback()
           } else {
-            callback(new Error('输入错误，许可费率介于0-1之间'))
+            callback(new Error('输入错误，参考许可费率介于0-1之间'))
           }
         } else {
-          callback(new Error('输入错误，许可费率介于0-1之间'))
+          callback(new Error('输入错误，参考许可费率介于0-1之间'))
         }
       }else{
         callback()

RMS-FrontEnd/src/views/product/components/relatedPatents/components/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="padding:20px;background:white;height:100%">
     <div style="margin-bottom:20px">
-      <span><span>{{ name }}</span>{{structureId?'架构':'产品'}}的相关价值专利</span>
+      <span><span>{{ name }}</span>{{structureId?'架构':'产品'}}的相关专利</span>
     </div>
     <div style="display: flex; justify-content: space-between;" v-if="!structureId">
       <div :style="{ visibility: selectedTotal > 0 ? 'visible' : 'hidden' }">

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -10,7 +10,7 @@
         <!-- <el-tag :type="patentStatus2=='0'?'info':'primary'" effect="dark" size="mini" class="margin-left_10"
           style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag> -->
         <!-- <el-button type="primary" size="small" @click="checkResult" style="margin-top:20px;margin-right:10px;height:32px;"> 查看结果 </el-button> -->
-        <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;margin-right:10px"> 协同办公 </el-button>
+        <el-button v-if="reportType==4 && !taskId" @click="taskWork" type="primary" size="small" style="height: 32px;margin-right:10px;width:80px"> 协同办公 </el-button>
         <!-- <el-popover placement="bottom" title="关键词高亮" width="320" trigger="click" style="margin-left: 20px;">
           <patent-keywords-highlight :project-id="projectId" />
           <el-button slot="reference" size="small" type="primary"

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -32,10 +32,10 @@
           </div>
           
           <div>
-            <el-button @click="keepSendCollaboration" type="primary" style="margin-right: 10px;" v-if="this.coordination && this.FeaturesNumber==0">完成协同</el-button>
-            <el-button @click="keep" type="primary" style="float: right;" :loading="this.loadings">保存</el-button>
+            <el-button @click="keepSendCollaboration" type="primary" size="small" style="margin-right: 10px;width:80px" v-if="this.coordination && this.FeaturesNumber==0">完成协同</el-button>
+            <el-button @click="keep" type="primary" size="small" style="float: right;width:80px" :loading="this.loadings">保存</el-button>
             <el-tooltip class="item" effect="dark" content="一键同意保存协同人所有修改意见" placement="top"  v-if="this.taskWorkRemakA==0">
-               <el-button @click="handleWhole" type="primary" style="margin-right: 10px;">全部同意</el-button>
+               <el-button @click="handleWhole" type="primary" size="small" style="margin-right: 10px;width:80px">全部同意</el-button>
             </el-tooltip>
            
           </div>

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

@@ -5,8 +5,8 @@
         <el-form :model="form" :rules="rules" ref="reportForm" label-width="120px" v-loading="loading" :element-loading-text="load_text" element-loading-spinner="el-icon-loading"
     element-loading-background-color="rgba(0, 0, 0, 0.8)">
             
-            <el-form-item :label="[3].includes(Number(form.type))?'标的产品':'标的专利号'" prop="signPatentNo">
-              <el-input v-model="form.signPatentNo" autocomplete="off" :placeholder="[3].includes(Number(form.type))?'请输入标的产品':'请输入标的专利号'" @change="getPatentNo"></el-input>
+            <el-form-item :label="[3].includes(Number(form.type))?'标的产品':'标的专利'" prop="signPatentNo">
+              <el-input v-model="form.signPatentNo" autocomplete="off" :placeholder="[3].includes(Number(form.type))?'请输入标的产品':'请输入标的专利'" @change="getPatentNo"></el-input>
               <p v-if="show==1" class="tips">查不到该专利请
                 <el-upload style="display:inline-block;width: 30px !important;" ref="upload" class="upload-file" action="#" :auto-upload="false" :show-file-list="false" :on-change="onChange1">
                   <span>导入</span>
@@ -290,7 +290,7 @@ export default {
         signPatentNo: [{ required: true, validator:isExist, trigger: 'blur' },],
         personId: [{ required: true, message: '请选择负责人', trigger: 'change' },],
         clientId: [{ required: true, validator:isClientId, trigger: 'change' },],
-        departmentId: [{ required: true, validator:isDepartmentId, trigger: 'change' },],
+        // departmentId: [{ required: true, validator:isDepartmentId, trigger: 'change' },],
       },
       TaskRules:{
         taskName:[{ required: true, message: '请输入任务名称', trigger: 'blur' },],
@@ -335,14 +335,14 @@ export default {
       if(val == 3){
         this.rules.personId[0].required = false
         this.rules.clientId[0].required = false
-        this.rules.departmentId[0].required = false
+        // this.rules.departmentId[0].required = false
         this.$set(this.form,'conclusionIds',[])
         this.conclusion = this.dictMessage[this.reportAsDicItem[this.form.type]]
         this.matterType = 2
       }else{
         this.rules.personId[0].required = true
         this.rules.clientId[0].required = true
-        this.rules.departmentId[0].required = true
+        // this.rules.departmentId[0].required = true
         this.matterType = null
       }
     },

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

@@ -56,7 +56,7 @@
               <el-dropdown-item command="9" v-if="(scope.row.type == 5 && [1,2].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])"> 规避方案填写</el-dropdown-item>
               <el-dropdown-item command="10" v-if="[0,1,2,3].includes(scope.row.type)&&[2].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])"> 添加对比文件</el-dropdown-item>
               <el-dropdown-item command="11" v-if="scope.row.status!=3 && $reportPermission(scope.row.id,[0,1])"> 完成报告</el-dropdown-item>
-              <el-dropdown-item command="12" v-if="$reportPermission(scope.row.id,[0,1])">添加追踪报告</el-dropdown-item>
+              <el-dropdown-item command="12" v-if="[3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">添加追踪报告</el-dropdown-item>
               <!-- <el-dropdown-item command="6" v-if="[2,3].includes(scope.row.status)&& scope.row.type != 4">导入 </el-dropdown-item> -->
               <el-dropdown-item command="7" divided style="color: red;" v-if=" $reportPermission(scope.row.id,[0,1])">删除 </el-dropdown-item>
             </el-dropdown-menu>

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

@@ -125,7 +125,7 @@ export default {
             this.$api.addConclusions(this.form).then(response=>{
                 if(response.code == 200){
                     this.$message.success('核心结论添加成功')
-                    this.resetForm()
+                    this.resetForm1()
                 }
             }).catch(error=>{
                 this.$message.error('核心结论添加失败')
@@ -135,8 +135,13 @@ export default {
         resetForm(){
             this.matterSign=false,
             this.matterType=null,
+            this.$emit('dialog',null)
+        },
+        resetForm1(){
+            this.matterSign=false,
+            this.matterType=null,
             this.$emit('dialog',this.form.reportId)
-        }
+        },
 
     },
 }

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

@@ -220,6 +220,8 @@ export default{
           choiceFormS:this.choiceFormS,
         }
         this.$emit("choiceFormSelected", a)
+      }else{
+        this.selected = []
       }
     },
     // async choiceMark(val) {
@@ -285,10 +287,10 @@ export default{
             this.checkList.push(patentNo)
           }
       this.$emit('PersonPatent', this.checkList)
-      if (this.choiceMark) {
-        this.selected = this.checkList
-        // console.log(this.checkList,this.selected);
-      }
+      // if (this.choiceMark) {
+      //   this.selected = this.checkList
+      //   // console.log(this.checkList,this.selected);
+      // }
         
       // }
       

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

@@ -424,14 +424,27 @@ export default {
      },
     closeCreatedPersonnel() {
       this.CreatedPerson = {}
+      this.$refs.CreatedPerson.resetFields()
       this.createdPersonnel = false
     },
     close() {
       this.isEndTime=true
       // this.$emit('getClientInformation', this.clientInformation)
       this.visibleCollaboration = false
-      this.clientForm = {}
-      this.queryParams.patentNos=[]
+      this.clientForm = {
+        syneryCCLists: [],
+      }
+      this.$refs.clientForm.resetFields()
+      this.queryParams= {
+        patentNos:[],
+        reportId:this.reportId,
+        current: 1,
+        size: 10,
+        total: 0,
+        syneryCCList:[],
+        patentVO: {},
+        isAll:0,
+      },
       this.$emit("collaboration", this.visibleCollaboration)
     }
   },

RMS-FrontEnd/src/views/report/index.vue

@@ -16,13 +16,16 @@
                       <el-form-item label="标的专利/产品">
                         <el-input v-model="queryParams.signPatentNo" placeholder="请输入标的专利/产品" size="small" style="width:150px"></el-input>
                       </el-form-item>
-                      <el-form-item label="报告类型">
-                        <el-select v-model="queryParams.types" multiple clearable size="small" v-if="dictMessage.REPORT_TYPE" style="width:150px">
+                      <el-form-item label="报告类型及状态">
+                        <el-select v-model="queryParams.types" multiple collapse-tags clearable size="small" v-if="dictMessage.REPORT_TYPE" style="width:180px" placeholder="请选择报告类型">
                           <el-option v-for="item in dictMessage.REPORT_TYPE.filter(item=>!['6'].includes(item.dictChildValue))" :key="item.dictChildLabel" :label="item.dictChildLabel" :value="item.dictChildValue"></el-option>
                         </el-select>
+                        <el-select v-model="queryParams.statuses" multiple collapse-tags clearable size="small" v-if="dictMessage.REPORT_STATE" style="width:180px;margin-left:10px" placeholder="请选择报告状态">
+                          <el-option v-for="item in dictMessage.REPORT_STATE" :key="item.dictChildLabel" :label="item.dictChildLabel" :value="item.dictChildValue"></el-option>
+                        </el-select>
                       </el-form-item>
                       <el-form-item label="核心结论">
-                        <el-select v-model="queryParams.cronIds" size="small" multiple clearable style="width:150px">
+                        <el-select v-model="queryParams.cronIds" size="small" multiple collapse-tags clearable style="width:150px">
                           <el-option v-for="item in ConclusionList.filter(item=>{return this.queryParams.types.length>0?this.queryParams.types.indexOf(item.rType.toString()) != -1:item.cTypeId!=''})" :key="item.cType" :label="item.cTypeName" :value="item.cType">
                             <span style="float: left">{{ item.cTypeName }}</span>
                             <span style="float: right; color: #8492a6; font-size: 13px;margin-left:10px">{{ item.rTypeName }}</span>
@@ -153,6 +156,7 @@ export default {
       queryParams: {
         cronIds:[],
         types:[],
+        statuses:[],
         group: [],
         size: 10,
         current: 1,
@@ -421,7 +425,8 @@ export default {
      //获取弹窗状态
      getDialog(val){
         this.closeConclusion()
-          var a = {
+        if(val){
+           var a = {
             reportId:val,
             status:3
           }
@@ -431,6 +436,8 @@ export default {
               this.getList()
             }
           })
+        }
+         
       },
       //关闭弹窗
       closeConclusion(){
@@ -603,6 +610,7 @@ export default {
       
     },
     getParams(params){
+      console.log(params)
       this.queryParams.cronIds=[params.conclusionType]
       this.queryShowType = '0'
       this.getList2()

RMS-FrontEnd/src/views/report/reportDetails/components/basicMessage.vue

@@ -4,13 +4,19 @@
         <div style="width:500px;margin:0 auto">
             <el-form :model="form" ref="reportForm" label-width="120px">
                 
-                <el-form-item :label="form.type==3?'标的产品：':'标的专利号：'" prop="signPatentNo">
+                <el-form-item :label="form.type==3?'标的产品：':'标的专利：'" prop="signPatentNo">
                     <el-link type="primary" v-if="form.type!=3" @click="toPatentDetails(form.signPatentNo)">{{form.signPatentNo}}</el-link>
                     <span v-else>{{form.signPatentNo}}</span>
                 <!-- <el-input v-model="form.signPatentNo" autocomplete="off" placeholder="请输入标的专利号" @change="getPatentNo"></el-input>
                 <p v-if="show==1" class="tips">查不到该专利请<span @click="imports">导入</span></p>
                 <p v-if="show==2" class="tips" style="color:black"><span @click="toPatentDetails(form.signPatentNo)">查看详情</span></p> -->
                 </el-form-item>
+                <el-form-item label="核心结论：" prop="conclusions" v-if="form.status==3 && form.conclusions && form.conclusions.length>0">
+                  <span v-for="(item,index) in form.conclusions" :key="index" style="margin:0">{{ item }} <span v-if="index<form.conclusions.length-1">| </span></span>
+                </el-form-item>
+                <el-form-item label="核心结论论述：" prop="cronConclusion" v-if="form.status==3 && form.cronConclusion">
+                  <span >{{ form.cronConclusion }} </span>
+                </el-form-item>
                 <el-form-item label="报告名称：" prop="name">
                     <span>{{form.name}}</span>
                 </el-form-item>
@@ -50,12 +56,7 @@
                     <div class="el-upload__tip" slot="tip"></div>
                 </el-upload>
                 </el-form-item>
-                <el-form-item label="核心结论：" prop="conclusions" v-if="form.status==3 && form.conclusions && form.conclusions.length>0">
-                  <span v-for="(item,index) in form.conclusions" :key="index" style="margin:0">{{ item }} <span v-if="index<form.conclusions.length-1">| </span></span>
-                </el-form-item>
-                <el-form-item label="核心结论论述：" prop="cronConclusion" v-if="form.status==3 && form.cronConclusion">
-                  <span >{{ form.cronConclusion }} </span>
-                </el-form-item>
+               
                 <el-form-item label="备注：" prop="remark" v-if="form.remark">
                     <span>{{form.remark}}</span>
                 </el-form-item>