From 8209a821647be20fa4d6b14723f3939238258c6e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 15:39:25 +0800
Subject: [PATCH] #
---
pages/business/goBusiness/reimburseOnline.vue | 4
pages/business/goBusiness/reimburseOnlineDetl.vue | 36 +++++++++++
pages/business/goBusiness/modiReimburseOnlineDetl.vue | 58 +++++++++++++++++-
pages/business/goBusiness/goBusinessDetil.vue | 53 ++++++++++++++++-
4 files changed, 137 insertions(+), 14 deletions(-)
diff --git a/pages/business/goBusiness/goBusinessDetil.vue b/pages/business/goBusiness/goBusinessDetil.vue
index 4461a76..25a7970 100644
--- a/pages/business/goBusiness/goBusinessDetil.vue
+++ b/pages/business/goBusiness/goBusinessDetil.vue
@@ -17,8 +17,8 @@
<view class="floor">
<view class="wran">鍒犻櫎</view>
- <view class="default">淇敼</view>
- <view class="primary" @click="submit()">鐢宠鎶ラ攢</view>
+ <view class="default" v-show="settle == 1">淇敼</view>
+ <view class="primary" @click="submit()">{{subTitle}}</view>
</view>
</view>
</template>
@@ -27,6 +27,8 @@
export default {
data() {
return {
+ settle: 1,
+ subTitle: '鐢宠鎶ラ攢',
list: [{
businessTripReasons: '娌熼�氱珛搴撲簨瀹�',
businessTransportation$: '浜ら�氬伐鍏�',
@@ -70,16 +72,16 @@
},
{
label: "缁撴潫鏃ユ湡",
- attribute: "businessStartTimeDay$",
+ attribute: "businessEndTimeDay$",
},
{
label: "鍑哄樊鏃堕暱",
- attribute: "businessStartTimeDay$",
+ attribute: "businessDuration$",
},
{
label: "鍑哄樊澶╂暟",
- attribute: "businessEndTimeDay$",
+ attribute: "businessTripDays$",
},
{
label: "鍚岃浜�",
@@ -114,10 +116,51 @@
const eventChannel = this.getOpenerEventChannel();
eventChannel.on('busunessDetl', function(data) {
_this.list.push(data.data)
+ _this.settle = data.data.settle
+ if (data.data.settle == 1) {
+ _this.subTitle = '瀹℃壒'
+ }
console.log(data)
})
},
methods: {
+ submit() {
+ if (this.settle == 1) {
+ this.approval()
+ } else {
+
+ }
+ },
+ // 瀹℃壒
+ approval() {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/businessTrip/approval/auth`,
+ header: {
+ 'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded;charset=UTF-8'
+ },
+ method: 'POST',
+ sslVerify: false,
+ data: {planId: _this.list[0].id},
+ success(res) {
+ res = res.data
+ // console.log(res);
+ if (res.code === 200) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(()=>{
+ uni.navigateBack({})
+ },1000)
+ } else if (res.code === 500) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ }
+ }
+ })
+ },
+ // 鐢宠鎶ラ攢
+ reimburse() {
+
+ },
back() {
uni.navigateBack({})
},
diff --git a/pages/business/goBusiness/modiReimburseOnlineDetl.vue b/pages/business/goBusiness/modiReimburseOnlineDetl.vue
index b1ac311..f11e30a 100644
--- a/pages/business/goBusiness/modiReimburseOnlineDetl.vue
+++ b/pages/business/goBusiness/modiReimburseOnlineDetl.vue
@@ -87,8 +87,8 @@
</view>
- <u-picker :show="reimburseId" :columns="reimburseIds" @confirm="reimburseIdConfirm"></u-picker>
- <u-picker :show="checkData" :columns="checkDatas" @confirm="checkDataConfirm"></u-picker>
+ <u-picker :show="reimburseId" :columns="reimburseIds" @confirm="reimburseIdConfirm" @cancel="cancel"></u-picker>
+ <u-picker :show="checkData" :columns="checkDatas" @confirm="checkDataConfirm" @cancel="cancel"></u-picker>
<view>
<!-- 鏅�氬脊绐� -->
@@ -204,18 +204,34 @@
updateTime: '',
updateUserName: ''
},
+ type: 'modi'
}
},
onLoad(option) {
let _this = this
+ this.getOrderId('')
_this.list = []
const eventChannel = this.getOpenerEventChannel();
eventChannel.on('reimburseOnlineDetl', function(data) {
if (data.data == 'add') {
_this.title = '娣诲姞鎶ラ攢瀹℃壒'
+ _this.type = 'add'
+ }
+ if (data.data == 'modi') {
+ // _this.title = '娣诲姞鎶ラ攢瀹℃壒'
+ _this.form[1].value = data.detl.list.templateName
+ for (let k in _this.reimburseIds[0]) {
+ if (_this.reimburseIds[0][k] == data.detl.list.templateName) {
+ _this.form[1].submitVal = k
+ }
+ }
+ _this.form[2].value = data.detl.list.checkData
+ _this.form[0].value = data.detl.list.name$
+ _this.getOrderId(data.detl.list.name$)
+ _this.tableData = data.detl.list.detl
}
})
- this.getOrderId('')
+
},
methods: {
addDetl(type) {
@@ -252,6 +268,7 @@
}
},
getOrderId(condition) {
+ console.log(condition);
let _this = this
uni.request({
url: `${_this.baseUrl}/orderQueryName/auth`,
@@ -325,7 +342,12 @@
uni.showToast({title: '璇锋坊鍔犳姤閿�鏄庣粏', icon: "none", position: 'top'})
return
}
- this.formAdd(param)
+ if (this.type == 'add') {
+ this.formAdd(param)
+ } else {
+ this.formModi(param)
+ }
+
},
formAdd(param) {
let _this = this
@@ -336,10 +358,36 @@
method: 'POST',
success(res) {
res = res.data
- console.log(res);
+ if (res.code === 200) {
+ uni.navigateBack({})
+ } else if(res.code === 500) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ }
}
})
},
+ formModi(param) {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/reimburseOnline/from/modify/auth`,
+ header: { 'token': uni.getStorageSync('token') },
+ data: JSON.stringify(param),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ uni.navigateBack({})
+ } else if(res.code === 500) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ }
+
+ }
+ })
+ },
+ cancel() {
+ this.reimburseId = false
+ this.checkData = false
+ },
back() {
uni.navigateBack({})
},
diff --git a/pages/business/goBusiness/reimburseOnline.vue b/pages/business/goBusiness/reimburseOnline.vue
index 3cdd63d..ad9153e 100644
--- a/pages/business/goBusiness/reimburseOnline.vue
+++ b/pages/business/goBusiness/reimburseOnline.vue
@@ -51,7 +51,7 @@
})
},
goDetl(e) {
- console.log(e);
+ // console.log(e);
uni.navigateTo({
url: '/pages/business/goBusiness/reimburseOnlineDetl',
success: function(res) {
@@ -77,7 +77,7 @@
}
}
_this.list = res.data.records
- console.log(_this.list);
+ // console.log(_this.list);
}
// _this.list =
}
diff --git a/pages/business/goBusiness/reimburseOnlineDetl.vue b/pages/business/goBusiness/reimburseOnlineDetl.vue
index 0ce88d8..8ad19e3 100644
--- a/pages/business/goBusiness/reimburseOnlineDetl.vue
+++ b/pages/business/goBusiness/reimburseOnlineDetl.vue
@@ -141,7 +141,7 @@
</view>
</view>
- <view style="height: 70rpx;">
+ <view style="height: 100rpx;">
</view>
@@ -247,6 +247,30 @@
},
methods: {
+ // 瀹℃壒
+ submit() {
+ let _this = this,param = {planld: 13}
+
+ uni.request({
+ url: `${_this.baseUrl}/reimburseOnline/approval2/auth`,
+ header: {
+ 'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded;charset=UTF-8'
+ },
+ method: 'POST',
+ sslVerify: false,
+ data: { planId: 13 },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+
+ } else if (res.code === 500) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ }
+ }
+ })
+
+ },
getSetps(id) {
let _this = this
uni.request({
@@ -276,8 +300,16 @@
})
},
modiReimburse() {
+ let _this = this
+ _this.list[0]['detl'] = _this.onlineDetl
uni.navigateTo({
- url: '/pages/business/goBusiness/modiReimburseOnlineDetl'
+ url: '/pages/business/goBusiness/modiReimburseOnlineDetl',
+ success: function(res) {
+ res.eventChannel.emit('reimburseOnlineDetl', {
+ data: 'modi',
+ detl: {list: _this.list[0]}
+ })
+ }
})
},
back() {
--
Gitblit v1.9.1