api/financialCenter/settlementDoc.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export default {
+	getByOmsSettlementPage(data) {
+		return request({
+			url: '/oil-finance/oilSettlementInfo/getByOmsSettlementPage',
+			method: 'post',
+			data: data
+		})
+	},
+}

financialCenter/enterprise/recharge/index.vue

@@ -19,7 +19,7 @@
 					</input> -->
 					<view @click="inputFocus" class="special-input" >
 						{{ parameter.params.name || '企业名称'}}
-						<image v-if="parameter.params.name" class="close" src="../../../static/close.png" @click="inputClear"></image>
+						<image v-if="parameter.params.name" class="close" src="../../../static/close.png" @click.stop="inputClear"></image>
 					</view>
 
 
@@ -39,7 +39,7 @@
 		</view>
 		<view style="flex: 1;overflow: hidden;">
 			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="scrolltolower">
-				<view v-for="(item,index) in listData">
+				<view v-for="(item,index) in listData" :key="index">
 					<view class="item">
 						<view class="type">{{typeEnum[item.transactionType]}}</view>
 						<view class="top-region">
@@ -92,11 +92,9 @@
 						companyId: '',
 						createTimeStart: '',
 						createTimeEnd: '',
-						businessLeader: '',
+						businessLeader: ''
 					},
-					sorted: {
+					sorted: {}
-
-					}
 				},
 				styles: {},
 				listData: [],
@@ -134,12 +132,11 @@
 
 			uni.$on('currentEnterprise', (item) => {
 				if (!item.id) return
+				this.parameter.currentPage = 1
 				this.parameter.params.companyId = item.id
 				this.parameter.params.name = item.name
-
 			})
-		},
+			
-		onShow() {
 			this.search();
 		},
 
@@ -166,6 +163,23 @@
 				this.parameter.params.businessLeader = this.userInfo.id
 				serve.getByPageRecharge(this.parameter).then(res => {
 					if (res.code !== 20000) return
+					if (this.parameter.currentPage == 1) {
+						if(!res.data.list.length) {
+							uni.showToast({
+								title: '暂无数据~',
+								icon:'none'
+							})
+						}
+						this.listData = res.data.list
+						return
+					}
+					if (!res.data.list.length) {
+						uni.showToast({
+							title: '没有更多数据了~',
+							icon:'none'
+						})
+						return
+					}
 					this.listData = this.listData.concat(res.data.list);
 				})
 			},

financialCenter/settlementDoc/manage/index.vue

