From 52d463e03c1f074099ed8e8a6b7c3ddde52d2708 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 27 Oct 2023 14:50:28 +0800
Subject: [PATCH] fix:小程序初版
---
pages/actionChange/workOrderDetails/index.vue | 176 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 75 deletions(-)
diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue
index 1e79165..9feaf22 100644
--- a/pages/actionChange/workOrderDetails/index.vue
+++ b/pages/actionChange/workOrderDetails/index.vue
@@ -1,93 +1,110 @@
<template>
<view class="mainContent">
<basicInfor :basic-infor="basicInfor" />
- <rectificationInfor ref="rectificationInfor" :basic-infor="basicInfor" />
+ <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">
- <u-button shape="square" @click="close">������</u-button>
- <u-button
- v-if="pageState==='edit'"
- shape="square"
- type="primary"
- @click="submit"
- >
- ������
- </u-button>
+ <view class="but butRight">
+ <u-button shape="square" @click="refuse" type="error"
+ v-if="pageState==='edit'&& basicInfor.state >= 30">������</u-button>
+ <u-button shape=" square" @click="close" v-else>������</u-button>
+ </view>
+ <view class="but butleft" v-if="pageState==='edit'">
+ <u-button shape="square" type="primary" @click="submit"> ������ </u-button>
+ </view>
</view>
</view>
</template>
<script>
-import basicInfor from '../components/basicInfor.vue'
-import rectificationInfor from '../components/rectificationInfor.vue'
-import approvalnfor from '../components/approvalnfor.vue'
-export default {
- components: {
- basicInfor,
- rectificationInfor,
- approvalnfor,
- },
- data() {
- return {
- basicInfor: {}
- }
- },
- computed: {
- pageState() {
- return this.basicInfor.pageState
- }
- },
- onLoad: function(option) {
- console.log('option', option)
- //option���object������������������������������������������������
- this.basicInfor = JSON.parse(option.infor)
-
- },
- onBackPress(e) {
- uni.navigateTo({
- url: '/pages/actionChange/agencyPage/index',
- })
- return false
- },
- methods: {
- radioGroupChange(e) {
- console.log('radioGroupe���e', this.workForme.isChange)
+ import basicInfor from '../components/basicInfor.vue'
+ import rectificationInfor from '../components/rectificationInfor.vue'
+ import approvalnfor from '../components/approvalnfor.vue'
+ export default {
+ components: {
+ basicInfor,
+ rectificationInfor,
+ approvalnfor,
},
- close() {
- let pages = getCurrentPages() // ������������
- let beforePage = pages[pages.length - 3] // ������������
- //beforePage.$vm.reFresh = Math.random()//������������������������
+ data() {
+ return {
+ basicInfor: {}
+ }
+ },
+ computed: {
+ pageState() {
+ return this.basicInfor.pageState
+ }
+ },
+ onLoad: function(option) {
+ console.log('option', option)
+ //option���object������������������������������������������������
+ this.basicInfor = JSON.parse(option.infor)
+ },
+ onBackPress(e) {
uni.navigateBack({
delta: 1, //������������������������������������������2
- success: function() {
- // beforePage.$vm.reFresh()
- }
})
+ return false
},
- submit() {
- Promise.all([this.$refs.rectificationInfor && this.$refs.rectificationInfor.formVali(), this.$refs
- .approvalnfor && this.$refs.approvalnfor.formVali()
- ]) //
- .then(()=> {
- let api = this.basicInfor.state >= 30 ? '/allocation/check' : '/allocation/change' //������
- let form = this.basicInfor.state >=30 ? this.$refs.approvalnfor.form : this.$refs.rectificationInfor.form
- let data = {
- allocationId: this.basicInfor.allocationId,
- ...form,
- state: this.basicInfor.state,
+ methods: {
+ radioGroupChange(e) {
+ console.log('radioGroupe���e', this.workForme.isChange)
+ },
+ close() {
+ uni.$emit('currIndex', {
+ data: {
+ index: '0',
+ showTabBar: true
}
- this.$http.httpPost(api, data).then((res)=> {
- this.close()
+ })
+ uni.navigateBack({
+ delta: 1, //������������������������������������������2
+ })
+ },
+ refuse() {
+ Promise.all([this.$refs.rectificationInfor && this.$refs.rectificationInfor.formVali(), this.$refs
+ .approvalnfor && this.$refs.approvalnfor.formVali()
+ ]) //
+ .then(() => {
+ let api = this.basicInfor.state >= 30 ? '/allocation/check' : '/allocation/change' //������
+ let form = this.basicInfor.state >= 30 ? this.$refs.approvalnfor.form : this.$refs
+ .rectificationInfor.form
+ let data = {
+ allocationId: this.basicInfor.allocationId,
+ ...form,
+ state: 50,
+ }
+ this.$http.httpPost(api, data).then(res => {
+ this.close()
+ })
+ }).catch(err => {
+ console.log('���������������', err)
})
- })
- .catch(err=> {
- console.log('���������������������', err)
- })
-
- }
- },
-}
+ },
+ submit() {
+ Promise.all([this.$refs.rectificationInfor && this.$refs.rectificationInfor.formVali(), this.$refs
+ .approvalnfor && this.$refs.approvalnfor.formVali()
+ ]) //
+ .then(() => {
+ let api = this.basicInfor.state >= 30 ? '/allocation/check' : '/allocation/change' //������
+ let form = this.basicInfor.state >= 30 ? this.$refs.approvalnfor.form : this.$refs
+ .rectificationInfor.form
+ let data = {
+ allocationId: this.basicInfor.allocationId,
+ ...form,
+ state: this.basicInfor.state === 20 ? 30 : 40,
+ }
+ this.$http.httpPost(api, data).then(res => {
+ this.close()
+ })
+ }).catch(err => {
+ console.log('���������������', err)
+ })
+ }
+ },
+ }
</script>
-
<style scoped lang="scss">
.mainContent {
padding-bottom: 38.46rpx;
@@ -98,9 +115,18 @@
margin-top: 20px;
margin-bottom: 96.15rpx;
padding: 0 20px;
+ justify-content: center;
- .u-button {
- width: 288.46rpx;
+ .but {
+ width: 50%;
+ }
+
+ .butRight {
+ padding-right: 20px;
+ }
+
+ .butleft {
+ padding-left: 20px;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0