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

pageD/identity/companyIdentityLook.vue

@@ -82,14 +82,13 @@
 			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">收款人姓名</text>
 				<view class="con-list">
-					<input placeholder="请填写收款人姓名" name="input" v-model="deptList.payeeName"></input>
+					{{deptList.payeeName}}
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">收款人身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写收款人身份证号" name="input"
-						v-model="deptList.payeeNumberCard"></input>
+						{{deptList.payeeNumberCard}}
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -107,7 +106,7 @@
 			<view class="c-row" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
-					<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
+					{{deptList.compAddress}}
 				</view>
 			</view>
 			</view>

pages/erpbusiness/add_quality_testing.vue

@@ -210,7 +210,7 @@
 					type:'潮粮',
 					tidalGrainPrice:'',
 					dryGrainPrice:'',
-					buckleMiscellaneous:0
+					buckleMiscellaneous:'',
 				},
 				typeList:['潮粮','干粮'],
 				managementType:'',

pages/erpbusiness/edit_quality_testing.vue

@@ -23,24 +23,22 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号"
-						 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号" name="input"></input>
 				</view>
 			</view>
 			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
-						 	 name="input"></input>
-					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" 
-						name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂"
+						@input="waterContentChange" name="input"></input>
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" name="input"></input>
 					<input v-else :disabled='flag!=1' v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂"
 						name="input"></input>
 				</view>
@@ -49,13 +47,14 @@
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<u-picker  :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
+						v-model="show" mode="selector">
 					</u-picker>
 					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber}}</view>
 					<view v-else>{{gridList.binNumber}}</view>
@@ -65,7 +64,7 @@
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -84,14 +83,13 @@
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view v-if="gridList.type == '干粮'" class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价"
-						 name="input"></input>
+					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
 		</view>
@@ -101,7 +99,8 @@
 			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
-					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
+					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1"
+						mode="selector">
 					</u-picker>
 					<view v-if='flag!=1' @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
 					<view v-else>{{gridList.grade}}</view>
@@ -110,47 +109,43 @@
 			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
-					 name="input"></input>
-					  <input v-if='flag==0' value='未复检' disabled placeholder="复检水分"
-					  	name="input"></input>
-						<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
-						 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分"
+						@input="waterContentChange" name="input"></input>
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检水分" name="input"></input>
+					<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
-					 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">热损伤（%）</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input"></input>
 				</view>
 			</view>
 		</view>
@@ -178,47 +173,58 @@
 				modalName: '',
 				mycarStyle: '',
 				feild: undefined,
-				id:0,
-				show:false,
-				selector:[],
-				show1:false,
+				id: 0,
+				show: false,
+				selector: [],
+				show1: false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
 				footprintList: [],
-				searchKeyWord:'',
+				searchKeyWord: '',
 				isVip: false,
-				flag:0,
+				flag: 0,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
-				pageSize:10,
-				currentPage:1,
+				pageSize: 10,
+				currentPage: 1,
 				gridBorder: false,
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				userphone:"",
-				username:"请更改昵称",
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
+				username: "请更改昵称",
 				gridList: {
-					natureOfGrainPurchase:'贸易粮',
-					type:'潮粮',
-					tidalGrainPrice:'',
-					dryGrainPrice:''
+					natureOfGrainPurchase: '贸易粮',
+					type: '潮粮',
+					tidalGrainPrice: '',
+					dryGrainPrice: ''
 				},
-				managementType:'',
+				managementType: '',
 				warehouseName: '',
-				warehouseList:[],
+				warehouseList: [],
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				gradeList:[
-					{key:1,value:'一等品'},
-					{key:2,value:'二等品'},
-					{key:3,value:'三等品'},
-					{key:4,value:'等外'},
+				gradeList: [{
+						key: 1,
+						value: '一等品'
+					},
+					{
+						key: 2,
+						value: '二等品'
+					},
+					{
+						key: 3,
+						value: '三等品'
+					},
+					{
+						key: 4,
+						value: '等外'
+					},
 				],
-				cangid:''
+				cangid: ''
 			}
 		},
 		// #ifndef MP