@@ -0,0 +1,287 @@
+<template>
+	<view style="height: 100vh;display: flex;flex-direction: column; ">
+		<view class="header">
+			<view :style="{height:styles.top+'px'}" class="top"></view>
+			<uni-nav-bar @clickLeft='back' color='white' backgroundColor="rgba(0,0,0,0)" left-icon="back"
+				title="结算单管理" />
+
+			<view class="header_seach">
+				<view class="header_seach_seach">
+					<uni-easyinput style="height: 100%; flex: 1; background-color: #FFFFFF; border-radius:12rpx ;"
+						placeholder-style="color:#bbbbbb;font-weight: 100;"
+						v-model="parameter.params.settlementObjectName" placeholder="企业账户名称">
+					</uni-easyinput>
+
+					<button @tap='search' class="header_seach_butten">
+						<uni-icons type="search" size="20" color="#bbbbbb"></uni-icons>
+						<view>搜索</view>
+					</button>
+				</view>
+			</view>
+		</view>
+		<view style="flex: 1;overflow: hidden;">
+			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="scrolltolower">
+				<view v-for="(item,index) in listData" :key="index">
+					<view class="item">
+						<view class="no"><text>结算单号:</text><text>{{item.settlementNo}}</text></view>
+						<image src="../../../static/selegs.png"
+							style="width: 100rpx; height: 100rpx;border-radius: 50%;"></image>
+						<view class="body">
+							<view class="name">{{item.settlementObjectName}}</view>
+							<view class="price">
+								<text>开票金额:</text><text>{{item.invoicedAmount}}</text>
+								<text>结算金额:</text><text>{{item.settlementAmount}}</text>
+							</view>
+							<view class="create">
+								<text>创建人信息:</text><text>{{item.createUserName}}</text> -
+								<text>{{item.createUserPhone}}</text>
+							</view>
+
+						</view>
+						<view class="bottom-region">
+							<text>{{item.createTime}}</text>
+							<text
+								:style="{color: item.settlementState == 2 ? '#13ce66' : '#ffba00'}">{{item.settlementState == 2 ?'已开票' : '待开票'}}</text>
+						</view>
+
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/financialCenter/settlementDoc.js'
+	export default {
+
+		data() {
+			return {
+				controlWindows: {
+					datePopup: false
+				},
+				parameter: {
+					pageSize: 15,
+					currentPage: 1,
+					params: {
+						settlementObjectName: '',
+						businessLeader: '',
+					},
+					sorted: {
+
+					}
+				},
+				styles: {},
+				listData: [],
+				userInfo: uni.getStorageSync('user'),
+
+			}
+		},
+
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			this.search();
+		},
+
+		methods: {
+			back() {
+				uni.navigateBack()
+			},
+
+			search() {
+				this.parameter.currentPage = 1
+				this.getByOmsSettlementPage()
+			},
+
+			getByOmsSettlementPage() {
+				this.parameter.params.businessLeader = this.userInfo.id
+				serve.getByOmsSettlementPage(this.parameter).then(res => {
+					if (res.code !== 20000) return
+					if (this.parameter.currentPage == 1) {
+						if(!res.data.list.length) {
+							uni.showToast({
+								title: '暂无数据~',
+								icon:'none'
+							})
+						}
+						this.listData = res.data.list
+						return
+					}
+					if (!res.data.list.length) {
+						uni.showToast({
+							title: '没有更多数据了~',
+							icon:'none'
+						})
+						return
+					}
+					this.listData = this.listData.concat(res.data.list);
+				})
+			},
+
+			scrolltolower() {
+				this.parameter.currentPage += 1
+				this.getByOmsSettlementPage()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F0F2FF;
+	}
+
+	.item {
+		min-height: 200rpx;
+		position: relative;
+		overflow: hidden;
+		margin: 40rpx auto 0;
+		padding: 20rpx 20rpx 15rpx 20rpx;
+		width: 700rpx;
+		font-size: 28rpx;
+		background: #fff;
+		border-radius: 12rpx;
+		box-shadow: 0px 3px 9px 0px rgba(88, 88, 88, 0.2);
+
+		.no {
+			position: relative;
+			height: 50rpx;
+			padding: 0 10rpx;
+
+			text {
+				font-size: 25rpx;
+
+				&:nth-of-type(1) {}
+
+				&:nth-of-type(2) {
+					float: right;
+				}
+			}
+
+			&::after {
+				content: '';
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				width: 100%;
+				height: 1rpx;
+				background: #999;
+			}
+		}
+
+		image {
+			position: absolute;
+			left: 36rpx;
+			top: 52%;
+			transform: translateY(-50%);
+			width: 100rpx;
+			height: 100rpx;
+			// border: 1px solid #333;
+		}
+
+		.body {
+			padding-left: 150rpx;
+
+			.name {
+				margin-top: 20rpx;
+			}
+
+			.price {
+				margin-top: 5rpx;
+
+				text {
+					font-size: 22rpx;
+
+					&:nth-of-type(2),
+					&:nth-of-type(4) {
+						margin-left: 20rpx;
+					}
+
+					&:nth-of-type(3) {
+						margin-left: 50rpx;
+					}
+				}
+			}
+
+			.create {
+				margin-top: 5rpx;
+
+				text {
+					font-size: 22rpx;
+
+					&:nth-of-type(2) {
+						margin-left: 20rpx;
+					}
+				}
+			}
+
+		}
+
+		.bottom-region {
+			margin-top: 30rpx;
+			font-size: 22rpx;
+
+			text {
+				&:nth-of-type(1) {
+					color: #bbb;
+				}
+
+				&:nth-of-type(2) {
+					float: right;
+					font-size: 25rpx;
+				}
+			}
+		}
+	}
+
+	.header_seach_butten {
+		font-size: 24rpx !important;
+		display: flex !important;
+		align-items: center !important;
+		margin: 0 !important;
+		flex-shrink: 1;
+		margin-left: 9rpx !important;
+		background: #FFFFFF !important;
+		justify-content: center;
+	}
+
+	.uni-easyinput__content {
+		height: 80rpx;
+	}
+
+	.uni-easyinput {
+		height: 80rpx;
+	}
+
+	.header_seach_seach {
+		display: flex;
+		height: 80rpx;
+		margin-top: 23rpx;
+	}
+
+	.header_seach {
+		font-size: 26rpx;
+		padding: 0 10px;
+	}
+
+	.uni-navbar--border {
+		border: 0px !important;
+	}
+
+	.header {
+		position: relative;
+		color: white;
+		min-height: 403rpx;
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') 100%/100%;
+	}
+
+	.uni-navbar__header-btns-right {
+		padding-right: 0 !important;
+		width: 120rpx !important;
+	}
+
+	.top {
+		height: var(--status-bar-height);
+	}
+</style>

pages.json

@@ -416,6 +416,14 @@
 						"enablePullDownRefresh": false
 					}
 
+				}, {
+					"path": "settlementDoc/manage/index",
+					"style": {
+						"navigationBarTitleText": "结算单管理",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false
+					}
+
 				}, {
 					"path": "enterprise/recharge/selEnterprise",
 					"style": {

pages/index/menu.json

@@ -150,6 +150,13 @@
 				"router":"/financialCenter/enterprise/recharge/index",
 				"lable":"finance:enterprise:recharge",
 				"image":"../../static/newindex/customerList.png"
+			},
+			{
+				"icon":"iconxiugaijiage",
+				"name":"结算单管理",
+				"router":"/financialCenter/settlementDoc/manage/index",
+				"lable":"finance:settlementDoc:manage",
+				"image":"../../static/newindex/customerList.png"
 			}
 		]
 	},

utils/request.js

@@ -1,12 +1,12 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
-// const env = 'test'
+const env = 'test'
-const env = 'production'
+// const env = 'production'
 const testUrl = 'http://192.168.1.83:38080'
-// const productUrl = 'https://www.xingoil.com/adminapi'
+const productUrl = 'https://www.xingoil.com/adminapi'
 // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
 
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,