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/workOrderDetails/index.vue | 58 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 26 deletions(-) diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue index de61d5b..fec6ade 100644 --- a/pages/actionChange/workOrderDetails/index.vue +++ b/pages/actionChange/workOrderDetails/index.vue @@ -1,11 +1,11 @@ <template> <view class="mainContent"> - <basicInfor :basic-infor="basicInfor" v-if="isShow" /> + <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 && basicInfor.stateName!=='���������'" + 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"> + <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> @@ -34,7 +34,7 @@ basicInfor: {}, unitListL: [], userInfor: null, - show: false, + show: true, isShow: false, option: {} } @@ -44,10 +44,8 @@ return this.basicInfor.pageState }, }, - created() { - this.getUnitList() - }, - onLoad: function(option) { + created() {}, + onLoad(option) { //option���object������������������������������������������������ this.basicInfor = JSON.parse(option.infor) // let type = JSON.parse(option.type) @@ -55,8 +53,8 @@ this.option = option }, async mounted() { - //������������������ await this.$onLaunched + //������������������ this.userInfor = JSON.parse(uni.getStorageSync('userInfor') || 'null') console.log('������������������������', this.userInfor) if (this.option.type === 'share' && this.userInfor) { @@ -83,12 +81,12 @@ // ������������ this.basicInfor.pageState = 'edit' this.basicInfor.stateName = res.data.name - this.isShow = true + this.getData() } else if (res.data.code === 2) { // ��������� - this.isShow = true this.basicInfor.pageState = 'view' this.basicInfor.stateName = res.data.name + this.getData() } }).catch(errors => { console.log('���������������������', errors) @@ -96,21 +94,23 @@ }) } else { this.isShow = true + this.getData() } - console.log('this.basicInfor123', this.basicInfor) }, methods: { - closePop() {}, - 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}������������` + 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.escalationUnitName}-${time}������������` + this.show = false + this.isShow = true }) }, radioGroupChange(e) { @@ -123,9 +123,15 @@ showTabBar: true } }) - uni.redirectTo({ - url: '/pages/index/index', - }) + 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