浏览代码

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

zhongtianhaoyuan 3 年之前
父节点
当前提交
d0ab7fe868

+ 2 - 1
config/index.js

@@ -1,6 +1,7 @@
 const dev = {
-	// baseUrl: 'http://127.0.0.1:8080',
+	// baseUrl: 'http://192.168.1.120:8090/',
 	baseUrl: 'https://www.zthymaoyi.com',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 3 - 2
main.js

@@ -99,6 +99,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 			userInfo = uni.getStorageSync('userInfo')
 		}
 		let accessToken = userInfo ? userInfo.accessToken : ''
+		// let baseUrl = 'http://192.168.1.120:8090/'
 		let baseUrl = config.def().baseUrl
 		uni.request({
 			url: baseUrl + '/m.api',
@@ -176,7 +177,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 const doRequest = (method, url, data)=> {
 	console.log(method,url,data)
 	// let baseUrl = config.def().baseUrl
-	let baseUrl = 'http://192.168.1.120:8090/'
+	let baseUrl = config.def().baseUrlNew
         // 如果data为空
         if (!data) var data = []
         var arr = []
@@ -190,7 +191,7 @@ const doRequest = (method, url, data)=> {
                 data: arr[0],
                 // data:data
                 header: {
-                    'content-type': 'application/x-www-form-urlencoded'
+                    'content-type': 'application/json'
                 },
                 success: function(result) {
                     // resolve调用后,即可传递到调用方使用then或者async+await同步方式进行处理逻辑

+ 166 - 133
pageA/product/detail.vue

@@ -1,34 +1,32 @@
 <template>
 	<view class="container">
+		<view class="back-btn cuIcon-back" @click="navBack"></view>
+		<view class='title1'>采购详情</view>
+		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
-			<view class="price-box">
-				<view class="title">{{goods.title}}</view>
-				<view  v-if='goods.isFutures==0' class="title-tip">
-					<text class="price-tip">¥</text>
-					<text class="price">{{goods.price}}</text>
-					<text class="price-tip">元/吨</text>
-				</view>
-				<view  v-else class="title-tip">
-					<text class="price-tip">今日基差</text>
-					<text class="price-tip">¥</text>
-					<text class="price-tip">{{goods.basis}}</text>
-					<text class="price-tip">元/吨</text>
+			<view style='height:70px;'>
+				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class='flex justify-between'>
+					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
+					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
+						<text class="price">{{goods.unitPrice}}</text>
+					</view>
+					<view style='text-align:right;'  v-else class="title-tip">
+						{{goods.basisPrice}}
+					</view>
 				</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' v-if='goods.procurementPlanType=="期货"'>今日基差</view>
 			</view>
-			<view class="bot-row">
+			<!-- <view class="bot-row">
 				<view v-if='goods.companyId==2' class='cu-tag radius line-orange'>佳屹农</view>
 				<view v-else class='cu-tag radius line-orange'>易粮易运</view>
 				<view v-if='goods.sellerPhone && goods.companyId!=2' class='cu-tag radius line-orange' >{{goods.sellerPhone}}</view>
-				<!-- <view class='cu-tag radius line-orange'>{{goods.basis}}元/吨</view> -->
 			</view>
-			<!-- <view v-if='goods.companyId==2' class="bot-row">
-				<view class='cu-tag radius line-orange'>大袋{{goods.basisBig}}</view>
-				<view class='cu-tag radius line-orange'>小袋装{{goods.basisSmall}}</view>
-			</view> -->
 			<view v-if='goods.companyId!=2' class="bot-row">
 				<view class='cu-tag radius line-orange'>剩余量: {{goods.total - goods.soldCount}}吨</view>
 				<view class='cu-tag radius line-orange'>总量: {{goods.total}}吨</view>
-			</view>
+			</view> -->
 		</view>
 		<view v-if="goods.storeImg" class="carousel-section">
 			<swiper autoplay="true" interval="3000" duration="500" class="carousel" circular @change="swiperChange">
@@ -53,140 +51,154 @@
 			<view class="d-header">
 				<text>基本信息</text>
 			</view>
-			 <view class="c-list">
-				<view class="c-row b-b">
-					<text class="tit">品种</text>
+			<view class="c-list">
+				<view class="c-row">
+					<text class="tit">货名</text>
 					<view class="con-list">
 						<text>{{goods.goodsName}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">产地</text>
+				<view class="c-row">
+					<text class="tit">采购量(吨)</text>
 					<view class="con-list">
-						<text>{{goods.origin}}</text>
+						<text>{{goods.plannedPurchaseVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">国标等级</text>
+				<view class="c-row">
+					<text class="tit">最小成交量(吨)</text>
 					<view class="con-list">
-						<text>{{goods.level}}</text>
+						<text>{{goods.minimumVolume}}</text>
 					</view>
 				</view>
-				<view  v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">年份</text>
+				<view class="c-row">
+					<text class="tit">类型</text>
 					<view class="con-list">
-						<text>{{goods.year}}</text>
+						<text>{{goods.procurementPlanType}}</text>
 					</view>
 				</view>
-				<view v-if='goods.companyId!=2' class="c-row b-b">
-					<text class="tit">包装方式</text>
+				<view class="c-row">
+					<text class="tit">价格类型</text>
 					<view class="con-list">
-						<text>{{goods.packing}}</text>
+						<text>{{goods.priceType}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">最小成交量</text>
+				<view class="c-row">
+					<text class="tit">收货地区</text>
 					<view class="con-list">
-						<text>{{goods.minSale}}(吨)</text>
+						<text>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}</text>
 					</view>
 				</view>
-				<view v-if='goods.isFutures==0' class="c-row b-b">
-					<text class="tit">剩余量</text>
+				<view class="c-row">
+					<text class="tit">运费承担方</text>
 					<view class="con-list">
-						<text>{{numFilter(goods.total-goods.soldCount)}}</text>
+						<text>{{goods.freightPayer}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">价格类型</text>
+				<view class="c-row">
+					<text class="tit">包装方式</text>
 					<view class="con-list">
-						<text>{{goods.priceType}}</text>
+						<text>{{goods.packingType}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">袋装备注</text>
+					<view class="con-list">
+						<text>{{goods.baggingNotes}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">买方</text>
+					<view class="con-list">
+						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">库存地</text>
+				<view class="c-row">
+					<text class="tit">买方电话</text>
 					<view class="con-list">
-						<text>{{goods.stock}}</text>
+						<view>{{goods.buyerPhone}} <a :href="'tel:'+goods.buyerPhone"><image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
 					</view>
 				</view>
 			</view>
+		</view>
+		<view class="detail-desc">
 			<view class="d-header">
-				<text>粮食指标</text>
+				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">杂质(%){{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">水分(%){{'<='}} </text>
 					<view class="con-list">
-						<text>{{goods.impurity}}</text>
+						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">生霉粒(%){{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">容重(g/L){{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.moldy}}</text>
+						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">容重(g/L){{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">热损伤(%){{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.bulkDensity}}</text>
+						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">气味、色泽</text>
+				<view class="c-row">
+					<text class="tit">杂质(%){{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.smell}}</text>
+						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<!-- <view v-if='goods.goodsName=="玉米"' class="c-row b-b">
-					<text class="tit">热损(%){{'<='}}</text>
+				<view class="c-row">
+					<text class="tit">霉变粒(%){{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.heatLoss}}</text>
+						<text>{{goods.mildewGrain}}</text>
 					</view>
-				</view> -->
-				<view class="c-row b-b">
-					<text class="tit">水分(%){{'<='}} </text>
+				</view>
+				<view class="c-row">
+					<text class="tit">不完善粒(%){{'<='}}</text>
 					<view class="con-list">
-						<text>{{goods.waterContent}}</text>
+						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">蛋白(%){{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view v-if='goods.goodsName=="大豆"' class="c-row b-b">
+				<view class="c-row">
 					<text class="tit">粒型</text>
 					<view class="con-list">
-						<text>{{goods.grainType}}</text>
+						<text>{{goods.grain}}</text>
+					</view>
+				</view>
+				<view class="c-row">
+					<text class="tit">品级</text>
+					<view class="con-list">
+						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">价格</text>
+				<view class="c-row">
+					<text class="tit">产地</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="price" @input="priceInput"></input>
+						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
-					<button class='cu-btn bg-green shadow' @click="changePrice">修改价格</button>
 				</view>
-				<view v-if="goods.userName1" class="c-row b-b">
-					<text class="tit">备注</text>
+				<view class="c-row">
+					<text class="tit">产出年份</text>
 					<view class="con-list">
-						<input placeholder="请填写" name="input" v-model="reason" @input="reasonInput"></input>
+						<text>{{goods.outputYear}}</text>
 					</view>
-					<button class='cu-btn bg-red shadow' @click="endSale">终止销售</button>
+				</view>
 				</view>
 			</view>
-			 <view v-if="goods.userName" class="padding-xl" @click="navToDetailPage()">
-			 		<button class="cu-btn block line-orange lg">
-			 	     <text  class="cuIcon-upload"></text> 上传图片</button>
-			 </view>
-		</view>
 		<!-- 底部操作菜单 -->
-		<view class="page-bottom">
-			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border buy-now-btn" @click="contactUs">联系我们</button>
-				<button v-if="goods.status == 1" type="primary" class=" action-btn no-border add-cart-btn" >交易结束</button>
-				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">我要买粮</button>
+		<view class="page-bottom1">
+			<view>
+				<button type="primary" @click="contactUs">联系我们</button>
+				<button v-if="goods.pcFlag == 1" type="primary" class=" action-btn no-border add-cart-btn" >立即卖粮</button>
+				<button v-else type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">立即发车</button>
 			</view>
 		</view>
 	</view>
@@ -247,21 +259,21 @@
 				title: '正在加载',
 				mask:true
 			})
-			that.$api.request('goods', 'getSaleDetailInfo', {
-				id: options.id
-			}, failres => {
-				that.$api.msg(failres.errmsg)
-				uni.hideLoading()
-			}).then(res => {
-				console.log(res.data)
-				that.goods = res.data
-				that.swiperLength = 3
-				if(that.goods.soldCount >= that.goods.total){
-					that.goods.status = 1
-				}
-				that.share.title = that.goods.title
+			this.$api.doRequest('get', '/procurementPlanInfo/getProcurementPlan',{id:options.id}).then(res => {
 				uni.hideLoading()
+				this.goods=res.data.data
 			})
+			
+			// .then(res => {
+			// 	console.log(res.data)
+			// 	that.goods = res.data
+			// 	that.swiperLength = 3
+			// 	if(that.goods.soldCount >= that.goods.total){
+			// 		that.goods.status = 1
+			// 	}
+			// 	that.share.title = that.goods.title
+			// 	uni.hideLoading()
+			// })
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -411,8 +423,16 @@
 
 
 <style lang='scss'>
+	.title1{
+		position:absolute;
+		left:50%;
+		transform: translateX(-50%);
+		top: 40upx;
+		z-index:9999;
+		color:#fff;
+	}
 	page {
-		background: $page-color-base;
+		background: #F5F6FA;
 		/* padding-bottom: 160upx; */
 	}
 	.container{
@@ -647,34 +667,22 @@
 	.detail-desc {
 		background: #fff;
 		margin-top: 16upx;
-		width: 750upx;
-
+		margin:10px;
+		position:relative;
+		z-index:4;
+		border-radius:5px;
 		.d-header {
 			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 80upx;
+			padding:10px;
 			font-size: $font-base + 2upx;
 			color: $font-color-dark;
 			position: relative;
-
+			border-bottom:1px solid #EEEEEE;
 			text {
 				padding: 0 20upx;
-				background: #fff;
 				position: relative;
 				z-index: 1;
 			}
-
-			&:after {
-				position: absolute;
-				left: 50%;
-				top: 50%;
-				transform: translateX(-50%);
-				width: 300upx;
-				height: 0;
-				content: '';
-				border-bottom: 1px solid #ccc;
-			}
 		}
 	}
 
@@ -886,20 +894,30 @@
 	}
 
 	/* 底部操作菜单 */
-	.page-bottom {
+	.page-bottom1 {
 		position: fixed;
-		left: 30upx;
-		bottom: 30upx;
+		left: 0;
+		bottom: 0;
 		z-index: 95;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 690upx;
-		height: 100upx;
+		width:100%;
+		height: 70px;
 		background: rgba(255, 255, 255, .9);
-		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, .5);
-		border-radius: 16upx;
-
+		padding:15px;
+		border-radius: 0;
+		text-align:right;
+		button{
+			display:inline-block;
+			border-radius:18px;
+			margin:0 10px;
+			font-size:14px;background:#fff;
+			color:#333;
+			border:1px solid #333;
+		}
+		.action-btn{
+			background:#22C572;
+			color:#fff;
+			border:1px solid #22C572;
+		}
 		.p-b-btn {
 			display: flex;
 			flex-direction: column;
@@ -950,14 +968,19 @@
 	/* 销售信息 */
 	.introduce-section {
 		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
+		padding: 30upx 30upx;
+		position:relative;
+		margin:10px;
+		padding-bottom:25px;
+		margin-top:-148px;
+		border-radius:5px;
+		z-index:4;
 		.guess-item {
 			padding-bottom: 20upx;
 			border-bottom: 1px solid #ccc;
 		}
 		.title {
-			font-size: 28upx;
+			font-size: 16px;
 			color: $font-color-dark;
 			font-weight:bold;
 			height: 50upx;
@@ -966,6 +989,7 @@
 		}
 		.title-tip {
 			flex:1.5;
+			color:#FD714F;font-size:30px;
 		}
 		.price-box {
 			display: flex;
@@ -1009,4 +1033,13 @@
 			}
 		}
 	}
+	.back-btn {
+		position: absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: #fff;
+	}
 </style>

文件差异内容过多而无法显示
+ 651 - 0
pageD/warehousings/warehousingDetails.vue


+ 257 - 0
pageD/warehousings/warehousings.vue

@@ -0,0 +1,257 @@
+<template>
+	<view class="container">
+		<view class="detail-desc">
+			<view class="d-header">
+				<text>发运信息</text>
+			</view>
+
+			<view class="c-list">
+				<view class="c-row b-b">
+					<text class="tit">合同编号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.contractNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">货名</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.goodsName}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">发车净重(吨)</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.startWeight}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">车牌号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.carNo}}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>入库信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">毛重(吨)</view>
+					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">皮重(吨)</view>
+					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">净重(吨)</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">仓库</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.warehouseName}}</text>
+					</view>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">仓位号</view>
+					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">入库类型</view>
+					<picker @change="packingChange" :value="packingIndex" :range="packingType">
+						<view class="picker">
+							{{packingIndex>-1?packingType[packingIndex]:'请选择入库类型'}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款金额</view>
+					<input placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款项</view>
+					<input placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">入库日期</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.inOutDate}}</text>
+					</view>
+				</view>
+				<view class="padding flex flex-direction">
+					<button class="cu-btn bg-red margin-tb-sm lg">上传磅单照片</button>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>化验信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">质检员</view>
+					<input placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">蛋白(%)>=</view>
+					<input placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">水分(%)<= </view>
+							<input placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">容重(克/升)>= </view>
+						<input placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">热损伤(%)<= </view>
+								<input placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
+						</view>
+						<view class="cu-form-group align-start">
+							<view class="title">杂质(%)<= </view>
+									<input placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
+							</view>
+							<view class="cu-form-group align-start">
+								<view class="title">霉变粒(%)<= </view>
+										<input placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
+								</view>
+								<view class="cu-form-group align-start">
+									<view class="title">不完整粒(%)<= </view>
+											<input placeholder="请输入不完整粒占比" name="input"
+												v-model="list.imperfectGrain"></input>
+									</view>
+									<view class="c-row b-b">
+										<text class="tit">品级 </text>
+										<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+											<view class="con-list">
+												{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+											</view>
+										</picker>
+									</view>
+								</view>
+
+							</view>
+							<!-- 底部操作菜单 -->
+							<view class="padding flex flex-direction">
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">暂存</button>
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				packingType: [],
+				packingIndex: "",
+				goods: {},
+				list: {},
+				WarehouseInOutInfo: {
+					warehouseInOutDetail: {}
+				},
+				pinIndex: 0,
+				pinType: ['不限(默认)', '一等品', '二等品', '三等品', '等外'],
+			}
+		},
+		methods: {
+
+			commit() {
+				console.log(this.list)
+				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
+
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+			},
+		}
+
+	}
+</script>
+<style scoped>
+	.cu-form-group input {
+		text-align: right;
+	}
+
+	.cu-form-group textarea {
+		text-align: right;
+	}
+
+	.margin-bottom {
+		margin-bottom: 30px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+	}
+
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+</style>

+ 19 - 1
pages.json

@@ -403,6 +403,24 @@
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "买粮详情",
+				"enablePullDownRefresh": false
+		    }
+		}
+        ,{
+            "path" : "pageD/warehousings/warehousings",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "入库",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		
+		,{
+		    "path" : "pageD/warehousings/warehousingDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "入库详情",
 		        "enablePullDownRefresh": false
 		    }
 		    
@@ -463,7 +481,7 @@
 				{
 					"path": "product/detail",
 					"style": {
-						"navigationBarTitleText": "销售详情"
+						"navigationStyle":"custom"
 					}
 				}, 
 				{

+ 496 - 7
pages/task/my_task.vue

@@ -1,22 +1,511 @@
-<template>
-	<view>
-		
+<template name="task">
+	<view class="content">
+		<view class="cu-bar search bg-white">
+			<view class="search-form round" @click="naviageToPage('/pageA/product/search?TabCur=')">
+				<text style='color: #ccc;' class="cuIcon-search"></text>
+				<input type="text" placeholder="请输入合同编号、车牌号或派车编号" confirm-type="search"></input>
+			</view>
+
+		</view>
+		<view style='background:#fff;padding:0 145px;display:table-footer-group ;'>
+			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>未完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='TabCur==3?"active":""'>已完成</view>
+		</view>
+		<view class="introduce-section">
+			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<view class="price-box">
+					<view class='tag tag-bule radius line-pink'>入库任务</view>
+					<view class="title">辽H12345(C001){{item.car_no}}{{item.tran_car_no}}</view>
+				</view>
+				<view class="titles ">CG12345678{{item.contract_no}}</view>
+				<view class="titles titleds_aa">2021-06-30{{item.predict_date}}</view>
+			</view>
+			<view v-show="isLoadMore">
+				<uni-load-more :status="loadStatus"></uni-load-more>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		name: "task",
 		data() {
 			return {
-				
-			}
+				PageCur: "task",
+				taskInfo: [],
+				pages: 1, //页数
+				limit: 10, //每次取条目数
+				loadStatus: 'loading', //加载样式:more-加载前样式,loading-加载中样式,nomore-没有数据样式
+				isLoadMore: false, //是否加载中
+				showTran: true,
+				scrollTop: 0,
+				statusFlag: 1,
+				TabCur: 0,
+				current: 1,
+				warehouseInOutInfo: {
+					pageSize: 10,
+					currentPage: 1
+				}
+			};
+		},
+		onLoad(options) {
+
+			this.getIndexBuyData();
+			this.getIndexBuyData()
 		},
 		methods: {
-			
+			getIndexBuyData() {
+				console.log(11111)
+				const that = this
+				var pages = that.pages
+				var limit = that.limit
+				console.log(2112454)
+				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
+					console.log(res,"对象")
+					if (res.data.code == 200) {
+						let data = res.data.data.records
+						console.log(data,"13246")
+						//采购信息
+						if (data.length > 0) {
+							that.taskInfo = that.taskInfo.concat(data)
+							that.isLoadMore = false
+						} else {
+							if (that.pages > 1) {
+								that.pages -= 1
+							}
+							that.isLoadMore = true
+							that.loadStatus = 'nomore'
+						}
+						uni.hideLoading()
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			tabcarchange(statusFlag) {
+				this.statusFlag = statusFlag
+				this.pageSize = 1
+				this.getIndexBuyData()
+			},
+			navToDetailPage(item){
+				uni.navigateTo({
+				      url: `/pageD/myRelease/sellGrain?contractNo=${item.contractNo}&goodsName=${item.goodsName}
+					  &startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}
+					  &warehouseName=${item.warehouseName}`
+				     })
+			}
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	page,
+	.content {
+		background: #F5F6FA;
+	}
+
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
+		width: 187px;
+		padding-left: 68px;
+	}
+
+	.line.active {
+		font-size: 19px;
+		font-weight: 900;
+	}
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 18px;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.cu-item {
+		height: 80rpx;
+		display: inline-block;
+		line-height: 80rpx;
+	}
+
+	.search-form {
+		background: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+	}
+
+	.title-tip {
+		color: #E63113;
+		text-align: right;
+	}
+
+	.tag-bule {
+		background: #CDE7FB;
+		color: #0B4572;
+	}
+
+	.tag-green {
+		background: #C6F7BC;
+		color: #065112;
+	}
+
+	.tag-yellow {
+		background: #FBF4B1;
+		color: #5C4409;
+	}
+
+	.tag {
+		padding: 5px;
+		display: inline-flex;
+		font-size: 22rpx;
+		margin: 3px;
+	}
+
+	.text-white {
+		color: #fff;
+	}
+
+	.text-white text {
+		position: relative;
+		z-index: 2;
+		background: linear-gradient(45deg, #3DC146, #B2D612);
+		padding: 5px 10px;
+		border-radius: 38rpx;
+	}
+
+	.guess-section {
+		padding-bottom: 100upx;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 98%;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: #121212;
+		}
+
+		.price-orther {
+			font-size: $font-sm;
+			color: $font-color-base;
+		}
+
+		.price {
+			font-size: 64rpx;
+			color: #39b54a;
+			line-height: 1;
+			padding-right: 10upx;
+		}
+
+		.goods1 {
+			font-size: $font-sm;
+			color: $font-color-base;
+		}
+
+		.goods2 {
+			font-size: $font-sm;
+			color: $font-color-base;
+			padding-left: 10%;
+		}
+
+		.goods3 {
+			font-size: $font-sm;
+			color: $font-color-base;
+			padding-left: 10%;
+		}
+
+		.goods4 {
+			font-size: $font-sm;
+			color: #ff5500;
+		}
+
+		.goods5 {
+			font-size: $font-sm;
+			color: $font-color-base;
+		}
+
+		.view-item {
+			width: 100%;
+			// line-height: 40upx;
+			padding-top: 10upx;
+		}
+
+		.confirm-btn {
+			margin-left: 20%;
+		}
+
+		.date-time {
+			margin-left: 30%;
+		}
+
+		.padding-xs-tmp {
+			padding: 15upx 10upx 10upx 10upx;
+		}
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 80upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
+		z-index: 10;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
 
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: .3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: .3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, .4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	/* 销售信息 */
+	.introduce-section {
+		background: #fff;
+		padding: 20upx 30upx;
+		padding-bottom: 100upx;
+
+		.guess-item {
+			padding-bottom: 20upx;
+			border-bottom: 1px solid #ccc;
+		}
+
+		.title {
+			font-size: 13upx;
+			color: $font-color-dark;
+			font-weight: bold;
+			height: 100upx;
+			line-height: 50upx;
+			flex: 2.5;
+			margin-left: -4px;
+			padding: 0px 24px;
+
+		}
+
+		.title-tip {
+			flex: 1;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 57px;
+			padding: 5px 0;
+			font-size: 13px;
+			color: #fa436a;
+		}
+
+		.price {
+			font-size: $font-lg + 2upx;
+		}
+
+		.m-price {
+			margin: 0 12upx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4upx 10upx;
+			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6upx;
+			line-height: 1;
+			transform: translateY(-4upx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50upx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			view {
+				flex: 1;
+			}
+		}
+	}
+
+	.titles {
+		display: -webkit-inline-box;
+
+	}
+
+	.titleds_aa {
+		float: right;
+	}
 </style>

二进制
static/img/jiaoyi/bg.png


二进制
static/img/jiaoyi/bg@2x.png


二进制
static/img/jiaoyi/bg@3x.png


二进制
static/img/jiaoyi/gengduo1.png


二进制
static/img/jiaoyi/gengduo1@2x.png


二进制
static/img/jiaoyi/gengduo1@3x.png


部分文件因为文件数量过多而无法显示