diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue index 5cbae88..9b78085 100644 --- a/components/districtSelector/districtSelectorTow.vue +++ b/components/districtSelector/districtSelectorTow.vue @@ -3,8 +3,8 @@ - - + + @@ -68,7 +68,7 @@ area: '', street: '', village: '', - brigade: '', + brigade: '' }, formDataRead: { province: false, @@ -90,10 +90,11 @@ trigger: ['change', 'blur'] }, brigade: { - validator: (rule, value, callback) => { - value ? callback() : callback('不能为空') - }, - trigger: ['change', 'blur'] + required: true, + message: '不能为空', + // validator: (rule, value, callback) => { + // value ? callback() : callback('不能为空') + // }, }, }, streetList: [], @@ -159,8 +160,9 @@ }) }, // 选择城市 - changeCity(type) { - if (this.$props.readonly) return; + changeCity(type, toast=false) { + if(toast) return Toast('不可修改该区域') + if (this.$props.readonly) return ; if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区'); this.changeType = type; this.showProvince = true; @@ -170,13 +172,15 @@ return this[this.changeType + 'List']; }, // 选中城市 - confirm(e) { + async confirm(e) { let flag = false; //清空所选标记 if (this.formData[this.changeType] != e.value[0][this.changeType + '_code']) flag = true; if (this.changeType == 'brigade') { this.formData.brigade = e.value[0].id; this.formDataText.brigade = e.value[0].brigade_name; this.showProvince = false; + await this.$nextTick(); + this.$refs.districtForm.validate(); return; } this.formData[this.changeType] = e.value[0][this.changeType + '_code']; diff --git a/components/task/index.vue b/components/task/index.vue index b8b1fad..bd4e498 100644 --- a/components/task/index.vue +++ b/components/task/index.vue @@ -3,7 +3,7 @@ - @@ -39,7 +39,7 @@ // }, { // name: '已完成' // }, { - // name: '未完成' + // name: '进行中' // }], loadConfig: { page: 1, @@ -70,7 +70,7 @@ this.status = 3; break; case 2: - this.status = 5; + this.status = 2; break; default: this.status = 0; diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue index dc66bda..1250c91 100644 --- a/subpkg/contract/contract.vue +++ b/subpkg/contract/contract.vue @@ -10,7 +10,7 @@ --> - + @@ -55,7 +55,7 @@ - + 查看 @@ -124,6 +124,9 @@ import { contractList } from "@/api/contract.js" + import { + download_file + } from "@/api/junziqian.js" export default { data() { return { @@ -150,6 +153,18 @@ url: url }) : Toast('暂未开放') }, + navToContract (contract_no) { + download_file({ + applyNo: contract_no + }).then(res => { + if (res.code != 1) { + Toast(res.msg) + } + uni.navigateTo({ + url: `/subpkg/pdfView/pdfView?url=${res.data.url}` + }) + }) + }, initLoadConfig() { this.loadConfig.page = 1; this.loadConfig.status = "loadmore"; diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index efed93e..dc41b6b 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -26,7 +26,7 @@ 账户总金额(元) - {{userInfo.day_money_count?userInfo.day_money_count.toFixed(2):'0.00'}}元 + {{userInfo.user_money?userInfo.user_money:'0.00'}}元 ****元 diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue index 70f3e20..4524b06 100644 --- a/subpkg/newPersonnel/newPersonnel.vue +++ b/subpkg/newPersonnel/newPersonnel.vue @@ -5,12 +5,12 @@ - 用户头像: + *用户头像: - + @@ -57,7 +57,7 @@ - 身份证照: + *身份证照: @@ -106,7 +106,7 @@ - 银行卡照: + *银行卡照: @@ -286,7 +286,7 @@ --> - + @@ -300,6 +300,7 @@ } from "@/api/oaUser.js" import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器 import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器 +import { Toast } from "../../libs/uniApi" export default { components: { districtSelector, @@ -422,7 +423,10 @@ }, // 创建账号 addAcountNum() { + if(!this.formData.avatar)return Toast('头像未上传'); let flag = this.$refs.districtSelectorRef.validate(); + if(!this.formData.qualification.id_card||!this.formData.qualification.id_card_b)return Toast('身份证未上传'); + if(!this.formData.qualification.bank_account||!this.formData.qualification.bank_account_b)return Toast('银行卡未上传'); this.$refs.uForm.validate().then(async (e) => { if (e && flag) { uni.showLoading() @@ -546,7 +550,7 @@ .btn { margin-top: 32rpx; // margin-bottom: 40rpx; - width: 100%; + // width: 100%; height: 84rpx; background: $theme-oa-color; border-radius: 42rpx 42rpx 42rpx 42rpx;