From d825072ede353dfdbad13c0694d14a24aaaab9ed Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 15 十一月 2023 16:41:54 +0800
Subject: [PATCH] #

---
 pages/business/goBusiness/reimburseOnline.vue         |   10 --
 pages/business/goBusiness/reimburseOnlineDetl.vue     |   39 +++++++++++--
 pages/business/goBusiness/modiReimburseOnlineDetl.vue |  103 +++++++++++++++------------------
 3 files changed, 82 insertions(+), 70 deletions(-)

diff --git a/pages/business/goBusiness/modiReimburseOnlineDetl.vue b/pages/business/goBusiness/modiReimburseOnlineDetl.vue
index d26d288..546379b 100644
--- a/pages/business/goBusiness/modiReimburseOnlineDetl.vue
+++ b/pages/business/goBusiness/modiReimburseOnlineDetl.vue
@@ -53,8 +53,12 @@
 								<tr v-for="(item,index) in tableData">
 									<td class="scroll-item" v-for="(subitem,i) in table">
 										<view class="item-content" v-if="subitem.type != 'options'">
-											<input type="text" v-model="item[subitem.type]">
+											<input type="text" v-model="item[subitem.type]"> 
 										</view>
+										
+										<!-- <view class="item-content" v-if="subitem.type != 'options' && !subitem.isInput">
+											<text>{{item[subitem.type]}}</text> <text v-if="subitem.type == 'taxRate' || subitem.type == 'reimbursementRatio' ">%</text>
+										</view> -->
 										
 										<view v-if="subitem.type == 'options'" style="color: red;" @click="delItem(index)">鍒犻櫎</view>
 									</td>
@@ -120,24 +124,29 @@
 				title: '淇敼鎶ラ攢瀹℃壒',
 				radiolist2: [{
 						name: '椁愯垂',
+						id: 1,
 						disabled: false
 					},
 					{
 						name: '浣忓璐�',
+						id: 2,
 						disabled: false
 					},
 					{
 						name: '杞﹁垂',
+						id: 3,
 						disabled: false
 					}, {
 						name: '娌硅垂',
+						id: 4,
 						disabled: false
 					}, {
 						name: '鍏朵粬',
+						id: 5,
 						disabled: false
 					}
 				],
-				radiovalue2: '椁愯垂',
+				radiovalue2: '',
 				form: [
 					{name: '椤圭洰鍚�',placeholder: '璇烽�夋嫨',inputType: 'chose',type: 'orderId',value: '',submitVal: ''},
 					{name: '鎶ラ攢绫诲瀷',placeholder: '璇烽�夋嫨',required:true,inputType: 'select',type: 'reimburseId',value: '',submitVal: ''},
@@ -145,7 +154,7 @@
 					{name: '鎶ラ攢鏄庣粏',placeholder: '璇烽�夋嫨',inputType: 'table'}
 				],
 				table: [
-					{name:'浜嬬敱',type: 'occupation'},
+					{name:'浜嬬敱',type: 'occupation',isInput:true},
 					{name:'璐圭敤绫诲瀷',type: 'expenseType$'},
 					{name:'绋庣巼',type: 'taxRate'},
 					{name:'鏈◣鏈竵閲戦',type: 'untaxedAmountInLocalCurrency'},
@@ -164,42 +173,6 @@
 					{name:'鎿嶄綔',type: 'options'}
 				],
 				tableData: [
-					{
-						occupation: 'CRMREIMBURSE1699507854268',
-						expenseType$: '1',
-						taxRate: '0.0',
-						untaxedAmountInLocalCurrency: '1.1',
-						untaxedAmount: '1.3',
-						taxAmount: 'aaa',
-						invoiceValue: '213',
-						invoiceAmountInLocalCurrency: '123213',
-						reimbursementRatio: '0.0',
-						reimbursementAmount: 11,
-						reimbursementAmountInLocalCurrency:12,
-						cashierConfirmationAmount: 123,
-						userId$: '123',
-						deptId$: '璐㈠姟閮�',
-						updateTime: '2023-11-11',
-						updateUserName: 'name'
-					},
-					{
-						occupation: '璇烽�夋嫨',
-						expenseType$: '1',
-						taxRate: '0.0',
-						untaxedAmountInLocalCurrency: '1.1',
-						untaxedAmount: '1.3',
-						taxAmount: 'aaa',
-						invoiceValue: '213',
-						invoiceAmountInLocalCurrency: 'CRMREIMBURSE1699507854268',
-						reimbursementRatio: '0.0',
-						reimbursementAmount: 11,
-						reimbursementAmountInLocalCurrency:12,
-						cashierConfirmationAmount: 123,
-						userId$: '123',
-						deptId$: '璐㈠姟閮�',
-						updateTime: '2023-11-11',
-						updateUserName: 'name'
-					},
 				],
 				dataRule: [
 					{occupation: ''}
@@ -214,21 +187,22 @@
 				orderIdList: [],
 				newDetl: {
 						occupation: '',
-						expenseType$: '1',
-						taxRate: '0.0',
-						untaxedAmountInLocalCurrency: '1.1',
-						untaxedAmount: '1.3',
-						taxAmount: 'aaa',
-						invoiceValue: '213',
-						invoiceAmountInLocalCurrency: '123213',
-						reimbursementRatio: '0.0',
-						reimbursementAmount: 11,
-						reimbursementAmountInLocalCurrency:12,
-						cashierConfirmationAmount: 123,
-						userId$: '123',
-						deptId$: '璐㈠姟閮�',
-						updateTime: '2023-11-11',
-						updateUserName: 'name'
+						expenseType$: '',
+						expenseType: null,
+						taxRate: 0,
+						untaxedAmountInLocalCurrency: 0,
+						untaxedAmount: 0,
+						taxAmount: 0,
+						invoiceValue: 0,
+						invoiceAmountInLocalCurrency: 0,
+						reimbursementRatio: 0,
+						reimbursementAmount: 0,
+						reimbursementAmountInLocalCurrency:0,
+						cashierConfirmationAmount: 0,
+						userId$: '',
+						deptId$: '',
+						updateTime: '',
+						updateUserName: ''
 					},
 			}
 		},
