From 1e71dd86f6d0c4fc7e5143600d4bc4b50992a2a7 Mon Sep 17 00:00:00 2001 From: quanyawei <401863037@qq.com> Date: Thu, 04 Jul 2024 14:51:28 +0800 Subject: [PATCH] fix: 高德密钥修改 --- pages/actionChange/workOrderDetails/index.vue | 125 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 108 insertions(+), 17 deletions(-) diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue index 2520f8d..8db8670 100644 --- a/pages/actionChange/workOrderDetails/index.vue +++ b/pages/actionChange/workOrderDetails/index.vue @@ -1,10 +1,15 @@ <template> <view class="mainContent"> - <basicInfor :basic-infor="basicInfor" /> + <u-sticky> + <u-alert v-if="basicInfor.invalidReason" :title="`���������:${basicInfor.invalidReason}`" type="warning" + :description="description"></u-alert> + </u-sticky> + <basicInfor :basic-infor="basicInfor" v-if="basicInfor.unitId" /> <rectificationInfor ref="rectificationInfor" :basic-infor="basicInfor" - v-if="!(pageState === 'view' && basicInfor.state === 20)" /> - <approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30" :basic-infor="basicInfor" /> - <view class="bunts"> + v-if="!(pageState === 'view' && basicInfor.state === 20)&&isShow" /> + <approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30 && basicInfor.stateName!=='���������' && isShow" + :basic-infor="basicInfor" /> + <view class="bunts" v-if="isShow"> <view class="but butRight"> <u-button shape="square" @click="refuse" type="error" v-if="pageState==='edit'&& basicInfor.state >= 30">������</u-button> @@ -14,6 +19,8 @@ <u-button shape="square" type="primary" @click="submit"> ������ </u-button> </view> </view> + <u-overlay :show="show" :mask-click-able='false' opacity='0.8'> + </u-overlay> </view> </template> <script> @@ -28,27 +35,105 @@ }, data() { return { - basicInfor: {} + basicInfor: {}, + unitListL: [], + userInfor: null, + show: true, + isShow: false, + option: {} } }, computed: { pageState() { return this.basicInfor.pageState - } + }, }, - onLoad: function(option) { - console.log('option', option) + created() {}, + onLoad(option) { //option���object������������������������������������������������ this.basicInfor = JSON.parse(option.infor) - this.share.title = '���������������' + // let type = JSON.parse(option.type) + console.log('option', option) + this.option = option }, - onBackPress(e) { - uni.navigateBack({ - delta: 1, //������������������������������������������2 - }) - return false + async mounted() { + await this.$onLaunched + //������������������ + this.userInfor = JSON.parse(uni.getStorageSync('userInfor') || null) + console.log('������������������������', this.userInfor) + if (this.option.type === 'share') { + if (this.userInfor) { + let params = { + allocationNum: this.basicInfor.allocationNum, + userId: this.userInfor.userId + } + this.$http.httpGet('/allocationApp/authority', params).then(res => { + console.log('������������������', res) + if (res.data.code === 3) { + uni.showModal({ + content: '���������������������������������������������', + showCancel: false, + confirmText: '������', + success: res => { + if (res.confirm) { + uni.reLaunch({ + url: '/pages/index/index', + }) + } + }, + }) + } else if (res.data.code === 1) { + // ������������ + this.basicInfor.pageState = 'edit' + this.basicInfor.stateName = res.data.name + this.getData() + } else if (res.data.code === 2) { + // ��������� + this.basicInfor.pageState = 'view' + this.basicInfor.stateName = res.data.name + this.getData() + } + }).catch(errors => { + console.log('���������������������', errors) + console.log('���������������������params', params) + }) + } else { + uni.showModal({ + title: '���������', + content: '������������������������������������������', + showCancel: false, + confirmText: '������', + success: res => { + if (res.confirm) { + uni.reLaunch({ + url: '/pages/login/login', + }) + } + }, + }) + this.$isResolve() + } + } else { + this.isShow = true + this.getData() + } }, methods: { + getData() { + this.$http.httpGet('/allocation/detail', { + id: this.basicInfor.allocationId + }).then(res => { + this.basicInfor = { + ...this.basicInfor, + ...res.data + } + console.log('this.basicInfor123', this.basicInfor) + let time = this.basicInfor.time.slice(5) + this.share.title = `${this.basicInfor.unitName}-${time}������������` + this.show = false + this.isShow = true + }) + }, radioGroupChange(e) { console.log('radioGroupe���e', this.workForme.isChange) }, @@ -59,9 +144,15 @@ showTabBar: true } }) - uni.navigateBack({ - delta: 1, //������������������������������������������2 - }) + if (this.option.type === 'share') { + uni.redirectTo({ + url: '/pages/index/index', + }) + } else { + uni.navigateBack({ + delta: 1, //������������������������������������������2 + }) + } }, refuse() { Promise.all([this.$refs.rectificationInfor && this.$refs.rectificationInfor.formVali(), this.$refs -- Gitblit v1.8.0