修改编辑报告

src/views/project/patentCollection/components/mixins/index.js

@@ -31,7 +31,11 @@ export const projectData = {
     //选择专利
     refresh:{
       default:false
-    }
+    },
+    //仅展示
+    onlyReveal:{
+      default:false
+    } 
   },
   data() {
     return {
@@ -45,6 +49,9 @@ export const projectData = {
   methods: {
     // 点击专利号
     handleClick(row,key){
+      if(this.onlyReveal){
+        return 
+      }
       this.$router.push(
         {
           path:'patentDetails/'+row.patentNo,

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

@@ -5,18 +5,24 @@
         <el-col :span="12">
           <template>
             <div>
-              <el-form-item v-if="form.reportType == 3" label="标的产品" prop="signProjectId">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signProjectName' })"></span>
+              <el-form-item v-if="form.reportType == 3" label="标的产品：" prop="signPatentNo">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signPatentNo' })"></div>
               </el-form-item>
-              <el-form-item v-else label="标的专利" prop="signPatentNo">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signPatentNo' })"></span>
+              <el-form-item v-else label="标的专利：" prop="signPatentNo">
+                <div class="box">
+                  <el-link type="primary">
+                    <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signPatentNo' })"></span>
+                  </el-link>
+                </div>
+                
+                
               </el-form-item>
             </div>
           </template>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="报告名称" prop="name">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'name' })"></span>
+          <el-form-item label="报告名称：" prop="name">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'name' })"></div>
           </el-form-item>
         </el-col>
       </el-row>
@@ -24,72 +30,52 @@
         <div>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="案件编号">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'caseNumber' })"></span>
+              <el-form-item label="案件编号：">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'caseNumber' })"></div>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="无效宣告请求人">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'invalidApplication' })"></span>
+              <el-form-item label="无效宣告请求人：">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'invalidApplication' })"></div>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="发文序号">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'issueNumber' })"></span>
+              <el-form-item label="发文序号：">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'issueNumber' })"></div>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="发明创造名称">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'inventionName' })"></span>
+              <el-form-item label="发明创造名称：">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'inventionName' })"></div>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
       </template>
-      <el-form-item label="是否完成">
-        <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })"></span>
+      <el-form-item label="是否完成：">
+        <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })==3?'是':'否'"></div>
       </el-form-item>
       <template v-if="form.status == 3">
         <div>
-          <el-form-item v-if="form.reportType == 3" label="标的产品" prop="signProjectId">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signProjectName' })"></span>
+          <el-form-item label="核心结论：">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'cronNames' })"></div>
           </el-form-item>
-          <el-form-item v-else label="标的专利" prop="signPatentNo">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'signPatentNo' })"></span>
-          </el-form-item>
-        </div>
-      </template>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="报告名称" prop="name">
-          <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'name' })"></span>
-        </el-form-item>
-      </el-col>
-      </el-row>
-      <el-form-item label="是否完成">
-        <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'status' })"></span>
-      </el-form-item>
-      <template v-if="form.status == 3">
-        <div>
-          <el-form-item label="核心结论">
-            <span v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'cronNames' })"></span>
-          </el-form-item>
-          <el-form-item label="结论论述">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'cronDescription' })"></span>
+          <el-form-item label="结论论述：">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'cronDescription' })"></div>
           </el-form-item>
         </div>
       </template>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="承担部门" prop="departmentId">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'departmentName' })"></span>
+          <el-form-item label="承担部门：" prop="departmentId">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'departmentName' })"></div>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="负责人" prop="headId">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'headName' })"></span>
+          <el-form-item label="负责人：" prop="headId">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'headName' })"></div>
           </el-form-item>
         </el-col>
       </el-row>
@@ -97,88 +83,65 @@
         <el-col :span="12">
           <template>
             <div>
-              <el-form-item label="委托方" prop="entrustId" v-if="userinfo.tenantType == 1">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'entrustName' })"></span>
+              <el-form-item label="委托方：" prop="entrustId" v-if="userinfo.tenantType == 1">
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'entrustName' })"></div>
               </el-form-item>
-              <el-form-item label="委托部门" prop="departmentId" v-else>
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'departmentName' })"></span>
+              <el-form-item label="委托部门：" prop="departmentId" v-else>
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'departmentName' })"></div>
               </el-form-item>
             </div>
           </template>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="卷号" prop="volumeNumber">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'volumeNumber' })"></span>
+          <el-form-item label="卷号：" prop="volumeNumber">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'volumeNumber' })"></div>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="产品/技术">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'productOrTech' })"></span>
+          <el-form-item label="产品/技术：">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'productOrTech' })"></div>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="关联报告">
-            <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'associateReportName' })"></span>
+          <el-form-item label="关联报告：">
+            <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'associateReportName' })"></div>
           </el-form-item>
         </el-col>
       </el-row>
       <template>
         <div>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="事件：">
