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 | 117 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 63 insertions(+), 54 deletions(-) diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue index 0f7dd49..8db8670 100644 --- a/pages/actionChange/workOrderDetails/index.vue +++ b/pages/actionChange/workOrderDetails/index.vue @@ -1,6 +1,10 @@ <template> <view class="mainContent"> - <basicInfor :basic-infor="basicInfor" v-if="isShow" /> + <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)&&isShow" /> <approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30 && basicInfor.stateName!=='���������' && isShow" @@ -44,9 +48,7 @@ return this.basicInfor.pageState }, }, - created() { - this.getUnitList() - }, + created() {}, onLoad(option) { //option���object������������������������������������������������ this.basicInfor = JSON.parse(option.infor) @@ -57,72 +59,79 @@ async mounted() { await this.$onLaunched //������������������ - this.userInfor = JSON.parse(uni.getStorageSync('userInfor') || 'null') + this.userInfor = JSON.parse(uni.getStorageSync('userInfor') || null) console.log('������������������������', this.userInfor) - if (this.option.type === 'share' && 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() + if (this.option.type === 'share') { + if (this.userInfor) { + let params = { + allocationNum: this.basicInfor.allocationNum, + userId: this.userInfor.userId } - }).catch(errors => { - console.log('���������������������', errors) - console.log('���������������������params', params) - }) + 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() } - console.log('this.basicInfor123', this.basicInfor) }, methods: { getData() { this.$http.httpGet('/allocation/detail', { id: this.basicInfor.allocationId }).then(res => { - this.isShow = true - this.show = false this.basicInfor = { ...this.basicInfor, ...res.data } - }) - }, - getUnitList() { - this.$http.httpGet('/allocation/unit').then(res => { - this.unitList = res.data - let data = '' - if (this.basicInfor.unitId && this.unitList.length > 0) { - data = this.unitList && this.unitList.find(a => Number(a.unitId) === Number(this.basicInfor - .unitId)).unitName - let time = this.basicInfor.time.slice(5) - this.share.title = `${data}-${time}������������` - } + 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) { -- Gitblit v1.8.0