upate

src/components/common/cityList.vue

@@ -108,6 +108,7 @@ export default class cityList extends Vue {
     this.$emit("childCityList", ary);
     this.$emit("childCityList", ary);
   }
   }
   onCancel(){
   onCancel(){
+    this.$emit("cancelCityList");
     //this.showCancel=false
     //this.showCancel=false
   }
   }
 }
 }

src/views/archives/personInfo.vue

@@ -59,7 +59,7 @@
         />
         />
         <van-popup v-model="showBirthplace" position="bottom">
         <van-popup v-model="showBirthplace" position="bottom">
           <!-- <city-list @childCityList="birthCity" :showBirthplace="showCancel" /> -->
           <!-- <city-list @childCityList="birthCity" :showBirthplace="showCancel" /> -->
-          <city-list @childCityList="birthCity" />
+          <city-list @childCityList="birthCity" @cancelCityList="cancelCityList" />
         </van-popup>
         </van-popup>
         <!-- 民族 -->
         <!-- 民族 -->
         <van-field
         <van-field
@@ -157,7 +157,7 @@
           @click="showFile = true"
           @click="showFile = true"
         />
         />
         <van-popup v-model="showFile" position="bottom">
         <van-popup v-model="showFile" position="bottom">
-          <city-list @childCityList="localCity" />
+          <city-list @childCityList="localCity" @cancelCityList="cancelCityList" />
         </van-popup>
         </van-popup>
         <!-- 开始工作时间 -->
         <!-- 开始工作时间 -->
         <van-field
         <van-field
@@ -386,6 +386,10 @@ export default class personInfo extends Vue {
       }
       }
     });
     });
   }
   }
+  cancelCityList(){
+    this.showFile=false;
+    this.showBirthplace=false;
+  }
 }
 }
 </script>
 </script>
 
 

src/views/archives/socialInfo.vue

@@ -126,7 +126,7 @@
         </van-popup>
         </van-popup>
         <!-- 原社保缴纳省市 -->
         <!-- 原社保缴纳省市 -->
         <van-popup v-model="showSocialCity" position="bottom">
         <van-popup v-model="showSocialCity" position="bottom">
-          <city-list @childCityList="socialCity" />
+          <city-list @childCityList="socialCity" @cancelCityList="cancelCityList" />
         </van-popup>
         </van-popup>
         <!-- 与原单位关系 -->
         <!-- 与原单位关系 -->
         <van-popup v-model="showRelationUnit" position="bottom">
         <van-popup v-model="showRelationUnit" position="bottom">
@@ -332,6 +332,9 @@ export default class socialInfo extends Vue {
     this.getSalaryInfo();
     this.getSalaryInfo();
     this.getSocialInfo();
     this.getSocialInfo();
   }
   }
+  cancelCityList(){
+    this.showSocialCity=false;
+  }
 }
 }
 </script>
 </script>