@@ -244,89 +250,91 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
-			starUserphone(){
+			starUserphone() {
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				if(this.userphone){
+				if (this.userphone) {
 					return this.userphone.replace(reg, "$1****$2");
 				}
 			}
 		},
-		onLoad(options){
-			this.id=options.id
-			this.flag=options.flag
-			this.cangid=options.cangid
-			this.managementType=options.managementType
+		onLoad(options) {
+			this.id = options.id
+			this.flag = options.flag
+			this.cangid = options.cangid
+			this.managementType = options.managementType
 		},
 		onShow() {
 			var that = this
-				this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection',{
-					id:this.id
-				}).then(res => {
-					if(res.data.data){
-						let data = res.data.data
-						that.gridList =data
-						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
-							id:this.cangid
-						}).then(res => {
-							that.warehouseList=res.data.data.warehousePositionInfoList
-							
-						})
-					}
-				})
-				this.gridList.grade=this.gradeList[0].value
-				this.gridList.gradeKey=this.gradeList[0].key
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
+				id: this.id
+			}).then(res => {
+				if (res.data.data) {
+					let data = res.data.data
+					that.gridList = data
+					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+						id: this.cangid
+					}).then(res => {
+						that.warehouseList = res.data.data.warehousePositionInfoList
+
+					})
+				}
+			})
+			this.gridList.grade = this.gradeList[0].value
+			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
 			waterContentChange() {
 				var that = this
-				if(this.gridList.goodsName && this.cangid){
-					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
-						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-							warehouseId:this.cangid,
-							goodsName:this.gridList.goodsName
+				if (this.gridList.goodsName && this.cangid) {
+					if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
+							warehouseId: this.cangid,
+							goodsName: this.gridList.goodsName
 						}).then(res => {
 							that.gridList.dryGrainPrice = res.data.data
 						})
 					}
-					
+
 				}
-				
+
 				if (this.gridList.goodsName) {
-				  for (var i = 0; i < this.purchasePriceList.length; i++) {
-					if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
-					  this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
-					  this.gridList.paramType = this.purchasePriceList[i].paramType
+					for (var i = 0; i < this.purchasePriceList.length; i++) {
+						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
+							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
+							this.gridList.paramType = this.purchasePriceList[i].paramType
+						}
 					}
-				  }
 				}
 				var numReg = /^[0-9]*$/
 				var numRe = new RegExp(numReg)
 				//潮粮单价改变事件
 				if (
-				  this.gridList.goodsName &&
-				  this.gridList.waterContent &&
-				  this.gridList.grade&&
-				  numRe.test(this.gridList.waterContent)
+					this.gridList.goodsName &&
+					this.gridList.waterContent &&
+					this.gridList.grade &&
+					numRe.test(this.gridList.waterContent)
 				) {
-					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName,
+					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+						warehouseId: this.cangid,
+						goodsName: this.gridList.goodsName,
 						waterContent: this.gridList.waterContent,
 						grade: this.gridList.grade,
 					}).then(res => {
-						if(that.gridList.paramType == '1'){
-							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that.gridList.buckleMiscellaneous)/100*parseFloat(that.gridList.dryGrainPrice)).toFixed(4)
-							if(!that.gridList.tidalGrainPrice){
+						if (that.gridList.paramType == '1') {
+							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+								.dryGrainPrice)).toFixed(4)
+							if (!that.gridList.tidalGrainPrice) {
 								that.gridList.tidalGrainPrice = ''
 							}
-						}else{
+						} else {
 							that.gridList.tidalGrainPrice = res.data.data
 						}
 					})
 				}
 			},
-			submit(){
-				this.gridList.flag=this.flag
+			submit() {
+				this.gridList.flag = this.flag
 				// if(this.flag==2){
 				// 	this.gridList.reInspector=this.userInfo.userName
 				// }
@@ -363,23 +371,25 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (this.gridList.paramType!=1&&this.gridList.buckleWeightRatio < 0 ||this.gridList.paramType!=1&&this.gridList.buckleWeightRatio > 2) {
+				if (this.gridList.paramType != 1 && this.gridList.buckleWeightRatio < 0 || this.gridList.paramType != 1 &&
+					this.gridList.buckleWeightRatio > 2) {
 					this.$api.msg('扣重比输入错误')
 					return
 				}
 				if (
-					this.gridList.paramType!=1&&String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					this.gridList.paramType != 1 && String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
 					String(this.gridList.buckleWeightRatio).length -
-					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
-					{
-						this.$api.msg('扣重比输入错误')
-						return
+					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) {
+					this.$api.msg('扣重比输入错误')
+					return
 				}
-				if (this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous > 50) {
+				if (this.flag == 0 && this.gridList.paramType == 1 && this.gridList.buckleMiscellaneous < 0 || this.flag ==
+					0 && this.gridList.paramType == 1 && this.gridList.buckleMiscellaneous > 50) {
 					this.$api.msg('初检扣杂输入错误')
 					return
 				}
-				if (this.flag==1&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous > 50) {
+				if (this.flag == 1 && this.gridList.paramType == 1 && this.gridList.reBuckleMiscellaneous < 0 || this
+					.flag == 0 && this.gridList.paramType == 1 && this.gridList.reBuckleMiscellaneous > 50) {
 					this.$api.msg('复检扣杂输入错误')
 					return
 				}
@@ -429,34 +439,35 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
-								if(res.data.code==200){
-									that.$api.msg('编辑质检成功')
-									uni.navigateBack({
-									})
-								}
-							})
+							that.$api.doRequest('post',
+									'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
+								.then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('编辑质检成功')
+										uni.navigateBack({})
+									}
+								})
 						}
 					}
 				})
 			},
