前端

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.json

@@ -1581,6 +1581,42 @@
             }
             
         }
+        ,{
+            "path" : "pages/dataReport/costbreakdown",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "费用明细",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/dataReport/contractdetails/contractdetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "合同",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/dataReport/breakdownofprofit",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "合同利润",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/dataReport/Inventoryentrydetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "入库明细",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subpackages": [{
 			"root": "pageA",

pages/dataReport/Inventoryentrydetails.vue

@@ -0,0 +1,122 @@
+<template>
+	<view>
+		<view class='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>
+		<view class='contractwrap' v-for='(item,index) in contractList'>
+			<view class='flex contractwrap-title'>
+				<view class='contractNo'>{{item.contractNo}}</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				contractList:[
+					{status:'已完成',
+					contractNo:'HT39854455',
+					costtype:'水费',
+					costmoney:'121111',
+					warehouse:'金信库',
+					name:'张三',
+					date:'2022.11.22 15:32:21'},
+				]
+			}
+		},
+		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;
+	border-radius:20rpx;
+	.contractwrap-title{
+		font-size:28rpx;
+		padding:20rpx;
+		justify-content: space-between;
+		border-bottom:2rpx solid #eee;
+		align-items: center;
+		
+	}
+	.contractwrap-item{
+		display:flex;
+		justify-content: space-between;
+		padding:10rpx 20rpx;
+		font-size:28rpx;
+		.title{
+			font-size:24rpx;
+			color:#8F8F8F;
+		}
+	}
+}
+.search{
+	width:100vw;
+	background:#fff;
+}
+.u-search{
+	width:94%;
+	margin:0 auto !important;
+}
+</style>

pages/dataReport/breakdownofprofit.vue

@@ -0,0 +1,122 @@
+<template>
+	<view>
+		<view class='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>
+		<view class='contractwrap' v-for='(item,index) in contractList'>
+			<view class='flex contractwrap-title'>
+				<view class='contractNo'>{{item.contractNo}}</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				contractList:[
+					{status:'已完成',
+					contractNo:'HT39854455',
+					costtype:'水费',
+					costmoney:'121111',
+					warehouse:'金信库',
+					name:'张三',
+					date:'2022.11.22 15:32:21'},
+				]
+			}
+		},
+		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;
+	border-radius:20rpx;
+	.contractwrap-title{
+		font-size:28rpx;
+		padding:20rpx;
+		justify-content: space-between;
+		border-bottom:2rpx solid #eee;
+		align-items: center;
+		
+	}
+	.contractwrap-item{
+		display:flex;
+		justify-content: space-between;
+		padding:10rpx 20rpx;
+		font-size:28rpx;
+		.title{
+			font-size:24rpx;
+			color:#8F8F8F;
+		}
+	}
+}
+.search{
+	width:100vw;
+	background:#fff;
+}
+.u-search{
+	width:94%;
+	margin:0 auto !important;
+}
+</style>

pages/dataReport/contractdetails/contractdetails.vue

@@ -0,0 +1,155 @@
+<template>
+	<view>
+		<view class='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>
+		<view class='costwrap'>
+			<view class='item active'>全部</view>
+			<view class='item'>粮款</view>
+			<view class='item'>非粮款</view>
+			<view class='item'>保证金</view>
+		</view>
+		<view class='contractwrap' v-for='(item,index) in contractList'>
+			<view class='flex contractwrap-title'>
+				<view class='contractNo'>{{item.contractNo}}</view>
+				<view v-if='item.status=="已完成"' style='color:#AFB3BF;' class='status'>{{item.status}}</view>
+				<view v-if='item.status=="执行中"' style='color:#22C572;' class='status'>{{item.status}}</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  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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				contractList:[
+					{status:'已完成',
+					contractNo:'HT39854455',
+					costtype:'水费',
+					costmoney:'121111',
+					warehouse:'金信库',
+					name:'张三',
+					date:'2022.11.22 15:32:21'},
+				]
+			}
+		},
+		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;
+	}
+}
+.costwrap{
+	display:flex;
+	margin:10rpx 34rpx;
+	.item{
+		padding:10rpx 20rpx;
+		color:#333333;
+		text-align:center;
+		border-radius:30rpx;
+	}
+	.item.active{
+		color:#fff;
+		background:#22C572;
+	}
+}
+.contractwrap{
+	background:#fff;
+	margin:20rpx;
+	padding:20rpx;
+	border-radius:20rpx;
+	.contractwrap-title{
+		font-size:28rpx;
+		padding:20rpx;
+		justify-content: space-between;
+		border-bottom:2rpx solid #eee;
+		align-items: center;
+		
+	}
+	.contractwrap-item{
+		display:flex;
+		justify-content: space-between;
+		padding:10rpx 20rpx;
+		font-size:28rpx;
+		.title{
+			font-size:24rpx;
+			color:#8F8F8F;
+		}
+	}
+}
+.search{
+	width:100vw;
+	background:#fff;
+}
+.u-search{
+	width:94%;
+	margin:0 auto !important;
+}
+</style>

