bug修复

RMS-FrontEnd/src/views/components/articles/components/PatentImage.vue

@@ -36,7 +36,7 @@
         
       </el-col> -->
     <!-- </el-row> -->
-    <div type="primary" class="up" v-if="$r(projectId,[1,2])" @click="handleAdd">上传图片</div>
+    <div type="primary" class="up" @click="handleAdd">上传图片</div>
           <!-- <i class="el-icon-circle-plus-outline" style="font-size:40px"  @click="handleAdd"></i> -->
      <!-- <div type="primary" class="up" v-else :disabled="true">上传图片</div> -->
     

RMS-FrontEnd/src/views/components/articles/components/history/examination.vue

@@ -46,7 +46,7 @@
                             </span>
                              <span v-else><i class="el-icon-minus"></i></span>
                              <span style="float:right;">
-                              <el-upload  ref="upload" class="upload-file" action="#" :auto-upload="false" :show-file-list="false" :on-change="onChange" multiple >
+                              <el-upload  :ref="'upload'+scope.$index" class="upload-file" action="#" :auto-upload="false" :show-file-list="false" :on-change="onChange" multiple >
                                 <i class="el-icon-circle-plus-outline" style="font-size:20px;color:#409eff" @click="getRow(scope.row)"></i>
                               </el-upload>
                             </span>
@@ -211,7 +211,7 @@ export default {
           })
         }
     },
