添加检斤页面

pages.json

@@ -741,6 +741,15 @@
             }
             
         },
+		{
+		    "path" : "pages/erpbusiness/acquisitionInspection/warehouseWeighing",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "出库检斤",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
 		{
 		    "path" : "pages/erpbusiness/acquisitionInspection/grossWeightDetail",
 		    "style" :                                                                                    
@@ -749,6 +758,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erpbusiness/acquisitionInspection/grossWeightDetail1",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "毛重检斤",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 		{
 		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail",
@@ -758,6 +776,24 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail1",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "皮重检斤",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/erpbusiness/acquisitionInspection/tareDetail2",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "检斤详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
     ],
 	"subpackages": [{

pages/erpbusiness/QRCode/QRCode.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content" @click="maskClick">
 		<view class="qrcode">
 			<uqrcode ref="uqrcode"></uqrcode>
 			<view class="qrcode-text">客户扫码</view>
@@ -34,7 +34,11 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
-		methods: {}
+		methods: {
+			maskClick(){
+			uni.navigateBack(-1)
+			}
+		}
 	}
 </script>
 
@@ -54,9 +58,10 @@
 	color: #878C9C;
 	top: -60rpx;
 }
-// .qrcode{
-// 	position: absolute;
-// 	top: 0;
+.qrcode{
+	position: fixed;
+	top: 30%;
+	margin: auto;
 	
-// }
+}
 </style>

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -188,6 +188,7 @@
 		.row4{
 			display: flex;
 			justify-content: flex-end;
+			margin-top: 10px;
 			.right{
 				border: 1px solid #CDCDCD;
 				border-radius: 45rpx;

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -57,7 +57,14 @@
 			// this.detailData = JSON.parse(options.detailData)
 		},
 		methods: {
-
+			submit(){
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success() {
+						console.log("提交")
+					}
+				})
+			}
 		}
 	}
 </script>

pages/erpbusiness/acquisitionInspection/grossWeightDetail1.vue

