diff --git a/components/newArchives/residents.vue b/components/newArchives/residents.vue index 9d4795c..d6ec1ff 100644 --- a/components/newArchives/residents.vue +++ b/components/newArchives/residents.vue @@ -182,6 +182,19 @@ } } }, + mounted() { + if(this.$props.readonly){ + this.residents = this.$props.datas; + if(!isNaN(this.residents.child))this.residents.child = +this.residents.child; + this.residents.family.forEach(item=>{ + if(!isNaN(item.situation))item.situation = +item.situation; + }) + this.residents.child_arr.forEach(item=>{ + if(!isNaN(item.feeding))item.feeding = +item.feeding; + if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson; + }) + } + }, methods: { async validate() { return this.$refs.residentsForm.validate(); diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 6f49cee..28c3f05 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -40,6 +40,9 @@ 地区信息 + + + @@ -72,6 +75,9 @@ + + 更新时间:{{item.update_time}} + @@ -175,6 +181,12 @@ this.initInformationDetails({ id: options.id }) }, onShow() {}, + computed:{ + nowAddress(){ + let address = this.$store.state.app.userInfo; + return address.province_name+address.city_name+address.area_name+address.street_name+address.village_name+address.brigade_name; + } + }, methods: { async initInformationDetails(id) { let res = await informationDetails(id); @@ -221,6 +233,11 @@ color: #fff; } } + + .update_time{ + padding-left: 28rpx; + padding-top: 28rpx; + } .card { background-color: #fff; diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 9816dd1..69ff0bd 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -254,9 +254,9 @@ } .btn { + flex-shrink: 0; font-size: 25rpx; font-weight: 400; - min-width: 80rpx; color: #666666; display: flex; align-items: center; diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue index a7743ad..89b6272 100644 --- a/subpkg/companySign/companySign.vue +++ b/subpkg/companySign/companySign.vue @@ -113,9 +113,9 @@ contract_type: data.contract_type, type: data.type }) - // Toast(res.msg || '合同已生成') this.initCompany(); - uni.hideLoading() + uni.hideLoading(); + Toast(res.msg || '合同已生成') }, // 发送合同 async addContract(data) { @@ -126,7 +126,6 @@ let res = await Draftingcontracts({ id: this.id }); - // Toast('合同已发送'); this.initCompany(); if (this.userInfo.contract.check_status == 3) { this.timerCount = 60; @@ -139,6 +138,7 @@ }, 1000); } uni.hideLoading(); + Toast('合同已发送'); this.naviTo('/subpkg/submit/submit'); }, // 发送短信 diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue index f8d27c6..6c9b2ac 100644 --- a/subpkg/companyUnsign/companyUnsign.vue +++ b/subpkg/companyUnsign/companyUnsign.vue @@ -161,9 +161,9 @@ export default { } .btn { + flex-shrink: 0; font-size: 25rpx; font-weight: 400; - min-width: 80rpx; color: #666666; display: flex; align-items: center;