-   async edit(row,index) {
+    async edit(row, index) {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
@@ -233,7 +233,7 @@ export default {
           await this.$api.updateReviewHistory(formData).then(res => { 
             if (res.code==200) {
               this.$message.success('修改成功')
-              this.$refs.upload.clearFiles()
+              this.$refs['upload'+index].clearFiles()
               row.fileList=[]
               this.getList2(row,index)
             }
@@ -242,7 +242,7 @@ export default {
           await this.$api.addReviewHistory(formData).then(res => { 
             if (res.code==200) {
               this.$message.success('保存成功')
-              this.$refs.upload.clearFiles()
+              this.$refs['upload'+index].clearFiles()
               row.fileList=[]
               this.getList2(row,index)
             }
@@ -253,7 +253,7 @@ export default {
       }
       row.vVisible = !row.vVisible
     },
-    getList2(row,index){
+    getList2(row, index) {
       this.$api.queryReviewHistory(this.queryParams).then(res => {
         if (res.code==200) {
           if(!row.id){

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -128,7 +128,7 @@
 
   
 
-  <el-dialog title="添加对比" v-draggable :visible.sync="visible" width="1000px" :before-close="close">
+  <el-dialog :title="ruleForm.id?'编辑对比':'添加对比'" v-draggable :visible.sync="visible" width="1000px" :before-close="close">
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px" label-position="left">
        
        <el-form-item label="选中文本" class="item">

RMS-FrontEnd/src/views/components/common/SplitScreen.js

@@ -128,7 +128,7 @@ export const splitScreen1 = {
     },
     mounted() {
       this.$nextTick(() => {
-          if (!this.productPublicNo) {
+          if (document.getElementsByClassName('patent-articles-content-left').length>0) {
              this.$set(this,'height',document.getElementsByClassName('patent-articles-content-left')[0].offsetHeight+20  + 'px')
           }
             if(this.height == '20px'){

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

@@ -15,14 +15,14 @@
                         <el-dropdown-item command="0" v-if="$reportPermission(item.id,[0,1])">分享</el-dropdown-item>
                         <el-dropdown-item command="1" v-if="[2,3].includes(item.status) && $reportPermission(item.id,[0,1])">导出报告</el-dropdown-item>
                         <el-dropdown-item command="2" v-if="[2,3].includes(item.status) && $reportPermission(item.id,[0,1])">报告文档</el-dropdown-item>
-                        <el-dropdown-item command="3" v-if="[1,2].includes(item.status) && $reportPermission(item.id,[0,1])">自定义字段</el-dropdown-item>
-                        <el-dropdown-item command="4" v-if="[2].includes(item.status)&& item.type != 4 && $reportPermission(item.id,[0,1])">任务分配</el-dropdown-item>
-                        <el-dropdown-item command="5" v-if="([1].includes(item.status) || (item.type == 4&& [1,2,3].includes(item.status))) && $reportPermission(item.id,[0,1])">{{!([3,4].includes(item.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
+                        <el-dropdown-item command="3" v-if="[1,2].includes(item.status) && [0,1,2,3].includes(item.type) && $reportPermission(item.id,[0,1])">自定义字段</el-dropdown-item>
+                        <el-dropdown-item command="4" v-if="[2].includes(item.status) && [0,1,2,3].includes(item.type) && $reportPermission(item.id,[0,1])">任务分配</el-dropdown-item>
+                        <el-dropdown-item command="5" v-if="([1].includes(item.status) || (item.type == 4&& [1,2].includes(item.status))) && $reportPermission(item.id,[0,1])">{{!([3,4].includes(item.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
                         <el-dropdown-item command="8" v-if="(item.type == 4 && [1,2].includes(item.status)) && $reportPermission(item.id,[0,1])">专利与产品关联比对</el-dropdown-item>
                         <el-dropdown-item command="9" v-if="(item.type == 5 && [1,2].includes(item.status)) && $reportPermission(item.id,[0,1])"> 规避方案填写</el-dropdown-item>
                         <el-dropdown-item command="10" v-if="[0,1,2,3].includes(item.type)&&[2].includes(item.status) && $reportPermission(item.id,[0,1])"> 添加对比文件</el-dropdown-item>
                         <el-dropdown-item command="11" v-if="[1,2].includes(item.status) && $reportPermission(item.id,[0,1])"> 完成报告</el-dropdown-item>
-                        <el-dropdown-item command="12"  v-if="$reportPermission(item.id,[0,1])">添加追踪报告</el-dropdown-item>
+                        <el-dropdown-item command="12"  v-if="[3].includes(item.status) && $reportPermission(item.id,[0,1])">添加追踪报告</el-dropdown-item>
 
                         <!-- <el-dropdown-item command="6" v-if="[2,3].includes(item.status)&& item.type != 4">导入 </el-dropdown-item> -->
                         <el-dropdown-item command="7" divided style="color: red; " v-if="$reportPermission(item.id,[0,1])">删除 </el-dropdown-item>

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

@@ -88,7 +88,7 @@
             <el-form-item label="卷号" prop="volumeNumber" >
               <el-input v-model="form.volumeNumber" autocomplete="off" placeholder="请输入卷号"></el-input>
             </el-form-item>
-            <el-form-item :label="form.status==3?'上传报告文档':'上传附件'">
+            <el-form-item :label="(!form.id &&form.status==3)?'上传报告文档':'上传附件'">
               <div v-if="form.reportFiles" class="upload-file">
                 <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;">
                   <!-- <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis" @click="showFile1(item.url)">{{item.name?item.name:item.fileName}}</p> 
@@ -641,9 +641,18 @@ export default {
       if(this.form.clientId&&this.form.personId){
         this.form.clientId = Number(row.clientId)
       this.form.personId = Number(row.personId)
-      a = '编辑'
+      // a = '编辑'
       }else{
         this.form.departmentId = ''
+        // a = '创建'
+      }
+      if (this.form.id) {
+        if (this.$reportPermission(this.form.id,[0,1])) {
+          a = '编辑'
+        } else {
+          a = '查看'
+        }
+      } else {
         a = '创建'
       }
       if(this.form.clientId == 0){

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

@@ -51,7 +51,7 @@
               <el-dropdown-item command="2" v-if="[2,3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">报告文档</el-dropdown-item>
               <el-dropdown-item command="3" v-if="[1,2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.type) && $reportPermission(scope.row.id,[0,1])">自定义字段</el-dropdown-item>
               <el-dropdown-item command="4" v-if="[2].includes(scope.row.status)&& [0,1,2,3].includes(scope.row.type) && $reportPermission(scope.row.id,[0,1])">任务分配</el-dropdown-item>
-              <el-dropdown-item command="5" v-if="([1].includes(scope.row.status) || (scope.row.type == 4 && [1,2,3].includes(scope.row.status))) && $reportPermission(scope.row.id,[0,1])">{{!([3,4].includes(scope.row.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
+              <el-dropdown-item command="5" v-if="([1].includes(scope.row.status) || (scope.row.type == 4 && [1,2].includes(scope.row.status))) && $reportPermission(scope.row.id,[0,1])">{{!([3,4].includes(scope.row.type))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
               <el-dropdown-item command="8" v-if="(scope.row.type == 4 && [1,2].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">专利与产品关联比对</el-dropdown-item>
               <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>

RMS-FrontEnd/src/views/report/components/matter/remarryMatter.vue

@@ -370,7 +370,7 @@ export default {
             this.registerVisible = true
         },
         //关闭登记结果弹窗
-        closeRegister(){
+      closeRegister() {
             this.type = null
             this.registerForm = {}
             this.file = []
@@ -408,7 +408,10 @@ export default {
                     }
                 }
                 })
-                this.registerForm.followUps = list
+                if (list.length == 0) {
+                  return false
+                }
+              this.registerForm.followUps = list
                 this.submitRegister1()
             }catch(e){
                 this.$message.error('后续事项名称不能为空')
@@ -452,13 +455,13 @@ export default {
                     // }catch(e){
                     //     this.$message.error('名称不能为空')
                     // }
-                }else{
+                } else {
                     this.submitRegister1()
                 } 
             })
            
         },
-        submitRegister1(){
+      submitRegister1() {
             let formData = new FormData()
                 if(this.file){
                     for (var i = 0; i < this.file.length; i++) {