@@ -0,0 +1,196 @@
+<template>
+	<view class="warp">
+		<view class="content">
+				<view class="title">
+					基本信息
+				</view>
+			<view class="row">
+				<view class="left">仓库</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">合同编号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">车牌号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">仓位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">囤位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">出库类型</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+		</view>
+		<view class="content1">
+			<view class="title">
+				检斤信息
+			</view>
+			<view class="row row-bottom">
+				<view class="left">皮重（公斤）</view>
+				<input class="right-bottom" placeholder="输入皮重"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">毛重（公斤）</view>
+				<input class="right-bottom" placeholder="输入毛重"></input>
+			</view>
+			<view class="row row-bottom" style="border: 0;">
+				<view class="left">净重（公斤）</view>
+				<input class="right-bottom" disabled placeholder="自动计算"></input>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="left">上传榜单</view>
+			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+				:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+				@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+		</view>
+		<u-toast ref="uToast"/>
+		<u-button type="primary" class="submit" @click="submit">提交</u-button>
+
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				btnLoading: false, //防止重复点击
+				isAdd: true,
+				detailData: {
+					name: ""
+				}
+			}
+		},
+		onShow() {},
+		onLoad(options) {
+			// this.detailData = JSON.parse(options.detailData)
+		},
+		methods: {
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			getImgUrl(res) {
+				console.log(res)
+				console.log('------------res-----------')
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {},
+			submit(){
+				let that = this
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success() {
+						that.$refs.uToast.show({
+						title: '提交成功',
+						type: 'success',
+					})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+
+	.content,
+	.content1,
+	.content2
+	{
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+		.title{
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+
+			.right {
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+
+			// border: 0;
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
+		}
+	}
+	.content1{
+		margin-top: 20rpx;
+	}
+	.content2{
+		margin-top: 10px;
+		display: flex;
+		align-items: center;
+		.left{
+			margin-right: 20px;
+		}
+	}
+
+	.submit {
+		position: fixed;
+		bottom: 40rpx;
+		width: 90%;
+		background: #22C572;
+		border-radius: 50rpx;
+
+	}
+</style>

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -28,10 +28,6 @@
 				<view class="left">囤位号</view>
 				<view class="right">仓库仓库仓库仓库仓库1</view>
 			</view>
-			<view class="row">
-				<view class="left">仓库</view>
-				<view class="right">仓库仓库仓库仓库仓库1</view>
-			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right">仓库仓库仓库仓库仓库1</view>
@@ -45,7 +41,7 @@
 				<input class="right-bottom" placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
-				<view class="left">皮重（公斤）</view>
+				<view class="left">扣杂（公斤）</view>
 				<input class="right-bottom" placeholder="输入扣杂"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
@@ -73,7 +69,14 @@
 			// this.detailData = JSON.parse(options.detailData)
 		},
 		methods: {
-
+			submit(){
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success() {
+						console.log("提交")
+					}
+				})
+			}
 		}
 	}
 </script>

pages/erpbusiness/acquisitionInspection/tareDetail1.vue

@@ -0,0 +1,174 @@
+<template>
+	<view class="warp">
+		<view class="content">
+			<view class="title">
+				基本信息
+			</view>
+			<view class="row">
+				<view class="left">仓库</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row" @click="contractNoClick">
+				<view class="left">合同编号</view>
+				<view class="right">仓库仓库仓库仓库仓库1></view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row" style="text-align: right;">
+				<view class="left">车牌号</view>
+				<input class="right-bottom" placeholder="输入车牌号"></input>
+			</view>
+			<view class="row" @click="binNoClick">
+				<view class="left">仓位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1></view>
+			</view>
+			<view class="row">
+				<view class="left">囤位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row row-bottom" @click="issueTypeClick">
+				<view class="left">出库类型</view>
+				<view class="right">{{issueTypeVal}}></view>
+			</view>
+		</view>
+		<div class="content1">
+			<view class="title">
+				检斤信息
+			</view>
+			<view class="row row-bottom">
+				<view class="left">皮重（公斤）</view>
+				<input class="right-bottom" placeholder="输入毛重"></input>
+			</view>
+		</div>
+		<u-select v-model="isShowContractNo" :list="contractNoList" @confirm="confirmContractNo"></u-select>
+		<u-select v-model="isShowBinNo" :list="binNoList" @confirm="confirmBinNo"></u-select>
+		<u-select v-model="isShowIssueType" :list="issueTypeList" @confirm="confirmIssueTypeNo"></u-select>
+		<u-button type="primary" class="submit" @click="submit">提交</u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isShowContractNo: false,
+				isShowBinNo: false,
+				isShowIssueType: false,
+				issueTypeVal: "销售出库",
+				detailData: {
+					name: ""
+				},
+				contractNoList: [],
+				binNoList: [],
+				issueTypeList: [{
+						value: '1',
+						label: '销售出库'
+					},
+					{
+						value: '2',
+						label: '移库出库'
+					},
+					{
+						value: '3',
+						label: '暂存出库'
+					},
+					{
+						value: '4',
+						label: '贸易服务出库'
+					},
+				]
+			}
+		},
+		onShow() {},
+		onLoad(options) {
+			debugger
+			// this.detailData = JSON.parse(options.detailData)
+		},
+		methods: {
+			contractNoClick() {
+				this.isShowContractNo = true
+			},
+			binNoClick() {
+				this.isShowBinNo = true
+			},
+			issueTypeClick() {
+				this.isShowIssueType = true
+			},
+			confirmContractNo(e) {},
+			confirmBinNo(e) {},
+			confirmIssueTypeNo(e) {
+				console.log(e)
+				this.issueTypeVal = e[0].label
+			},
+			submit(){
+				uni.showModal({
+					content:"确定提交检斤信息?",
+					success() {
+						console.log("提交")
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.warp {
+		margin: 20rpx;
+	}
+
+	.content,
+	.content1 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 31rpx 0;
+
+			.right {
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+			border: 0;
+
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
+	}
+
+	.submit {
+		position: fixed;
+		bottom: 40rpx;
+		width: 90%;
+		background: #22C572;
+		border-radius: 50rpx;
+
+	}
+</style>

pages/erpbusiness/acquisitionInspection/tareDetail2.vue

@@ -0,0 +1,134 @@
+<template>
+	<view class="warp">
+		<view class="content">
+				<view class="title">
+					基本信息
+				</view>
+			<view class="row">
+				<view class="left">仓库</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">合同编号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">车牌号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">仓位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">囤位号</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">出库类型</view>
+				<view class="right-bottom">仓库仓库仓库仓库仓库1</view>
+			</view>
+		</view>
+		<view class="content1">
+			<view class="title">
+				检斤信息
+			</view>
+			<view class="row">
+				<view class="left">毛重（公斤）</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row">
+				<view class="left">皮重（公斤）</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+			<view class="row row-bottom" style="border: 0;">
+				<view class="left">净重（公斤）</view>
+				<view class="right">仓库仓库仓库仓库仓库1</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">
+				磅单照片
+			</view>
+			<view>
+				<image class="img" src="../../../static/img/authentication/cert-personal@3x.png" mode=""></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				detailData: {
+					name: ""
+				}
+			}
+		},
+		onShow() {},
+		onLoad(options) {
+			debugger
+			// this.detailData = JSON.parse(options.detailData)
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body{
+		overflow: hidden;
+	}
+	.warp{
+		margin: 20rpx;
+	}
+.content,.content1,.content2{
+	border-radius: 20rpx;
+	background: white;
+	padding: 20rpx;
+	.title{
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333333;
+	}
+	.row{
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #EEEEEE;
+		padding:21rpx 0;
+		.right{
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+	}
+	.row-bottom{
+		border: 0;
+		.right-bottom{
+			width: 300rpx;
+			text-align: right;
+		}
+	}
+}
+.content1,.content2{
+	margin-top: 10rpx;
+}
+.img{
+	width: 282rpx;
+	height: 282rpx;
+}
+.submit{
+		position: fixed;
+		bottom:40rpx;
+		width: 90%;
+		background: #22C572;
+		border-radius: 50rpx;
+		
+	}
+</style>

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -0,0 +1,214 @@
+<template>
+	<view class="content">
+		<view class="top">
+			<u-search placeholder="输入编号/客户号/车牌号" v-model="inputKeyword"></u-search>
+			<view class="dropdown">
+				<view class="left" @click="selectWarehouse">
+					<view >{{warehouseName}}</view>
+					<u-icon name="arrow-down" color=""></u-icon>
+				</view>
+				<view class="right">
+					<u-icon name="checkmark-circle-fill" color="#22C572"></u-icon>
+					<view class="default">默认</view>
+				</view>
+			</view>
+			<u-select v-model="isShowWarehouse" :list="warehouseList" @confirm="confirmWarehouse"></u-select>
+		</view>
+		<view class="middle">
+			<view class="item-style" v-for="(item,index) in dataList" :key="index" @click="toDetail">
+				<view class="row1">
+					<view class="row1-left">
+						<view class="left">检</view>
+						<view>
+							<view class="top-title">
+								RKZJ20210823xxxxxxx
+							</view>
+							<view class="bottom">2021-07-05</view>
+						</view>
+					</view>
+					<view class="right">李四</view>
+				</view>
+				<view class="row2">
+					<view>张三</view>
+					<view>辽H12345</view>
+					<view>玉米（20水）</view>
+				</view>
+				<view class="row3">
+					<view class="row3-item">
+						<view class="left">毛</view>
+						<view>未承重</view>
+					</view>
+					<view class="row3-item">
+						<view class="left">皮</view>
+						<view>未承重</view>
+					</view>
+					<view class="row3-item">
+						<view class="left">净</view>
+						<view>未承重</view>
+					</view>
+				</view>
+				<view class="row4">
+					<view class="right" @click.stop="tareClick(item)">皮重</view>
+					<view class="right" @click.stop="grossWeightClick(item)">毛重</view>
+					<view class="right" @click.stop="delClick(item)">删除</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				inputKeyword: '',
+				warehouseName:'',
+				isShowWarehouse: false,
+				warehouseList: [{
+						label: '仓库1',
+						value: 1,
+					},
+					{
+						label: '仓库2',
+						value: 2,
+					},
+					{
+						label: '仓库3',
+						value: 3,
+					}
+				],
+				dataList: [{name:1}, {}, {}]
+			}
+		},
+		onShow() {
+			this.warehouseName = this.warehouseList[0].label
+		},
+		methods: {
+			selectWarehouse() {
+				this.isShowWarehouse = true
+			},confirmWarehouse(e){
+				console.log(e)
+				this.warehouseName =e[0].label
+			},
+			//毛重
+			grossWeightClick(val){
+				console.log(val)
+				uni.navigateTo({
+					url:'./grossWeightDetail1?detailData='+JSON.stringify(val)
+				})
+			},
+			tareClick(val){
+				uni.navigateTo({
+					url:'./tareDetail1?detailData='+JSON.stringify(val)
+				})
+			},
+			delClick(val){
+				console.log(val)
+			},
+			toDetail(val){
+				uni.navigateTo({
+					url:'./tareDetail2?detailData='+JSON.stringify(val)
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.top {
+		background: white;
+		padding: 20rpx;
+		border-radius: 0 0 20rpx 40rpx;
+	}
+
+	.dropdown {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: relative;
+		margin: 20rpx 0;
+		padding:0 13rpx;
+
+		.right,
+		.left {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.item-style {
+		background: white;
+		margin: 20rpx;
+		padding: 20rpx;
+
+		.row1 {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.row1-left {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+				}
+
+				.top-title {
+					font-size: 32rpx;
+					font-weight: 600;
+					color: #333333;
+				}
+
+				.bottom {
+					color: #878C9C;
+				}
+
+				.right {
+					font-size: 28rpx;
+					font-weight: 600;
+					color: #333333;
+				}
+
+			}
+		}
+		.row2{
+			display: flex;
+			background: #F9F9FA;
+			border-radius: 10rpx;
+			padding: 10rpx 0;
+			justify-content: space-evenly;
+			margin: 20rpx;
+			color: #878C9C;
+		}
+		.row3{
+			display: flex;
+			.row3-item{
+				display: flex;
+				margin-right: 40rpx;
+				.left{
+					background: #22C572;
+					border-radius: 10rpx;
+					padding: 2rpx 10rpx;
+					box-sizing: border-box;
+					color: white;
+					font-size: 12px;
+					margin-right: 15rpx;
+				}
+			}
+		}
+		.row4{
+			margin-top: 10px;
+			display: flex;
+			justify-content: flex-end;
+			.right{
+				border: 1px solid #CDCDCD;
+				border-radius: 45rpx;
+				padding: 10rpx 30rpx;
+				margin-left: 20rpx;
+			}
+		}
+
+	}
+</style>

pages/erpbusiness/index.vue

@@ -103,7 +103,7 @@
 						// icon: 'cuIcon-apps',
 						src:'../../static/img/erp/chukujianjin@3x.png',
 						tips: 0,
-						url: '/pages/attestation/index?',
+						url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
 						show: true
 					},
 					{
@@ -267,7 +267,7 @@
 				// 	uni.hideLoading()
 				// })
 			},
-			gridClick(item, index) {
+			gridClick(item, index) {debugger
 				var that = this
 				if (item.name == "退出登录") {
 					this.logout()