zhuliu 1 gadu atpakaļ
vecāks
revīzija
d0f708c81d

+ 1 - 0
src/views/components/import/conditionImport/search.vue

@@ -174,6 +174,7 @@ export default {
               importData:this.importData
             }
             this.$s.setSession('conditionImport',params)
+            this.$s.setSession('queryParams',params)
             // this.$s.setSession('retrieveRecordId',0)
             // window.open(router.href, '_blank');
         },

+ 1 - 0
src/views/login/index.vue

@@ -335,6 +335,7 @@ export default {
         align-items: start;
         margin:auto;
         .left{
+          z-index: -1;
           // width:100%;
           width: 650px;
           min-width: 650px;

+ 1 - 1
src/views/project/patentCollection/components/mixins/index.js

@@ -377,7 +377,7 @@ export const handleData = {
       if(row.appCountry == 'CN' || this.outside){
         return false
       }
-      if(row.appNo.substring(0,2)== 'CN'){
+      if(row.appNo && row.appNo.substring(0,2)== 'CN'){
         return false
       }
       // var arr = row[key]

+ 2 - 2
src/views/project/patentDetails/components/patentMessage/mixins/translate.js

@@ -31,7 +31,7 @@ export const translate = {
     },
     methods: {
         showTabs(){
-            if(this.outside || this.patent.appCountry == 'CN' || this.patent.appNo.substring(0,2)== 'CN'){
+            if(this.outside || this.patent.appCountry == 'CN' || (this.patent.appNo && this.patent.appNo.substring(0,2)== 'CN')){
               this.tabs = [
                 {
                   label:'原文',
@@ -46,7 +46,7 @@ export const translate = {
                 label:'原文',
                 name:'0',
                 field:'content'
-                }
+              }
             }
             else{
               this.tabs = [

+ 6 - 1
src/views/report/InvalidResponse/components/Evidence/evidence.vue

@@ -27,7 +27,12 @@
                         <div>
                             <el-link type="primary" @click="checkDetails(scope)">D{{ scope.row.sysOrder }}</el-link>
                             <span>
-                                <my-draggable :list="tableData" :check="scope.row.id" @change="changeOrder" @update="updateOrder"></my-draggable>
+                                <my-draggable :list="tableData" :check="scope.row.id" @change="changeOrder" @update="updateOrder">
+                                    <template v-slot:default="data">
+                                        D{{ data.data.sysOrder }}-{{ data.data.name }}
+                                    </template>
+                                    
+                                </my-draggable>
                             </span>
                         </div>
                     </template>

+ 3 - 1
src/views/report/InvalidResponse/components/draggable/index.vue

@@ -15,7 +15,9 @@
                         <el-radio v-model="radio" @input="change" :label="item.id">{{  }}</el-radio>
                     </span>
                     <my-tooltip :content="item.name" placement="right">
-                            <div class="noWrap" style="cursor:move;">{{ item.name }}</div>
+                            <div class="noWrap" style="cursor:move;">
+                                <slot :data="item">{{item.name }}</slot>
+                            </div>
                     </my-tooltip>
                 </div>
         </draggable>

+ 1 - 1
src/views/report/InvalidResponse/components/reasonsAndEvidence/details.vue

@@ -12,7 +12,7 @@
                 <el-dropdown-item command="presentOpinions1" v-else>答辩意见</el-dropdown-item>
                 <el-dropdown-item command="rbOpinions">{{ifSecondInvalid?'第二次':''}}复审委意见</el-dropdown-item>
                 <el-dropdown-item command="rbDecisionKey">{{ifSecondInvalid?'第二次':''}}复审委要点提炼</el-dropdown-item>
-                <el-dropdown-item command="a">{{ifSecondInvalid?'第二次':''}}复审委决定详情</el-dropdown-item>
+                <!-- <el-dropdown-item command="a">{{ifSecondInvalid?'第二次':''}}复审委决定详情</el-dropdown-item> -->
             </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="editContent" class="margin-right_10">{{edit?'完成':'编辑'}}</el-button>