报告状态

src/views/report/components/splitPage/splitPage.vue

@@ -357,7 +357,7 @@ export default {
 
 
         })
-        this.handleSort()
+        this.handleSort(this.scopeRow[0].rightSort)
         this.typeSelect(this.showType)
         this.scopeRow = []
         this.checkList = []

src/views/report/components/view/card.vue

@@ -16,16 +16,16 @@
                   <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)&&[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="3" v-if="[1,2].includes(item.status)&&[0,1,2,3].includes(item.reportType) && $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.reportType) && $reportPermission(item.id,[0,1])">任务分配</el-dropdown-item>
+                  <el-dropdown-item command="5" v-if="([1].includes(item.status) || (item.reportType == 4 && [1,2].includes(item.status))) && $reportPermission(item.id,[0,1])">{{!([3,4].includes(item.reportType))?'拆分特征':'产品信息录入'}}</el-dropdown-item>
+                  <el-dropdown-item command="8" v-if="(item.reportType == 4 && [1,2].includes(item.status)) && $reportPermission(item.id,[0,1])">专利与产品关联比对</el-dropdown-item>
+                  <el-dropdown-item command="9" v-if="(item.reportType == 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.reportType)&&[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="[3].includes(item.status) && $reportPermission(item.id,[0,1])">添加追踪报告</el-dropdown-item>
-                  <el-dropdown-item command="13" v-if="(item.type == 7 && [1,2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">添加无效理由和证据</el-dropdown-item>
-                  <el-dropdown-item command="14" v-if="(item.type == 7 && [1,2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">证据文献</el-dropdown-item>
+                  <el-dropdown-item command="13" v-if="(item.reportType == 7 && [1,2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">添加无效理由和证据</el-dropdown-item>
+                  <el-dropdown-item command="14" v-if="(item.reportType == 7 && [1,2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">证据文献</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/views/report/components/view/table.vue

@@ -32,16 +32,17 @@
               <el-dropdown-item command="0" v-if="$reportPermission(scope.row.id,[0,1])">分享</el-dropdown-item>
               <el-dropdown-item command="1" v-if="[2,3].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])">导出报告</el-dropdown-item>
               <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].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>
+              <el-dropdown-item command="3" v-if="[1,2].includes(scope.row.status)&&[0,1,2,3].includes(scope.row.reportType) && $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.reportType) && $reportPermission(scope.row.id,[0,1])">任务分配</el-dropdown-item>
+              <el-dropdown-item command="5" v-if="([1].includes(scope.row.status) || (scope.row.reportType == 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.reportType == 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.reportType == 5 && [1,2].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])"> 规避方案填写</el-dropdown-item> -->
+              <el-dropdown-item command="9" > 规避方案填写</el-dropdown-item>
+              <el-dropdown-item command="10" v-if="[0,1,2,3].includes(scope.row.reportType)&&[2].includes(scope.row.status) && $reportPermission(scope.row.id,[0,1])"> 添加对比文件</el-dropdown-item>
               <el-dropdown-item command="11" v-if="[1,2].includes(scope.row.status) && $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="13" v-if="(scope.row.type == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">添加无效理由和证据</el-dropdown-item>
-              <el-dropdown-item command="14" v-if="(scope.row.type == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">证据文献</el-dropdown-item>
+              <el-dropdown-item command="13" v-if="(scope.row.reportType == 7 && [1,2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">添加无效理由和证据</el-dropdown-item>
+              <el-dropdown-item command="14" v-if="(scope.row.reportType == 7 && [1,2,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>