From 53ae51f7111fe62f0011d304268cbfe1261b36f1 Mon Sep 17 00:00:00 2001 From: quanyawei <401863037@qq.com> Date: Wed, 15 Nov 2023 08:37:30 +0800 Subject: [PATCH] fix:立行立改添加修改责任单位 --- pages/actionChange/agencyPage/index.vue | 36 +++++++++--------- pages/actionChange/newPage/index.vue | 33 ++++++++++++++++ App.vue | 1 pages/actionChange/components/basicInfor.vue | 10 +++++ pages/index/index.vue | 4 ++ 5 files changed, 66 insertions(+), 18 deletions(-) diff --git a/App.vue b/App.vue index 442e41d..726f5b5 100644 --- a/App.vue +++ b/App.vue @@ -158,6 +158,7 @@ html { height: 100%; + width: 750rpx; } .formItemContent { diff --git a/pages/actionChange/agencyPage/index.vue b/pages/actionChange/agencyPage/index.vue index e5b728e..9ce724b 100644 --- a/pages/actionChange/agencyPage/index.vue +++ b/pages/actionChange/agencyPage/index.vue @@ -203,17 +203,6 @@ return data } }, - onReachBottom() { - //������������������������������������������ - if (this.isLoading) { - console.log('1122111') - this.status = 'loading' - //������������������,���������++ - this.page.currentPage = ++this.page.currentPage - //������������,������������tab������������ - this.getWorkOrder() - } - }, mounted() {}, filters: { stateFormatter(val) { @@ -223,14 +212,21 @@ }, onLoad: () => {}, methods: { + onBottom() { + //������������������������������������������ + console.log('1122111') + this.status = 'loading' + //������������������,���������++ + this.page.currentPage = ++this.page.currentPage + //������������,������������tab������������ + this.getWorkOrder() + }, getLoadmore() { - if (this.isLoading) { - this.status = 'loading' - //������������������,���������++ - this.page.currentPage = ++this.page.currentPage - //������������,������������tab������������ - this.getWorkOrder() - } + this.status = 'loading' + //������������������,���������++ + this.page.currentPage = ++this.page.currentPage + //������������,������������tab������������ + this.getWorkOrder() }, async onChooseAvatar(e) { const { @@ -372,6 +368,10 @@ } </script> <style scoped lang="scss"> + page { + height: 101vh; + } + /deep/.uni-page-head { display: none; } diff --git a/pages/actionChange/components/basicInfor.vue b/pages/actionChange/components/basicInfor.vue index d661d64..ca19e88 100644 --- a/pages/actionChange/components/basicInfor.vue +++ b/pages/actionChange/components/basicInfor.vue @@ -87,6 +87,16 @@ <text class="rowTipContenetAll">{{ basicInfor.pollutePosition ||'' }}</text> </view> </p> + <p class="rowTip"> + <view class="rowTipContenet" style="width: 100%;"> + <view class="wholeLine"> + <text class="rowTipContenetLabel">������������:</text> + <text class="rowTipContenetAll"> + <text>{{ dictObj.emphasisEnum[basicInfor.keyPoint]||'' }}</text> + </text> + </view> + </view> + </p> <view class="formItemContent"> <u--form labelPosition="left" label-width="75" :border-bottom="false" ref="uForm"> <u-form-item border-bottom label="������������:" :border-bottom="false"> diff --git a/pages/actionChange/newPage/index.vue b/pages/actionChange/newPage/index.vue index 9fcdd37..5198746 100644 --- a/pages/actionChange/newPage/index.vue +++ b/pages/actionChange/newPage/index.vue @@ -53,6 +53,14 @@ :customStyle="{marginRight: '16px'}" :label="item.name" :name="item.value" /> </u-radio-group> </u-form-item> + <u-form-item border-bottom label="������������:" prop="keyPoint"> + <u-checkbox-group v-model="form.keyPoint" placement='column' style="font-size: 13px;" + @change='changeKeyPoint'> + <u-checkbox :key="index" v-for="(item, index) in emphasisEnumlist" + :customStyle="{marginTop: '10px'}" shape="circle" :label="item.name" :name="item.value" + :disabled="item.disabled"></u-checkbox> + </u-checkbox-group> + </u-form-item> <u-form-item border-bottom label="������������:" prop="problemDescribe" required> <u--textarea v-model="form.problemDescribe" border="none" placeholder="���������������" /> </u-form-item> @@ -147,6 +155,7 @@ escalationTime: '', problemDescribe: '', pollutePosition: '', + keyPoint: [] }, sumbitForm: { unitId: '', @@ -158,10 +167,12 @@ escalationTime: '', problemDescribe: '', pollutePosition: '', + keyPoint: null }, unitList: [], polluteList: [], fileBaseList: [], + emphasisEnumlist: [] } }, onReady() { @@ -182,6 +193,23 @@ return false }, methods: { + changeKeyPoint(name) { + if (name.length > 0) { + this.sumbitForm.keyPoint = name[0] + this.emphasisEnumlist.forEach(item => { + if (item.value === name[0]) { + item.disabled = false + } else { + item.disabled = true + } + }) + } else { + this.emphasisEnumlist.forEach(item => { + item.disabled = false + }) + } + console.log(this.emphasisEnumlist) + }, handleFile(data) { console.log('datadata', data) this.fileBaseList = data @@ -280,6 +308,11 @@ this.unitList = res.data this.Dic = JSON.parse(uni.getStorageSync('dict') || '[]') this.changeEnum = this.Dic.changeEnum + this.changeEnum = this.Dic.changeEnum + this.emphasisEnumlist = this.Dic.emphasisEnum.map(item => { + item.disabled = false + return item + }) this.setDefaultValue() }) }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 4b86e55..0836458 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -36,6 +36,10 @@ this.currIndex = '0' this.showTabBar = true }, + onReachBottom() { + //������������������������������������������ + this.$refs.agencyPage.onBottom() + }, mounted() { //������������������ this.token = uni.getStorageSync('tonken') -- Gitblit v1.8.0