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

# Conflicts:
#	pageA/product/detail.vue

config/index.js

@@ -3,13 +3,13 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.55:9888/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// 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
 }

pageA/product/detail.vue

@@ -120,7 +120,7 @@
 						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row" @click="$helper.contactCustomerService(goods.buyerPhone)">>
+				<view class="c-row" @click="contactUs">
 					<text class="tit">买方电话</text>
 					<view class="con-list">
 						<view>{{goods.buyerPhone}}
@@ -216,7 +216,8 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view class="Regular">
-				<u-button class="talk-online"@click="$helper.contactCustomerService(goods.buyerPhone)">立即沟通</u-button>
+				<u-button class="talk-online" @click="editInfo" v-if="show">编辑</u-button>
+				<u-button class="talk-online" @click="contactUs">立即沟通</u-button>
 				<u-button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
 					class="action-btn no-border add-cart-btn">立即卖粮</u-button>
 				<u-button v-else type="primary" class="action-btn no-border add-cart-btn" @click="tradeNow">立即发车
@@ -247,6 +248,7 @@
 				content1: '您尚未登录，是否立即登录?',
 				content: '您还未认证粮商身份，下单前请先完善您的身份信息。',
 				isShowAlert: false,
+				show: false,
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -296,6 +298,9 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.goods = res.data.data
+				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
+					that.show = true
+				}
 			})
 
 			// .then(res => {
@@ -313,6 +318,13 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			editInfo(){
+				const that = this
+				uni.navigateTo({
+					url: '/pageD/myRelease/buyEdit?id='+that.goods.id+'&compId='+that.goods.compId
+				})
+				
+			},
 			alertBtn1() {
 				uni.navigateTo({
 					url: '/pages/public/login'

pageA/product/sales_detail.vue

@@ -216,6 +216,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view>
+				<button class="talk-online" @click="editInfo" v-if="show">编辑</button>
 				<button type="primary" @click="contactUs">立即沟通</button>
 				<button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
 					class=" action-btn no-border add-cart-btn">立即买粮</button>
@@ -241,6 +242,7 @@
 			return {
 				isShowAlert: false,
 				content: '您尚未登录，是否立即登录?',
+				show: false,
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -290,12 +292,22 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.goods = res.data.data
+				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
+					that.show = true
+				}
 			})
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			editInfo(){
+				const that = this
+				uni.navigateTo({
+					url: '/pageD/myRelease/sellEdit?id='+that.goods.id+'&compId='+that.goods.compId
+				})
+				
+			},
 			alertBtn() {
 				uni.navigateTo({
 					url: '/pages/public/login'

pages.json

@@ -1165,6 +1165,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/task/audit/viewDetail",
+			"style": {
+				"navigationBarTitleText": "入库详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/task/audit/warehouse_warrant_detail",
 			"style": {

pages/task/audit/viewDetail.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="center">
+		<view class="data_css" v-for="(item,index) in dataList">
+			<!-- <view class="data_item"> -->
+				<!-- <view class="data_item_left">货源</view>
+				<view class="data_item_right">{{item.customer}}</view> -->
+				<!-- <u-form ref="uForm" >
+				<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="货源">
+					<u-input v-model="item.customer" input-align="right" placeholder="--" disabled />
+				</u-form-item>
+				</u-form> -->
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="6">
+						<view class="demo-layout title_name">货源</view>
+					</u-col>
+					<u-col span="6">
+						<view class="demo-layout value_css" >{{item.customer}}</view>
+					</u-col>
+				</u-row>
+			<!-- </view> -->
+			<view class="data_top_css">
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">车牌号</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css" >{{item.carNo?item.carNo:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">水分(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.waterContent?item.waterContent:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">毛重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grossWeight?item.grossWeight:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">容重(g/L)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.bulkDensity?item.bulkDensity:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">皮重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.tare?item.tare:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">杂质(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.impurity?item.impurity:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">净重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.netWeight?item.netWeight:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">霉变粒(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.mildewGrain?item.mildewGrain:'--'}}</view>
+					</u-col>
+				</u-row> 
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">单价(元/吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.price?item.price:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">热损伤(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item. jiaorenli?item. jiaorenli:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">粮款(元)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grainFund?item.grainFund:'--'}}</view>
+					</u-col>
+					<u-col span="4">
+						<view class="demo-layout title_name">不完整粒(%)</view>
+					</u-col>
+					<u-col span="2"> 
+						<view class="demo-layout value_css">{{item.imperfectGrain?item.imperfectGrain:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">等级</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grade?item.grade:'--'}}</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataList: [],
+			}
+		},
+		onLoad(options) {
+			this.dataList = JSON.parse(options.data)
+			console.log(this.dataList)
+		},
+		onShow() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 30rpx 20rpx;
+	}
+	.u-form {
+		// margin-bottom: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 0rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
+		}
+	}
+
+	.data_css {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		.data_item {
+			display: flex;
+			.data_item_left,
+			.data_item_right {
+				width: 50%;
+			}
+			.data_item_left{
+				margin-left: 10rpx;
+			}
+
+			.data_item_right {
+				text-align: right;
+			}
+		}
+		.data_top_css{
+			margin-top: 10rpx;
+			
+		}
+	}
+	.row_css{
+		margin-bottom: 10rpx;
+	}
+	.title_name{
+		color: #8F8F8F;
+	} 
+	.value_css{
+		color: #333333;
+		text-align: right;
+		margin-right: 40rpx;
+	}
+</style>

pages/task/audit/warehouse_warrant.vue

@@ -61,7 +61,7 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList" @click="detailed">
 				<view class='flex align-center justify-between'>
 					<view class="name">
 						{{item.customer}}
@@ -108,7 +108,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -248,6 +248,12 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			detailed(){
+				let obj = JSON.stringify(this.auditInfo.warehousingOrderList)
+					uni.navigateTo({
+						url: '/pages/task/audit/viewDetail?data='+obj
+					});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -331,7 +337,8 @@
 				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
 					searchType: 1,
-					batchId: this.id
+					batchId: this.id,
+					compId: uni.getStorageSync('pcUserInfo').compId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data

pages/task/audit/warehouse_warrant_detail.vue

@@ -108,7 +108,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">