Browse Source

Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

zhuhao 1 year ago
parent
commit
a92a923b3d

+ 3 - 2
src/views/components/import/conditionImport/search.vue

@@ -91,10 +91,11 @@ export default {
         },
         search(val){
             var a = {
-                condition:val,
+                searchCondition:val,
                 DBType:this.DBType,
                 retrieveRecordId:null,
-                ...this.importData
+                ...this.importData,
+                type:4
             }
             this.$router.push({
                 path: '/searchResult',

+ 2 - 2
src/views/components/import/conditionImport/searchResult.vue

@@ -15,7 +15,7 @@
         </div>
         
         <div style="max-width:calc(100% - 620px)">
-          <p><span>条件:</span>{{ searchData.condition }}</p>
+          <p><span>条件:</span>{{ searchData.searchCondition }}</p>
         </div>
         <div>
           <el-button type="primary" size="small" @click="importToProject">导入专利</el-button>
@@ -228,7 +228,7 @@ export default {
     async getList() {
       let queryParams = JSON.parse(JSON.stringify(this.queryParams));
       var params = {
-        CurrentQuery: this.searchData.condition, //检索式
+        CurrentQuery: this.searchData.searchCondition, //检索式
         DBType: this.searchData.DBType, //”CN”或”WD”,表示检索中文库或世界库
         PageNum: this.queryParams.current, //页码(最多 200 页)
         RowCount: this.queryParams.size, //每页返回条数(最多 50 条)

+ 3 - 0
src/views/report/components/index.vue

@@ -520,6 +520,9 @@ export default {
         case '14'://导入无效证据
           this.toInvalidResponset(row)
           break;
+        case '14'://录入产品信息
+          this.toInvalidResponset(row)
+          break;
         case 'e'://编辑
           this.handleEdit(row)
           break

+ 11 - 8
src/views/report/components/view/card.vue

@@ -16,16 +16,19 @@
                   <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.reportType) && $reportPermission(item.id,[0,1])">自定义字段</el-dropdown-item>
+                  <el-dropdown-item command="3" 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="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="5" v-if="[2].includes(item.status) && [0,1,2].includes(item.reportType) && $reportPermission(item.id,[0,1])">拆分特征</el-dropdown-item>
+                  <el-dropdown-item command="15" v-if="[2].includes(item.status) && [3,4].includes(item.reportType) && $reportPermission(item.id,[0,1])">产品信息录入</el-dropdown-item>
+                  <el-dropdown-item command="8" v-if="(item.reportType == 4 && [2].includes(item.status)) && $reportPermission(item.id,[0,1])">专利与产品关联比对</el-dropdown-item>
+                  <!-- <el-dropdown-item command="9" v-if="(item.reportType == 5 && [2].includes(item.status)) && $reportPermission(item.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(item.reportType)&&[2].includes(item.status) && $reportPermission(item.id,[0,1])"> 相关对比文件</el-dropdown-item>
+                  <el-dropdown-item command="11" v-if="[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.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-item command="13" v-if="(item.reportType == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">添加无效理由和证据</el-dropdown-item>
+                  <el-dropdown-item command="14" v-if="(item.reportType == 7 && [2,3].includes(item.status)) && $reportPermission(item.id,[0,1])">证据文献</el-dropdown-item>
+                  <el-dropdown-item command="7" divided style="color: red;" v-if=" $reportPermission(item.id,[0,1])">删除 </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

+ 9 - 10
src/views/report/components/view/table.vue

@@ -32,19 +32,18 @@
               <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.reportType) && $reportPermission(scope.row.id,[0,1])">自定义字段</el-dropdown-item>
+              <el-dropdown-item command="3" 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="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="8">专利与产品关联比对</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="5" v-if="[2].includes(scope.row.status) && [0,1,2].includes(scope.row.reportType) && $reportPermission(scope.row.id,[0,1])">拆分特征</el-dropdown-item>
+              <el-dropdown-item command="15" v-if="[2].includes(scope.row.status) && [3,4].includes(scope.row.reportType) && $reportPermission(scope.row.id,[0,1])">产品信息录入</el-dropdown-item>
+              <el-dropdown-item command="8" v-if="(scope.row.reportType == 4 && [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 && [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="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="[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.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="13" v-if="(scope.row.reportType == 7 && [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 && [2,3].includes(scope.row.status)) && $reportPermission(scope.row.id,[0,1])">证据文献</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>
           </el-dropdown>