diff --git a/components/districtSelector/districtSelector.vue b/components/districtSelector/districtSelector.vue
index 79de74c..768f0ad 100644
--- a/components/districtSelector/districtSelector.vue
+++ b/components/districtSelector/districtSelector.vue
@@ -2,27 +2,27 @@
地区信息
-
+
-
+
-
+
-
+
-
+
-
+
@@ -110,13 +110,25 @@
},
watch:{
datas(newValue, oldValue){
- if(newValue){
- console.log('获取地址');
+ if(this.$props.readonly&&newValue){
+ this.formDataText.area = this.$props.datas.area_name;
+ this.formDataText.street = this.$props.datas.street_name;
+ this.formDataText.village = this.$props.datas.village_name;
+ this.formDataText.brigade = this.$props.datas.brigade_name;
+
+ this.formData.area = this.$props.datas.area_id;
+ this.formData.street = this.$props.datas.street_id;
+ this.formData.village = this.$props.datas.village_id;
+ this.formData.brigade = this.$props.datas.brigade_id;
}
}
},
- mounted() {
- if(!this.$props.readonly) this.initProvinceAndCity();
+ created() {
+ if(!this.$props.readonly) {
+ this.initProvinceAndCity();
+ }else{
+ this.rules = {};
+ }
},
methods:{
async validate(){
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 9891040..d1e8775 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -212,8 +212,10 @@
let flag1 = this.$refs.districtSelectorRef.validate();
let flag2 = this.$refs.residentsRef.validate();
let flag3 = this.$refs.breedingRef.validate();
+ // return console.log(flag1);
this.$refs.archives.validate().then(async (e) => {
- if (e && flag1 && flag2 && flag3) {
+ console.log('提交');
+ if (e && flag1==true && flag2==true && flag3==true) {
uni.showLoading()
let districtForm = {
area_id: this.$refs.districtSelectorRef.formData.area,
@@ -226,7 +228,7 @@
...districtForm,
...this.$refs.residentsRef.residents,
datas: [{
- id: 7,
+ card_id: 7,
datas: {
...this.$refs.breedingRef.formData
}
@@ -255,7 +257,7 @@
// console.log(this.$refs['demandRef'+item.category_id+''+item.category_child][0]);
this.$refs['demandRef' + item.id][0].validate();
datas.push({
- id: item.id,
+ card_id: item.id,
datas: { ...this.$refs['demandRef' + item.id][0]['formData'] }
})
})
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 33975f3..1eccd01 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -83,12 +83,6 @@
-
-
-
- 查看
-