-                <span v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'eventNames' })"></span>
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'eventNames' })"></div>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="调查类型：" prop="matterIds">
-                <span v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'matterNames' })"></span>
+                <div class="box" v-html="$commonJS.getColumnData(form, { type: 'Array', value: 'matterNames' })"></div>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
       </template>
-
-      <template v-if="form.reportType == 7">
-        <div>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="案件编号">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'caseNumber' })"></span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发文序号">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'issueNumber' })"></span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="发明创造名称">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'inventionName' })"></span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="无效宣告请求人">
-                <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'invalidApplication' })"></span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </template>
-      <el-form-item label="附件">
-        <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove" style="height: 180px;"
-          :autoUpload="true"></myUpload>
+      <el-form-item label="附件：">
+        <!-- <myUpload :file-list="form.systemFileList" @on-change="onchangeFile" @on-remove="onRemove" style="height: 180px;"
+          :autoUpload="true"></myUpload> -->
+          <div class="box">
+            <div v-for="item in form.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>
-      <el-form-item label="备注" prop="description">
-        <span v-html="$commonJS.getColumnData(form, { type: 'String', value: 'description' })"></span>
+      <el-form-item label="备注：" prop="description">
+        <div class="box" v-html="$commonJS.getColumnData(form, { type: 'String', value: 'description' })"></div>
       </el-form-item>
     </el-form>
   </div>
@@ -247,4 +210,12 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.box{
+    // border: 2px solid var(--color1);
+    // border-radius: 5px;
+    padding: 0px 10px;
+    color: var(--color1);
+    font-size: medium;
+}
+</style>

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

@@ -1,8 +1,11 @@
 <template>
   <div class="height_100">
     <el-container>
-      <el-aside width="200px">
-        <el-menu class="theme-dark" :default-active="activeMenu" @select="changeComponent">
+      <el-aside :width="width">
+        <div class="point" @click="getCollapse">
+          {{isCollapse?'收起':'展开'}}
+        </div>
+        <el-menu class="theme-dark" :default-active="activeMenu" @select="changeComponent" :collapse="!isCollapse">
           <el-menu-item v-for="item in menuList" :key="item.name" :index="item.name" v-if="!item.show">
             <i class="el-icon-film"></i>
             <span slot="title">{{item.label}}</span>
@@ -38,7 +41,9 @@ export default {
             path:'task/components/index.vue'
           }
         ],
-        comments:{}
+        comments:{},
+        isCollapse:true,
+        width:'200px'
     };
   },
   watch: {},
@@ -58,6 +63,10 @@ export default {
     this.getMenu()
   },
   methods: {
+    getCollapse(){
+      this.isCollapse = !this.isCollapse
+      this.width = this.isCollapse?'200px':'64px'
+    },
     getMenu(){
       var menus = [
         {
@@ -128,4 +137,17 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.point{
+  line-height: 40px;
+    text-align: center;
+    border-bottom: 1px solid #e6e6e6;
+    /* color: var(--color); */
+    font-family: var(--fm);
+    color: var(--color2);
+    cursor: pointer;
+    width: 100%;
+    &:hover{
+      background: #ecf5ff
+    }
+}
 </style>

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

@@ -58,7 +58,7 @@
         </template>
         <el-form-item label="是否完成" v-if="!form.id">
           <el-switch v-model="form.status" active-color="#13ce66" inactive-color="#ff4949" @change="changeStatus"
-            :active-value="3" :inactive-value="1">
+            :active-value="3" :inactive-value="2">
           </el-switch>
         </el-form-item>
         <template v-if="!form.id && form.status == 3">
@@ -439,8 +439,17 @@ export default {
       await this.$api.getPermissionPersonnel(this.personnelList.queryParams).then((response) => {
         if (response.code == 200) {
           this.personnelList.loading = false;
+          if(!type){
+            var index = response.data.findIndex(item=>{
+                return item.id == this.form.headId
+              })
+              if(index!=-1){
+                response.data.splice(index,1)
+              }
+              this.personnelList.queryParams.total=response.pageColumn.total
+          }
           this.personnelList.data.push(...response.data)
-          this.personnelList.queryParams.total = response.pageColumn.total
+          // this.personnelList.queryParams.total = response.pageColumn.total
         }
       })
     },
@@ -615,6 +624,11 @@ export default {
       var reportType = this.dictMessage.REPORT_TYPE.filter(item => { return item.value == this.form.reportType })[0].label
       this.title = a + reportType + '报告'
       // 负责人
+      if(!this.form.headId){
+        this.$set(this.form,'headId',Number(this.userinfo.id))
+      }else{
+        this.$set(this.form,'headId',Number(this.form.headId))
+      }
       if (this.form.headId) {
         this.personnelList.queryParams.id = this.form.headId
         await this.getPermissionPersonnel(1)
@@ -768,6 +782,9 @@ export default {
 
     // 上传的文件监听
     onchangeFile(file, fileList) {
+      if(!this.form.systemFileList){
+        this.$set(this.form,'systemFileList',[])
+      }
       if (file.guid) {
         let index = this.form.systemFileList.findIndex(item => {
           return item.uid == file.uid