From b61205adfb447bb868a454b971aa90c3d82034de Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 21 十一月 2023 14:52:13 +0800
Subject: [PATCH] #
---
pages/business/plan/planDetails.vue | 39 ++++++++++++++++---
pages/business/plan/plan.vue | 26 ++++++++++++
2 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/pages/business/plan/plan.vue b/pages/business/plan/plan.vue
index 5254556..81672e2 100644
--- a/pages/business/plan/plan.vue
+++ b/pages/business/plan/plan.vue
@@ -160,6 +160,15 @@
getCsmtr1(e) {
let that = this
that.csmtrList = []
+ uni.showLoading({})
+ let param = {curr:1,limit:4,dept_id: 0,user_id: 67}
+ if (this.user.type == 'user_id') {
+ param = {curr:1,limit:4,user_id: that.user.id}
+ } else if(this.user.type == 'dept_id') {
+ param = {curr:1,limit:4,dept_id: that.user.id}
+ } else {
+ param = {curr:1,limit:4}
+ }
uni.request({
url: that.baseUrl + '/plan/page/auth',
header: {'token' : uni.getStorageSync('token'),},
@@ -196,10 +205,22 @@
});
}, 1000);
},
+ complete() {
+ uni.hideLoading()
+ }
})
},
getCsmtr() {
let that = this
+ uni.showLoading({})
+ let param = {curr:that.curr,limit:4,dept_id: 0,user_id: 67}
+ if (this.user.type == 'user_id') {
+ param = {curr:that.curr,limit:4,user_id: that.user.id}
+ } else if(this.user.type == 'dept_id') {
+ param = {curr:that.curr,limit:4,dept_id: that.user.id}
+ } else {
+ param = {curr:that.curr,limit:4}
+ }
uni.request({
url: that.baseUrl + '/plan/page/auth',
header: {'token' : uni.getStorageSync('token'),},
@@ -237,6 +258,9 @@
});
}, 1000);
},
+ complete() {
+ uni.hideLoading()
+ }
})
},
getDetails(id) {
@@ -269,7 +293,7 @@
margin-top: 20px;
}
.popup-content {
- margin-top: 150rpx;
+ margin-top: 260rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/pages/business/plan/planDetails.vue b/pages/business/plan/planDetails.vue
index ac2a205..086650e 100644
--- a/pages/business/plan/planDetails.vue
+++ b/pages/business/plan/planDetails.vue
@@ -10,8 +10,14 @@
</view>
<!-- 姝ラ鏉� -->
<view style="background-color: #FFF;margin-top: 10px;padding-top: 20px;padding-bottom: 20px;">
- <uni-steps :options="list1" :active="active" />
+ <uni-steps :options="list1" :active="current" />
</view>
+ <!-- <view style="background-color: #FFF;margin-top: 10px;padding-top: 20px;padding-bottom: 20px;">
+ <u-steps :current="current">
+ <u-steps-item :title="`${item.title}`" :desc="item.username" v-for="item in list1" />
+ </u-steps>
+ </view> -->
+
<!-- 鍩烘湰淇℃伅 -->
<view class="container">
<view><y-title title="鍩烘湰淇℃伅"></y-title></view><view></view>
@@ -36,7 +42,7 @@
<!-- 鍞墠瑙勫垝 -->
<view class="container">
<view><y-title title="鍞墠瑙勫垝"></y-title></view><view></view>
- <view class="list-item1">瑙勫垝鍛�</view><view class="list-item2">{{detl.uuid}}</view>
+ <view class="list-item1">瑙勫垝鍛�</view><view class="list-item2">{{detl.planner$}}</view>
<view class="list-item1">瀹屾垚鏃堕棿</view><view class="list-item2">{{detl.finishTime$}}</view>
<view class="list-item1">鏇存敼鏂规</view><view class="list-item2">{{detl.change}}</view>
<view class="list-item1">鏇存敼娆℃暟</view><view class="list-item2">{{detl.changeTime}}</view>
@@ -71,6 +77,7 @@
export default {
data() {
return {
+ current: 1,
id: 0,
detl: {
id: '',
@@ -87,9 +94,10 @@
followers: [],
cstmrId: '',
active: 0,
+ steps: [],
list1: [{
title: '寮�濮�',
- desc: ''
+ desc: '123'
}, {
title: '缁勯暱瀹℃牳',
desc: ''
@@ -107,7 +115,7 @@
}
},
onLoad(option) {
- if (option == '') {
+ if (option != '') {
this.id = option.id
this.init()
this.autoLoad('follower','')
@@ -137,10 +145,29 @@
header: {'token' : uni.getStorageSync('token')},
method: 'GET',
success(res) {
- console.log(res);
res = res.data
+ console.log(res);
that.detl = res.data
that.active = res.data.settle
+ that.list1 = JSON.parse(res.data.settleMsg)
+ for (let key of that.list1) {
+ key.desc = key.username
+ }
+ that.current = res.data.settle-1
+ switch(res.data.select_3) {
+ case 'value1':
+ res.data.select_3 = '鐗涜吙寮�'
+ break;
+ case 'value2':
+ res.data.select_3 = '妯寮�'
+ break;
+ case 'value3':
+ res.data.select_3 = '鏂拌兘婧�'
+ break;
+ case 'value4':
+ res.data.select_3 = '鍏朵粬'
+ break;
+ }
if (res.data.planType == 4) {
that.info.push(
{name:'璐х墿瑙勬牸',val:res.data.input_1},
@@ -191,9 +218,7 @@
header: {'token' : uni.getStorageSync('token'),
},
method: 'GET',
-
success(res) {
- console.log(res);
res = res.data
if (res.code === 200) {
uni.navigateBack()
--
Gitblit v1.9.1