From 5f8cd55f32939d15c6224d491f89743421cab0f9 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 20 Nov 2023 13:12:42 +0800
Subject: [PATCH] fix:分享修改
---
pages/actionChange/workOrderDetails/index.vue | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue
index 550a248..6071eca 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)
@@ -98,31 +100,21 @@
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) {
@@ -135,9 +127,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