diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 2405f46..693191e 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -43,6 +43,9 @@ + + + diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue index 6fb1662..f27961b 100644 --- a/subpkg/newArchives/newArchives.vue +++ b/subpkg/newArchives/newArchives.vue @@ -28,9 +28,17 @@ 地区信息 - - - + + + + + + + + + @@ -144,6 +152,7 @@ demandList: [], //更多需求 demandListChild: [], //更多二级需求 showDemandList: [], //更多需求展示列表 + brigadeList: [], formData: { id_card: '', sex: '', @@ -152,6 +161,7 @@ highway: '', //汽车是否能到家 smart_phone: '', //是否使用智能手机 wechat: '', //微信号 + brigade: '', //小队 address: '', //家庭地址 age: '', //年龄 category_id: '1', @@ -201,6 +211,12 @@ message: '姓名不能为空', trigger: ['change', 'blur'] }, + brigade: { + type: 'string', + required: true, + message: '小队不能为空', + trigger: ['change', 'blur'] + }, address: { type: 'string', required: true, @@ -224,23 +240,25 @@ }, onLoad() { this.initCategoryBusinessList(); + this.initBrigadeList() }, onShow() {}, - computed:{ - nowAddress(){ - let address = this.$store.state.app.userInfo; - let str = ''; - address.province_name?str+=address.province_name:null; - address.city_name?str+=address.city_name:null; - address.area_name?str+=address.area_name:null; - address.street_name?str+=address.street_name:null; - address.village_name?str+=address.village_name:null; - return str; - } - }, + computed: { + nowAddress() { + let address = this.$store.state.app.userInfo; + let str = ''; + address.province_name ? str += address.province_name : null; + address.city_name ? str += address.city_name : null; + address.area_name ? str += address.area_name : null; + address.street_name ? str += address.street_name : null; + address.village_name ? str += address.village_name : null; + return str; + } + }, methods: { // 新增档案 async addArchives() { + console.log(this.formData); try { // Toast('开发中') // let refsDatas = this.loadRefsDatas(); @@ -250,46 +268,46 @@ // let flag4 = await this.$refs.plantRef.validate(); // return console.log(flag1); await this.$refs.archives.validate(); - uni.showLoading({ - title: '登记中', - mask: true - }) - // let districtForm = { - // area_id: this.$refs.districtSelectorRef.formData.area, - // street_id: this.$refs.districtSelectorRef.formData.street, - // village_id: this.$refs.districtSelectorRef.formData.village, - // brigade_id: this.$refs.districtSelectorRef.formData.brigade, - // } - let res = await informationAdd({ - ...this.formData, - // ...districtForm, - ...this.$refs.residentsRef.residents, - // datas: [{ - // card_id: 32, - // datas: { - // ...this.$refs.breedingRef.formData - // } - // }, - // { - // card_id: 7, - // datas: { - // ...this.$refs.plantRef.formData - // } - // }, - // ...refsDatas - // ] - }); - uni.hideLoading() - uni.showToast({ - icon: "none", - title: "添加成功", - success: () => { - setTimeout(() => { - uni.$emit('loadArchives'); - uni.navigateBack() - }, 1000) - } - }) + uni.showLoading({ + title: '登记中', + mask: true + }) + // let districtForm = { + // area_id: this.$refs.districtSelectorRef.formData.area, + // street_id: this.$refs.districtSelectorRef.formData.street, + // village_id: this.$refs.districtSelectorRef.formData.village, + // brigade_id: this.$refs.districtSelectorRef.formData.brigade, + // } + let res = await informationAdd({ + ...this.formData, + // ...districtForm, + ...this.$refs.residentsRef.residents, + // datas: [{ + // card_id: 32, + // datas: { + // ...this.$refs.breedingRef.formData + // } + // }, + // { + // card_id: 7, + // datas: { + // ...this.$refs.plantRef.formData + // } + // }, + // ...refsDatas + // ] + }); + uni.hideLoading() + uni.showToast({ + icon: "none", + title: "添加成功", + success: () => { + setTimeout(() => { + uni.$emit('loadArchives'); + uni.navigateBack(); + }, 1000) + } + }) } catch (e) { console.log(e); Toast('请填写完整信息') @@ -315,6 +333,19 @@ let res = await categoryBusinessList(); this.demandList = res.data; }, + initBrigadeList(){ + try{ + let arr = this.$store.state.app.userInfo.brigade.split(','); + for (let i = 0; i < arr.length; i++) { + this.brigadeList.push({ + id: arr[i], + brigade_name: this.$store.state.app.userInfo.brigade_name[i].brigade_name + }) + } + }catch(e){ + Toast('未负责小队'); + } + }, // 选择更多需求 changeHandler(e) { if (e.columnIndex == 0) { //滑动左侧时才加载,右侧不加载