pages/dataReport/costbreakdown.vue

@@ -0,0 +1,147 @@
+<template>
+	<view>
+		<view style='background:#fff;'>
+			<view class='purposewrap'>
+				<view class='item left active'>合同费用</view>
+				<view class='item'>库点费用</view>
+				<view class='item right'>经营性费用</view>
+			</view>
+		</view>
+		<view class='costwrap'>
+			<view class='item active'>全部</view>
+			<view class='item'>粮款</view>
+			<view class='item'>非粮款</view>
+			<view class='item'>保证金</view>
+		</view>
+		<view class='costwrap'>
+			<view class='item'>全部</view>
+			<view class='item'>煤费</view>
+			<view class='item'>电费</view>
+			<view class='item'>人工费</view>
+			<view class='item'>杂费</view>
+			<view class='item'>收款</view>
+		</view>
+		<view class='costlistwrap'>
+			<view v-for='(item,index) in costList' :style='index!=costList.length-1?"border-bottom:2rpx solid #eee":""' class='item'>
+				<view class='flex align-item-center'>
+					<view v-if='item.status==1' class="status pay">付</view>
+					<view v-if='item.status==2' class="status income">收</view>
+					<view style='width:92%;justify-content: space-between;' class="flex align-item-center">
+						<view class="costtype">{{item.costtype}}</view>
+						<view class="costmoney"><text>￥</text>{{item.costmoney}}</view>
+					</view>
+					
+				</view>
+				<view style='justify-content: space-between;font-size:28rpx;margin:10rpx 0;' class='flex align-item-center'>
+					<view>{{item.warehouse}}</view>
+				<!-- 	<view>{{item.contract}}</view>
+					<view>{{item.date}}</view> -->
+					<view>{{item.name}}</view>
+				</view>
+				<view style='font-size:24rpx;margin:20rpx 0;' class='flex align-item-center'>
+					<view class="">
+						{{item.date}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				costList:[
+					{status:1,
+					costtype:'水费',
+					costmoney:'121111',
+					warehouse:'金信库',
+					name:'张三',
+					date:'2022.11.22 15:32:21'},{status:2,
+					costtype:'水费',
+					costmoney:'121111',
+					warehouse:'金信库',
+					name:'张三',
+					date:'2022.11.22 15:32:21'}],
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+.purposewrap{
+	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;
+	}
+}
+.costwrap{
+	display:flex;
+	margin:10rpx 34rpx;
+	.item{
+		padding:10rpx 20rpx;
+		color:#333333;
+		text-align:center;
+		border-radius:30rpx;
+	}
+	.item.active{
+		color:#fff;
+		background:#22C572;
+	}
+}
+.costlistwrap{
+	background:#fff;
+	margin:0 20rpx;
+	border-radius:20rpx;
+	padding:0 20rpx;
+	.item{
+		padding:30rpx 0;
+		.status{
+			font-size:24rpx;
+			margin-right:10rpx;
+			padding:4rpx 10rpx;
+			border-radius:10rpx;
+		}
+		.status.pay{
+			background:#E9F8F0;
+			color:#22C572;
+		}
+		.status.income{
+			background:#FEECE6;
+			color:#FE6430;
+		}
+		.costtype{
+			font-size:32rpx;
+			font-weight:600;
+		}
+		.costmoney{
+			font-size:36rpx;
+			font-weight:600;
+			text{
+				font-size:26rpx;
+			}
+		}
+	}
+}
+</style>

pages/erpbusiness/quality_testing.vue

@@ -20,7 +20,7 @@
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 			<view class='changewarehouse'>
-				<view @click='show=true'>{{warehouseName}}<text class='cuIcon-unfold'></text></view>
+				<view @click='show=true'>{{warehouseName?warehouseName:'选择仓库'}}<text class='cuIcon-unfold'></text></view>
 				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"
 					:range="selector"></u-picker>
 			</view>

pages/task/audit/freight_settlement_approval.vue

@@ -29,13 +29,13 @@
 					<view>{{list[0].customer}}</view>
 				</view>
 
-				<view class="top1">
+				<view class="top1 flex">
 					<view>发货地址</view>
 					<view class="top_info">{{list[0].send ? list[0].send : "暂无发货地址"}}</view>
 				</view>
 
 
-				<view class="top1">
+				<view class="top1 flex">
 					<view>收货地址</view>
 					<view class="top_info">{{list[0].receive ? list[0].receive : "暂无收货地址"}}</view>
 				</view>
@@ -508,6 +508,7 @@
 		.top1 {
 			// display: flex;
 			justify-content: space-between;
+			align-items: center;
 			border-radius: 20rpx;
 			background: white;
 			padding: 10rpx 20rpx;
@@ -517,6 +518,8 @@
 
 		.top_info {
 			margin: 10rpx 0;
+			width:70%;
+			text-align:right;
 		}
 
 		.title {