前端

config/index.js

@@ -10,7 +10,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/dataReport/Inventoryentrydetails.vue

@@ -1,42 +1,47 @@
 <template>
 	<view>
 		<view class='search'>
-			<u-search  placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
+			<u-search  placeholder='可按货源查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
 		</view>
 		
-		<view style='background:#fff;'>
-			<view class='contracttypewrap'>
-				<view class='item left active'>销售</view>
-				<view class='item'>采购</view>
-				<view class='item'>收购</view>
-				<view class='item'>代收</view>
-				<view class='item right'>代储</view>
-			</view>
+		<view style='justify-content: space-between;background:#fff;padding:20rpx;' class='flex'>
+			<view @click='show=true'>{{startDate}}-{{endDate}}></view>
+			<view>全部仓库></view>
 		</view>
-		<view class='contractwrap' v-for='(item,index) in contractList'>
+		<u-calendar v-model="show" :mode="mode"></u-calendar>
+		<view class='contractwrap' v-for='(item,index) in warehouseList'>
 			<view class='flex contractwrap-title'>
 				<view class='contractNo'>{{item.contractNo}}</view>
+				<view class='contractNo'>{{item.date}}</view>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">买方</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">卖方</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">最终完成量（吨）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">利润（元）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">结算日期</view>
-				<view></view>
+			<view style='background:#EFFAF4;border-radius:10rpx;'>
+				<view style='color:#22C572;padding:20rpx;border-bottom:1rpx solid #D8E8E0;' class='flex'>
+					<view>111</view>
+					<view></view>
+					<view></view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">买方</view>
+					<view></view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">卖方</view>
+					<view></view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">最终完成量（吨）</view>
+					<view></view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">利润（元）</view>
+					<view></view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">结算日期</view>
+					<view></view>
+				</view>	
 			</view>
+			
 		</view>
 	</view>
 </template>
@@ -45,7 +50,11 @@
 	export default {
 		data() {
 			return {
-				contractList:[
+				startDate:'',
+				endDate:'',
+				mode:'range',
+				show:false,
+				warehouseList:[
 					{status:'已完成',
 					contractNo:'HT39854455',
 					costtype:'水费',
@@ -56,47 +65,30 @@
 				]
 			}
 		},
-		methods: {
+		onLoad() {
 			
+		},
+		onShow() {
+			var date=new Date()
+			this.startDate=date.getFullYear()+'-'+((date.getMonth()+1)<10?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+(date.getDate()-1)
+			this.endDate=date.getFullYear()+'-'+((date.getMonth()+1)<10?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+date.getDate()
+		},
+		methods: {
 		}
 	}
 </script>
 
 <style  lang='scss' scoped>
-.contracttypewrap{
-	display:flex;
-	background:#fff;
-	font-size:32rpx;
-	margin: 0 auto;
-	width:93%;
-	.item{
-		padding:20rpx;
-		color:#7A7A7A;
-		width:33.3333%;
-		text-align:center;
-	}
-	.item.left{
-		text-align:left;
-	}
-	.item.right{
-		text-align:right;
-	}
-	.item.active{
-		color:#262626;
-		font-weight:600;
-	}
-}
 
 .contractwrap{
 	background:#fff;
 	margin:20rpx;
-	padding:20rpx;
+	padding:20rpx 20rpx 40rpx 20rpx;
 	border-radius:20rpx;
 	.contractwrap-title{
 		font-size:28rpx;
 		padding:20rpx;
 		justify-content: space-between;
-		border-bottom:2rpx solid #eee;
 		align-items: center;
 		
 	}

pages/oa_office/the_oaOffice.vue

@@ -92,15 +92,15 @@
 						url: `/pages/reimbursement/the_reimbursement`,
 						show: true
 					},
-					// {
-					// 	num: 5,
-					// 	name: '申请审批',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/oa_office/shneqingshenpi.png',
-					// 	tips: 0,
-					// 	url: `/pages/universalityAudit/list`,
-					// 	show: true
-					// }
+					{
+						num: 5,
+						name: '申请审批',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/oa_office/shneqingshenpi.png',
+						tips: 0,
+						url: `/pages/universalityAudit/list`,
+						show: true
+					}
 				],
 
 			}

pages/task/audit/freight_settlement_approval.vue

@@ -39,7 +39,10 @@
 					<view>收货地址</view>
 					<view class="top_info">{{list[0].receive ? list[0].receive : "暂无收货地址"}}</view>
 				</view>
-
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>合计</view>
+					<view class="top_info">{{num}}</view>
+				</view>
 			</view>
 			<view class="car-container">
 				<view v-for="item in list" class="car-container-item">
@@ -200,6 +203,7 @@
 					approveStatus: "",
 				},
 				title: '',
+				num:0,
 				show: false,
 				height: 200,
 				auditList:[],
@@ -233,6 +237,15 @@
 					batchId: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
+						if(res.data.data.length>0){
+							this.num=0
+							for (var i = 0; i < res.data.data.length; i++) {
+								if(res.data.data[i].totalPayable){
+									this.num+=res.data.data[i].totalPayable	
+								}
+							}
+						}
+						this.num=this.num.toFixed(2)
 						this.list = res.data.data
 						// console.log(this.list, 124)
 						// 查流程

pages/task/audit/freight_settlement_details.vue

@@ -25,14 +25,18 @@
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>
-				<view class="top1">
+				<view style='display:flex;align-items: center;' class="top1">
 					<view>发货地址</view>
 					<view class="top_info">{{list[0].send ? list[0].send : "暂无发货地址"}}</view>
 				</view>
-				<view class="top1">
+				<view style='display:flex;align-items: center;' class="top1">
 					<view>收货地址</view>
 					<view class="top_info">{{list[0].receive ? list[0].receive : "暂无收货地址"}}</view>
 				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>合计</view>
+					<view class="top_info">{{num}}</view>
+				</view>
 			</view>
 			<view class="car-container">
 				<view v-for="item in list" class="car-container-item">
@@ -166,6 +170,7 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
+				num:0,
 				list: {
 					approveStatus: "",
 				},
@@ -185,6 +190,15 @@
 					batchId: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
+						if(res.data.data.length>0){
+							this.num=0
+							for (var i = 0; i < res.data.data.length; i++) {
+								if(res.data.data[i].totalPayable){
+									this.num+=res.data.data[i].totalPayable	
+								}
+							}
+						}
+						this.num=this.num.toFixed(2)
 						this.list = res.data.data
 						// console.log(this.list, 124)
 						// 查流程
@@ -479,25 +493,25 @@
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-
+	
 		.topInfo-item {
-			height: 158rpx;
+			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-
+	
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-
+	
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-
+	
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
@@ -656,4 +670,9 @@
 			margin-top: 20rpx;
 		}
 	}
+	.top_info {
+		margin: 10rpx 0;
+		width:70%;
+		text-align:right;
+	}
 </style>