1

pages.json

@@ -1475,7 +1475,7 @@
 		}, {
 			"path": "pages/reimbursement/request_funds",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "收款",
 				"enablePullDownRefresh": false
 			}
 

pages/clock/supp_clock.vue

@@ -166,7 +166,7 @@
 											url: '/pages/clock/the_clock?value=1'
 										})
 									} else {
-										that.$api.msg('提交失败')
+										// that.$api.msg('提交失败')
 									}
 								})
 						}

pages/clock/the_clock.vue

@@ -247,6 +247,7 @@
 							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 							that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
 							that.detailData.dept = uni.getStorageSync('pcUserInfo').deptName
+							that.detailData.deptId = uni.getStorageSync('pcUserInfo').deptId
 							that.detailData.phone = uni.getStorageSync('pcUserInfo').userMobilePhone
 							that.detailData.empName = uni.getStorageSync('userInfo').userName
 							that.detailData.clockType = that.typevalue
@@ -262,6 +263,8 @@
 									if (res.data.code == 200) {
 										that.$api.msg('提交成功')
 										that.value = 1
+
+										that.getList()
 									} else {
 										that.$api.msg('提交失败')
 									}
@@ -449,7 +452,8 @@
 		border-radius: 50rpx;
 	}
 
-	.offClockDate {
+	.offClockDate,
+	.toClockDate {
 		display: flex;
 		justify-content: center;
 	}

pages/fuelfilling/the_fuel_filling.vue

@@ -140,7 +140,6 @@
 					compId: uni.getStorageSync('pcUserInfo').compId,
 					commonId: uni.getStorageSync('pcUserInfo').userId,
 				}).then(res => {
-					debugger
 					if (res.data.code == 200) {
 						if (type == 'down') {
 							this.mescroll.endSuccess();

pages/reimbursement/request_funds.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="content">
 		<view class='wrap'>
 			<view class="xinxi" v-if="reType == 2 || expensesType == '2'" style="font-size: 28rpx; ">请款信息</view>
 			<view class="xinxi" v-if="reType == 1 || expensesType == '1'" style="font-size: 28rpx; ">收款信息</view>
@@ -77,7 +77,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="submit()">提交</u-button>
+			<view @click="submit()" class="btn">提交</view>
 		</view>
 	</view>
 </template>
@@ -264,7 +264,6 @@
 				} else {
 					theInterface = '/expenseInfo/api/addInfo'
 				}
-				debugger
 				uni.showModal({
 					content: title,
 					showCancel: true,
@@ -452,4 +451,20 @@
 		display: flex;
 		z-index: 9999;
 	}
+
+	.content {
+		overflow: hidden;
+	}
+
+	.btn {
+		border-radius: 50rpx;
+		padding: 20rpx 0;
+		background: #22C572;
+		color: #fff;
+		font-size: 32rpx;
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: center;
+	}
 </style>

pages/reimbursement/the_reimbursement.vue

@@ -4,13 +4,10 @@
 			<view class='wrap' v-for="(item, index) in tableData" :key="index">
 				<view class="" style="display: flex;">
 					<view class="c-row top_type_left">
-						<!-- {{index}} -------- -->
-						<view class="title">{{item.purpose}}--
-							<view @click="requestFunds(1)" style="margin-left: 65px;margin-top: -19px;"
-								v-if="item.expensesType == '1'">收款</view>
-							<view @click="requestFunds(2)" style="margin-left: 65px;margin-top: -19px;"
-								v-else-if="item.expensesType == '2'">请款
-							</view>
+						<view class="title">{{item.purpose}}—{{item.expensesType=='1'?'收款':'请款'}}
+							<!-- <view @click="requestFunds(1)" v-if="item.expensesType == '1'">收款</view>
+							<view @click="requestFunds(2)" v-else-if="item.expensesType == '2'">请款
+							</view> -->
 						</view>
 					</view>
 					<view class="top_type_right">
@@ -53,8 +50,8 @@
 
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="requestFunds(1)">收款</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="requestFunds(2)">请款</u-button>
+			<view class="btn" @click="requestFunds(1)">收款</view>
+			<view class="btn" @click="requestFunds(2)">请款</view>
 		</view>
 	</view>
 </template>
@@ -94,12 +91,17 @@
 		},
 		methods: {
 			getList() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
 				this.$api.doRequest('get', '/expenseInfo/selectInfo', {
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					compId: uni.getStorageSync('pcUserInfo').compId,
 				}).then(res => {
 					if (res.data.code == 200) {
+						uni.hideLoading()
 						if (res.data.data.records.length > 0) {
 							this.isLoadMore = false
 							this.loadStatus = 'loading'
@@ -214,13 +216,17 @@
 
 	.wenzi1 {
 		margin-right: 40rpx;
-		margin-top: 10rpx;
-		height: 50rpx;
-		width: 100rpx;
-		border-radius: 30rpx;
+		/* margin-top: 10rpx; */
+		/* height: 50rpx;
+		width: 100rpx; */
+		border-radius: 50rpx;
 		background-color: #ffffff;
-		text-align: center;
+		/* text-align: center; */
 		border: 2rpx solid #AFB3BF;
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		padding: 10rpx 20rpx;
 	}
 
 	.audit {
@@ -268,4 +274,18 @@
 	.top_type_left {
 		width: 50%;
 	}
+
+	.bottom-btn {
+		display: flex;
+		justify-content: space-between;
+
+		.btn {
+			border-radius: 50rpx;
+			padding: 20rpx 120rpx;
+			background: #22C572;
+			color: #fff;
+			font-size: 32rpx;
+			box-sizing: border-box;
+		}
+	}
 </style>