合并申请人/权利人直辖市只有中国的时候才显示

src/views/project/patentCollection/components/drawer/merge.vue

@@ -70,13 +70,13 @@
             <el-form-item label="简称" prop="abbreviation">
               <el-input v-model="ruleForm.abbreviation" placeholder="请输入名称"></el-input>
             </el-form-item>
-            <el-form-item label="国家" prop="country">
+            <el-form-item label="国家" prop="country" >
               <el-select v-model="ruleForm.country" placeholder="请选择" filterable class="width_100">
                 <el-option v-for="(item, index) in commonData" :label="item.label" :key="index"
                   :value="item.label"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="省/直辖市" prop="province">
+            <el-form-item label="省/直辖市" prop="province" v-if="ruleForm.country=='中国'">
               <el-cascader ref="myCascader" @change="changeCas" v-model="ruleForm.provinceOld" :options="areaOptions"
                 class="width_100"></el-cascader>
             </el-form-item>

src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue

@@ -637,7 +637,7 @@ export default {
         })
         if(!obj || !obj.patentClaimHistoryList){
            var sign = this.featureIsChange(row,type)
-           console.log(row.proofGroupId,sign)
+        //    console.log(row.proofGroupId,sign)
            if(!sign){
             return ''
            }
@@ -651,7 +651,7 @@ export default {
             })
             if(!obj2){
                 var sign = this.featureIsChange(row,type)
-                console.log(sign)
+                // console.log(sign)
                 if(!sign){
                     return ''
                 }
@@ -866,7 +866,7 @@ export default {
                 }
             }
         }
-        console.log(data)
+        // console.log(data)
         setTimeout(()=>{
             this.loading = false
             var data2 = []