报告文档的修改

src/views/project/components/TotalChart.vue

@@ -11,7 +11,7 @@
 export default {
   props:{
     searchOption:{
-      type:Object,
+      type:[Object,Array],
       default:()=>{
         return {}
       }

src/views/project/index.vue

@@ -531,7 +531,7 @@ export default {
     framework(row){
       var data = row.productOrCategory
       if(!data){
-        this.$message.warning('该专利数据库没有产品或产品结构')
+        this.$message.warning('该专利数据库没有产品或产品类别')
         return false
       }
       var form = {

src/views/report/components/reportFile/reportFileTable.vue

@@ -5,7 +5,7 @@
         <div>
           <mySearch :SearchFields="searchFiled" @search="search" :searchValue="searchOption"></mySearch>
         </div>
-        <div>
+        <div class="margin-right_10">
           <el-button type="primary" size="small" @click="handleAdd()">新增</el-button>
         </div>
       </el-header>
@@ -247,12 +247,12 @@ export default {
         ...this.queryParams,//分页信息
         fileName:this.searchOption.referencesName,
         // searchQuery: this.$commonJS.objectToString(this.searchOption || {}),//检索条件
-        // orderDTOList: this.sort,//排序信息
+        orderDTOList: this.sort,//排序信息
       }
       this.loading = true
       this.$api.getReferences(params).then(res => {
         if (res.code == 200) {
-          this.tableData = res.data
+          this.tableData = res.data.data
           this.total = res.data.total
           this.loading = false
         }

src/views/task/components/index.vue

@@ -48,7 +48,7 @@
                     <el-dropdown-item command="4"
                       v-if="scope.row.status != 3 && (scope.row.createName == userinfo.name && scope.row.projectType == 3)">编
                       辑</el-dropdown-item>
-                    <el-dropdown-item command="3" v-if="[4, 6].includes(scope.row.type) && (scope.row.status == 2 || scope.row.status == 6)">完
+                    <el-dropdown-item command="3" v-if="(scope.row.status == 2 || scope.row.status == 6)">完
                       成</el-dropdown-item>
                     <el-dropdown-item command="5"
                       v-if="[4].includes(scope.row.type) && scope.row.status == 6 && scope.row.createName == userinfo.name">确认协同结果</el-dropdown-item>