@@ -254,9 +228,13 @@
 			popChange(n) {
 				// var detl=JSON.parse(JSON.stringify(this.newDetl));  // 鐗涢��
 				let detl  = {...this.newDetl} // 鐗涢��
-				console.log('groupChange', n);
 				console.log(this.radiovalue2);
 				detl.expenseType$ = this.radiovalue2
+				for (let k in this.radiolist2) {
+					if (this.radiolist2[k].name == this.radiovalue2) {
+						detl.expenseType = this.radiolist2[k].id
+					}
+				}
 				this.tableData.push(detl)
 				this.$refs.popup.close()
 			},
@@ -360,8 +338,21 @@
 				// console.log(this.orderIdList);
 				// console.log(this.orderIds);
 				console.log(param);
+				this.formAdd(param)
 			},
-			
+			formAdd(param) {
+				let _this = this
+				uni.request({
+					url: `${_this.baseUrl}/reimburseOnline/from/add/auth`,
+					header: { 'token': uni.getStorageSync('token') },
+					data: JSON.stringify(param),
+					method: 'POST',
+					success(res) {
+						res = res.data
+						console.log(res);
+					}
+				})
+			},
 			back() {
 				uni.navigateBack({})
 			},
diff --git a/pages/business/goBusiness/reimburseOnline.vue b/pages/business/goBusiness/reimburseOnline.vue
index 54b8497..3cdd63d 100644
--- a/pages/business/goBusiness/reimburseOnline.vue
+++ b/pages/business/goBusiness/reimburseOnline.vue
@@ -33,14 +33,7 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					user$: "寮犺姮",
-					status$: "鏈畬鎴�",
-					createTime$:"2023-11-09 13:30:54",
-					templateName: '椤圭洰鏈畬鎴�',
-					checkData: '鍚�',
-					settle$: '绛夊緟鑺傜偣3瀹℃牳'
-				}, ]
+				list: []
 			}
 		},
 		onShow() {
@@ -84,6 +77,7 @@
 								}
 							}
 							_this.list = res.data.records
+							console.log(_this.list);
 						}
 						// _this.list = 
 					}
diff --git a/pages/business/goBusiness/reimburseOnlineDetl.vue b/pages/business/goBusiness/reimburseOnlineDetl.vue
index 84d43b9..e8b8332 100644
--- a/pages/business/goBusiness/reimburseOnlineDetl.vue
+++ b/pages/business/goBusiness/reimburseOnlineDetl.vue
@@ -154,7 +154,7 @@
 		
 		<view style="height: 70rpx;">
 			
-		</view>w
+		</view>
 
 		<view class="floor">
 			<view class="wran">鍒犻櫎</view>
@@ -176,7 +176,7 @@
 					name$: '娴欐睙澶╂垚鑷帶鑲′唤鏈夐檺鍏徃',
 					status$: '鏈畬鎴�',
 					settle$: '绛夊緟鑺傜偣3瀹℃牳',
-					detl: '鎶ラ攢鏄庣粏',
+					// detl: '鎶ラ攢鏄庣粏',
 					updateUserId$: '寮犺姮',
 					updateTime$: '2023-11-09 13:31:42'
 				}, ],
@@ -209,10 +209,10 @@
 						label: "杩涘害",
 						attribute: "settle$",
 					},
-					{
-						label: "鎶ラ攢鏄庣粏",
-						attribute: "detl",
-					},
+					// {
+					// 	label: "鎶ラ攢鏄庣粏",
+					// 	attribute: "detl",
+					// },
 					{
 						label: "鏇存柊浜哄憳",
 						attribute: "updateUserId$",
@@ -244,7 +244,34 @@
 				]
 			}
 		},
+		onLoad(option) {
+			let _this = this
+			_this.list = []
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('busunessDetl', function(data) {
+				_this.list.push(data.data)
+				console.log(data)
+				_this.getTableData(data.data.id)
+			})
+			
+		},
 		methods: {
+			getTableData(id) {
+				let _this = this
+				uni.request({
+					url: `${_this.baseUrl}/reimburseOnlineDetl/list/auth`,
+					header: { 'token': uni.getStorageSync('token') },
+					data: {order_id: id},
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							_this.onlineDetl = res.data.records
+							
+						}
+						console.log(res);
+					}
+				})
+			},
 			modiReimburse() {
 				uni.navigateTo({
 					url: '/pages/business/goBusiness/modiReimburseOnlineDetl'

--
Gitblit v1.9.1