-			gradepicker(e){
+			gradepicker(e) {
 				console.log(e)
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
-				this.gridList.grade=this.gradeList[e[0]].value
-				this.gridList.gradeKey=this.gradeList[e[0]].key
+				this.gridList.grade = this.gradeList[e[0]].value
+				this.gridList.gradeKey = this.gradeList[e[0]].key
 				this.waterContentChange()
 			},
-			binNumberpicker(e){
-				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			binNumberpicker(e) {
+				this.gridList.binNumber = this.warehouseList[e[0]].binNumber
 			},
-			del(item){
-				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
-					id:item.id
+			del(item) {
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection', {
+					id: item.id
 				}).then(res => {
-					if(res.data.code==200){
+					if (res.data.code == 200) {
 						this.$api.msg('删除成功')
-					}else{
+					} else {
 						this.$api.msg('系统异常，请联系管理员')
 					}
 				})
@@ -563,40 +574,50 @@
 		font-size: 18px;
 		font-weight: 550;
 	}
-	page{
-		background:#F5F6FA;
+
+	page {
+		background: #F5F6FA;
 	}
-	.wrap{
-		padding-bottom:10px;
-		font-size:14px;
-		background:#fff;margin:10px;border-radius:10px;
-		input{
-			font-size:14px;
+
+	.wrap {
+		padding-bottom: 10px;
+		font-size: 14px;
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+
+		input {
+			font-size: 14px;
 		}
-		>.title{
-			padding:10px 16px;
+
+		>.title {
+			padding: 10px 16px;
 		}
-		.b-b:after{
-			border-bottom:1px solid #eee;
+
+		.b-b:after {
+			border-bottom: 1px solid #eee;
 		}
 	}
-	.footer{
-		background:#fff;
-		position:fixed;
-		bottom:0;
-		width:100%;
-		padding:20px 10px;
-		z-index:10;
-		.button{
-			background:#22C572;
-			width:90%;
-			margin:0 auto;
-			padding:10px;
-			color:#fff;
-			text-align:center;
+
+	.footer {
+		background: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 20px 10px;
+		z-index: 10;
+
+		.button {
+			background: #22C572;
+			width: 90%;
+			margin: 0 auto;
+			padding: 10px;
+			color: #fff;
+			text-align: center;
 			border-radius: 30px;
 		}
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -607,7 +628,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -624,9 +645,8 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
+
 	input:disabled {
-		color:#ccc;
+		color: #ccc;
 	}
 </style>
-
-

pages/erpbusiness/examine_quality_testing.vue

@@ -38,6 +38,9 @@
 					{{gridList.carNumber}}
 				</view>
 			</view>
+			<view v-if="gridList.paramType != '1'"  class="c-row ">
+				<view class="title">扣重比</view>
+			</view>
 			<view v-if='managementType==1' class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
@@ -47,6 +50,15 @@
 					{{gridList.reBuckleMiscellaneous}}
 				</view>
 			</view>
+			<view v-else class="c-row ">
+				<view class="title">扣杂</view>
+				<view class="con-list">
+					<input v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
+						 name="input"></input>
+					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
+						 	 name="input"></input>
+				</view>
+			</view>
 			<view v-if='managementType==1' class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
@@ -102,7 +114,10 @@
 			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
-					{{gridList.waterContent}}
+					<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
+					 name="input"></input>
+					 <input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
+					  name="input"></input>
 				</view>
 				<view class="con-list">
 					{{gridList.rewaterContent}}

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -63,6 +63,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{retreatList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
@@ -123,6 +127,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{OutList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">发货人</view>
 							<view class="right">{{OutList.publisher}}</view>
@@ -196,6 +204,10 @@
 							<view class="left">预计入库日期</view>
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{EnterList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{EnterList.publisher}}</view>

pages/task/audit/Issueandreceipt_task_details.vue

@@ -60,6 +60,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{retreatList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
@@ -118,6 +122,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{OutList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">发货人</view>
 							<view class="right">{{OutList.publisher}}</view>
@@ -189,6 +197,10 @@
 							<view class="left">预计入库日期</view>
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
+						<view class='row'>
+							<view class="left">预估运费（元/吨）</view>
+							<view class="right">{{EnterList.estimatedFreight}}</view>
+						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{EnterList.publisher}}</view>

pages/task/audit/purchasecontract.vue

@@ -2,118 +2,124 @@
 	<view class="container">
 		<u-form ref="uForm">
 			<u-form-item label-width='260' label="合同编号">
-				{{list.contractNo}}
+				<u-input  v-model="list.contractNo" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="运输方式">
-				{{list.shippingType}}
+			<u-form-item  label-width='260' label="货名">
+				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="买方">
-				{{list.buyer}}
+				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="结算方式">
-				{{ list.settlementMethod }}
+			<u-form-item label-width='260' label="买方电话">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="卖方">
-				{{list.seller}}
+				<u-input  v-model="list.seller" input-align="right" placeholder="" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方电话">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="结算方式">
+				<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货方式">
-				{{list.deliverType1}}
+				<u-input v-model="list.deliverType1" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				{{list.buyerPhone}}
+			<u-form-item label-width='260' label="运输方式">
+				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="包装方式">
-				{{list.packingMethod}}
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				{{list.sellerPhone}}
+				<u-input v-model="list.packingMethod" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="验收方式">
-				{{list.acceptanceMethod}}
+				<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="重量（吨）">
-				{{list.weight}}
+				<u-input v-model="list.weight" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起）">
-				{{list.deliveryDateStart}}
+				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="溢短装（%）">
-				{{list.overShort}}
+				<u-input v-model="list.overShort" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（止）">
-				{{list.deliveryDateEnd}}
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同单价（元/吨）">
-				{{list.unitContractPrice}}
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同总价（元）">
-				{{list.totalContractPrice}}
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item  label-width='260' label="货源所在地区">
-				{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
 			</u-form-item>
 			<u-form-item  label-width='260' label="货源详细地址">
-				{{list.sourceGoods}}
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item  label-width='260' label="交货地所在地区">
-				{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
+				
 			</u-form-item>
 			<u-form-item  label-width='260' label="交货地详细地址">
-				{{list.placeDelivery}}
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="签订日期">
-				{{list.signingDate}}
+				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item  label-width='260' label="最终实际交易量 (吨)">
-				{{list.finalTradingVolume}}
+			<u-form-item  label-width='300' label="最终实际交易量 (吨)">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
-				{{list.personCharge}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="货名">
-				{{list.contractGoodsInfo.goodsName}}
+				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled/>
 			</u-form-item>
+			
 			<u-form-item  label-width='260' label="水分（%）<=">
-				{{list.contractGoodsInfo.waterContent}}
+				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="品级">
-				{{list.contractGoodsInfo.grade}}
+				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="杂质（%）<=">
-				{{list.contractGoodsInfo.impurity}}
+				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="容重(克/升)>=">
-				{{list.contractGoodsInfo.bulkDensity}}
+				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="霉变粒（%）<=">
-				{{list.contractGoodsInfo.mildewGrain}}
+				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="热损伤（%）<=">
-				{{list.contractGoodsInfo.jiaorenli}}
+				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="不完善粒（%）<=">
-				{{list.contractGoodsInfo.imperfectGrain}}
+				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同收入（元）">
-				{{list.contractProcessInfo.goodsNameKey}}
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="已开发票（元）">
-				{{list.contractProcessInfo.goodsName}}
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="费用支出（元）">
-				{{list.contractProcessInfo.waterContent}}
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="未开发票（元）">
-				{{list.contractProcessInfo.impurity}}
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="未回款（元）">
-				{{list.contractProcessInfo.mildewGrain}}
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="双章原件回收情况">
-				{{list.contractProcessInfo.grade}}
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="备注信息">
-				{{list.remarks}}
+				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="附件">
 				<!-- {{list.contractProcessInfo.grade}} -->
@@ -406,4 +412,8 @@
 		.confirm{
 			right:0;
 		}
+		.textCss{
+			justify-content: flex-end;
+			width: 100%;
+		}
 </style>

pages/task/audit/salecontract.vue

@@ -129,7 +129,7 @@
 				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
 				<u-icon name="close"></u-icon></view>
 				<view style='padding:10px;'>
-					<input v-model='auditMind' placeholder="请输入原因" type="text" value="" />
+					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
 				</view>
 				<view  @click='passSubmit()' class="cancel">取消</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
@@ -201,7 +201,7 @@
 			pass(){
 				console.log(1111)
 				this.show=true
-				this.title='通过原因'
+				this.title='审核意见'
 			},
 			reject() {
 				this.show=true