Explorar o código

修改 ios erp、收购业务列表过长显示不全问题

wangchao %!s(int64=3) %!d(string=hai) anos
pai
achega
8986c4a638

+ 1 - 1
pages/erp/deliveryfeedback/details.vue

@@ -937,7 +937,7 @@
 	}
 	.wrap {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 240rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 	
 		.top {
 			display: flex;

+ 61 - 34
pages/erp/exWarehousing/exWarehousing.vue

@@ -75,15 +75,17 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">出库类型</view>
-				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType" placeholder="自动获取"></input>
-			<!-- 	<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
+				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType"
+					placeholder="自动获取"></input>
+				<!-- 	<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker> -->
 			</view>
 			<view class="row">
 				<view class="left">出库方式</view>
 				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
-				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector"
+					@confirm='outtypeChange($event)'>
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -97,12 +99,15 @@
 				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
 				</u-picker> -->
 				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom"
+					placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom"
+					placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom"
+					placeholder="请输入车厢号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>
@@ -183,22 +188,44 @@
 				show6: false,
 				show7: false,
 				isPC: true,
-				show8:false,
-				usestart:'',
-				multiSelector:[
-					{name:'汽运',value:'0'},
-					{name:'火运',value:'1'},
-					{name:'集装箱船',value:'2'},
-					{name:'散船',value:'3'},
+				show8: false,
+				usestart: '',
+				multiSelector: [{
+						name: '汽运',
+						value: '0'
+					},
+					{
+						name: '火运',
+						value: '1'
+					},
+					{
+						name: '集装箱船',
+						value: '2'
+					},
+					{
+						name: '散船',
+						value: '3'
+					},
 				],
-				show9:false,
-				multiSelector1:[
-					{name:'汽运',value:'0'},
-					{name:'火运',value:'1'},
-					{name:'集装箱船',value:'2'},
-					{name:'散船',value:'3'},
+				show9: false,
+				multiSelector1: [{
+						name: '汽运',
+						value: '0'
+					},
+					{
+						name: '火运',
+						value: '1'
+					},
+					{
+						name: '集装箱船',
+						value: '2'
+					},
+					{
+						name: '散船',
+						value: '3'
+					},
 				],
-				isSelectType:true,
+				isSelectType: true,
 				// contractNoList: [{
 				// 	contractNo: ""
 				// }],
@@ -231,7 +258,7 @@
 				warehouseName: '',
 				binNumber: '',
 				detailData: {
-					outType:'汽运',
+					outType: '汽运',
 					contractNo: "请选择合同编号或移库任务编号",
 					type: "干粮",
 					grade: "请输入品级",
@@ -265,7 +292,7 @@
 		},
 		onShow() {
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
-			console.log("当前合同",_data)
+			console.log("当前合同", _data)
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.detailData.goodsName = _data.goodsName;
@@ -324,14 +351,14 @@
 			this.handler()
 		},
 		methods: {
-			toUpperCase(val){
+			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},
-			toUpperCase1(val){
+			toUpperCase1(val) {
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 			},
-			usestartChange(e){
-				this.usestart=this.multiSelector1[e].name
+			usestartChange(e) {
+				this.usestart = this.multiSelector1[e].name
 			},
 			//计算纯重
 			pureWeightCount() {
@@ -343,8 +370,8 @@
 					this.detailData.pureWeight = this.detailData.pureWeight.toFixed(3)
 				}
 			},
-			outtypeChange(e){
-				this.detailData.outType=this.multiSelector[e].name
+			outtypeChange(e) {
+				this.detailData.outType = this.multiSelector[e].name
 				console.log(e)
 			},
 			outWarehouse() {
@@ -652,11 +679,11 @@
 						return
 					}
 				}
-				if(this.detailData.boxNo){
-					this.detailData.boxNo=this.detailData.boxNo.toUpperCase()
+				if (this.detailData.boxNo) {
+					this.detailData.boxNo = this.detailData.boxNo.toUpperCase()
 				}
-				if(this.detailData.boxNoOther){
-					this.detailData.boxNoOther=this.detailData.boxNoOther.toUpperCase()
+				if (this.detailData.boxNoOther) {
+					this.detailData.boxNoOther = this.detailData.boxNoOther.toUpperCase()
 				}
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
@@ -687,7 +714,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
-									console.log(res,"报异常")
+								console.log(res, "报异常")
 								if (res.data.code == 200) {
 									that.$api.msg(title)
 									setTimeout(() => {
@@ -722,7 +749,7 @@
 
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 
 		.top {
 			display: flex;

+ 1 - 0
pages/erp/exWarehousing/selectContractNo.vue

@@ -125,6 +125,7 @@
 			padding: 10rpx 15rpx;
 			border-radius: 30rpx;
 			text-align: center;
+			overflow-x: scroll;
 		}
 	}
 

+ 1 - 1
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -695,7 +695,7 @@
 
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 
 		.top {
 			display: flex;

+ 1 - 1
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -860,7 +860,7 @@
 
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 
 		.top {
 			display: flex;

+ 1 - 3
pages/erp/receivingfeedback/details.vue

@@ -881,7 +881,6 @@
 				})
 			},
 			getImgUrl(res1,res2,res3,res4) {
-				// debugger
 				this.freightspace[res4].unloadPoundImg=res1
 				
 				// this.detailData.addressUrl = res
@@ -897,7 +896,6 @@
 				}
 			},
 			setImgUrl(val){
-				// debugger
 				for(let i = 0;i<freightspace.length;i++){
 					
 				}
@@ -952,7 +950,7 @@
 	}
 	.wrap {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 240rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 	
 		.top {
 			display: flex;

+ 1 - 1
pages/erp/warehousing/warehousing.vue

@@ -852,7 +852,7 @@
 
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
 
 		.top {
 			border-radius: 20rpx;

+ 67 - 57
pages/erpbusiness/acquisitionInspection/grossWeightDetail1.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="warp">
 		<view class="content">
-				<view class="title">
-					基本信息
-				</view>
+			<view class="title">
+				基本信息
+			</view>
 			<view class="row">
 				<view class="left">仓库</view>
 				<view class="right">{{detailData.warehouseName}}</view>
@@ -18,7 +18,7 @@
 			</view>
 			<view class="row">
 				<view class="left">车牌号</view>
-				<view  class="right">{{detailData.qualityInspectionManagement.carNumber}}</view>
+				<view class="right">{{detailData.qualityInspectionManagement.carNumber}}</view>
 			</view>
 			<view class="row">
 				<view class="left">仓位号</view>
@@ -47,22 +47,25 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重(公斤)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入毛重"></input>
+				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+					placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
 				<view class="left">净重(公斤)</view>
 				<input v-model='detailData.netWeight' 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 style="padding-bottom: 300rpx;">
+			<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>
 		</view>
-		<u-toast ref="uToast"/>
+		
+		<u-toast ref="uToast" />
 		<u-button type="primary" class="submit" @click="submit">提交</u-button>
-
 	</view>
 </template>
 
@@ -80,7 +83,7 @@
 				isAdd: true,
 				detailData: {
 					name: "",
-					qualityInspectionManagement:{}
+					qualityInspectionManagement: {}
 				}
 			}
 		},
@@ -104,11 +107,11 @@
 					this.isAdd = false;
 				}
 			},
-			calculate(){
-				this.detailData.netWeight=this.detailData.grossWeight-this.detailData.tare
+			calculate() {
+				this.detailData.netWeight = this.detailData.grossWeight - this.detailData.tare
 			},
 			getImgUrl(res) {
-				this.detailData.addressUrl=res
+				this.detailData.addressUrl = res
 				console.log(res)
 				console.log('------------res-----------')
 			},
@@ -117,50 +120,52 @@
 				console.log('------------error-----------')
 				console.log(error)
 			},
-			contractNopicker(e){
-				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
-				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
+			contractNopicker(e) {
+				this.detailData.goodsName = this.contractNoList[e[0]].goodsName
+				this.detailData.contractNo = this.contractNoList[e[0]].contractNo
 			},
-			binNumberpicker(e){
-				this.detailData.binNumber=this.positionList[e[0]].binNumber
+			binNumberpicker(e) {
+				this.detailData.binNumber = this.positionList[e[0]].binNumber
 			},
-			getWeighingManagement(){
-					this.$api.doRequest('get', '/weighingManagement/getWeighingManagement',
-					{id: this.id}).then(res => {
-						if(res.data.code==200){
+			getWeighingManagement() {
+				this.$api.doRequest('get', '/weighingManagement/getWeighingManagement', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
 						console.log(res)
 						this.detailData = res.data.data
-						}
-					})
-					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
-					{id: this.cangId}).then(res => {
-						if(res.data.code==200){
+					}
+				})
+				this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+					id: this.cangId
+				}).then(res => {
+					if (res.data.code == 200) {
 						this.positionList = res.data.data.warehousePositionInfoList
-						}
-					})
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
-						compId: '',
-						flag:5
-						}).then(res => {
-						if(res.data.code==200){
+					}
+				})
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+					compId: '',
+					flag: 5
+				}).then(res => {
+					if (res.data.code == 200) {
 						this.contractNoList = res.data.data
-						}
-					})
+					}
+				})
 			},
 			onProgress(e) {
 				console.log(e)
 			},
 			onRemove(index) {},
-			submit(){
+			submit() {
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
 				if (isNaN(this.detailData.grossWeight) ||
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
-					String(this.detailData.grossWeight).length -
-					(String(this.detailData.grossWeight).indexOf('.') + 1) >
-					1) ||
+						String(this.detailData.grossWeight).length -
+						(String(this.detailData.grossWeight).indexOf('.') + 1) >
+						1) ||
 					this.detailData.grossWeight < 1 ||
 					this.detailData.grossWeight > 100000
 				) {
@@ -169,18 +174,18 @@
 				}
 				let that = this
 				uni.showModal({
-					content:"确定提交检斤信息?",
+					content: "确定提交检斤信息?",
 					success(res) {
-						if(res.confirm){
+						if (res.confirm) {
 							that.$api.doRequest('post', '/weighingManagement/api/editGrossWeight',
-							that.detailData).then(res => {
-								if(res.data.code==200){
-								that.$api.msg('提交成功')
-								uni.navigateBack()
+								that.detailData).then(res => {
+								if (res.data.code == 200) {
+									that.$api.msg('提交成功')
+									uni.navigateBack()
 								}
 							})
 						}
-						
+
 					}
 				})
 			}
@@ -200,22 +205,24 @@
 
 	.content,
 	.content1,
-	.content2
-	{
+	.content2 {
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-		.title{
+
+		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 		}
+
 		.row {
 			display: flex;
 			justify-content: space-between;
 			padding: 21rpx 0;
 
-			.right,input {
+			.right,
+			input {
 				font-size: 28rpx;
 				color: #333333;
 			}
@@ -230,14 +237,17 @@
 			}
 		}
 	}
-	.content1{
+
+	.content1 {
 		margin-top: 20rpx;
 	}
-	.content2{
+
+	.content2 {
 		margin-top: 10px;
 		display: flex;
 		align-items: center;
-		.left{
+
+		.left {
 			margin-right: 20px;
 		}
 	}

+ 266 - 251
pages/erpbusiness/add_quality_testing.vue

@@ -28,53 +28,51 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
-						 name="input"></input>
+					<input 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 v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
-						 name="input"></input>
+					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input"></input>
 				</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>
+						name="input"></input>
 					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
-						 	 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
-					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
-						 name="input"></input>
+					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
-					<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>
 			</view>
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input type='number' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
-						 name="input"></input>
+					<input type='number' v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					<view @click='show2=true'>{{gridList.goodsName}}</view>
-					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2" mode="selector" >
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
+						mode="selector">
 					</u-picker>
 				</view>
 			</view>
@@ -82,81 +80,78 @@
 				<view class="title">类型</view>
 				<view class="con-list">
 					<view @click='show3=true'>{{gridList.type}}</view>
-					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector" >
+					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector">
 					</u-picker>
 				</view>
 			</view>
 			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
-						 name="input"></input>
+					<input v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑" 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>
-		<view style='margin-bottom:300rpx;' class='wrap'>
-			<view class='title_b'>化验信息</view>
+		<view style='padding-bottom:300rpx;'>
+			<view class='wrap'>
+				<view class='title_b'>化验信息</view>
 
-			<view class="c-row ">
-				<view class="title">等级</view>
-				<view class="con-list">
-					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
-					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
-					</u-picker>
+				<view class="c-row ">
+					<view class="title">等级</view>
+					<view class="con-list">
+						<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+						<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1"
+							mode="selector">
+						</u-picker>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">水分(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
-					 name="input"></input>
-					 <input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
-					  name="input"></input>
+				<view class="c-row ">
+					<view class="title">水分(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
+							name="input"></input>
+						<input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
+							name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">容重(克/升)</view>
-				<view class="con-list">
-					<input v-model='gridList.bulkDensity' placeholder="请输入容重" 
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">容重(克/升)</view>
+					<view class="con-list">
+						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">不完善粒(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
-						 name="input"></input>
+				<view class="c-row ">
+					<view class="title">不完善粒(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">杂质(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">杂质(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.impurity' placeholder="请输入杂质占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">霉变粒(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">霉变粒(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row">
-				<view class="title">热损伤(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-					 name="input"></input>
+				<view class="c-row">
+					<view class="title">热损伤(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input"></input>
+					</view>
 				</view>
 			</view>
 		</view>
+
 		<view class="footer">
 			<view @click='submit' class="button">提交</view>
 		</view>
@@ -181,53 +176,64 @@
 				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,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
-				pageSize:10,
-				show3:false,
-				show2:false,
-				goodsList:[],
-				currentPage:1,
+				pageSize: 10,
+				show3: false,
+				show2: false,
+				goodsList: [],
+				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:'',
-					buckleMiscellaneous:'',
+					natureOfGrainPurchase: '贸易粮',
+					type: '潮粮',
+					tidalGrainPrice: '',
+					dryGrainPrice: '',
+					buckleMiscellaneous: '',
 				},
-				typeList:['潮粮','干粮'],
-				managementType:'',
+				typeList: ['潮粮', '干粮'],
+				managementType: '',
 				warehouseName: '',
-				warehouseList:[],
-				warehouseCount:'',
-				commonWarehouseNo:'',
+				warehouseList: [],
+				warehouseCount: '',
+				commonWarehouseNo: '',
 				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
@@ -253,131 +259,133 @@
 		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.commonWarehouseNo=options.commonWarehouseNo
-			this.warehouseCount=Number(options.warehouseCount) + 1
-			 let number = '000' + this.warehouseCount
-			 number = number.substring(number.length - 4, number.length)
-			this.gridList.warehouseName=options.warehouseName
-			this.gridList.qualityNo='SGRK' + this.getdate() + this.commonWarehouseNo + number
-			this.cangid=options.cangid
-			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName',{
-				warehouseId:this.cangid
+		onLoad(options) {
+
+			this.commonWarehouseNo = options.commonWarehouseNo
+			this.warehouseCount = Number(options.warehouseCount) + 1
+			let number = '000' + this.warehouseCount
+			number = number.substring(number.length - 4, number.length)
+			this.gridList.warehouseName = options.warehouseName
+			this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
+			this.cangid = options.cangid
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.cangid
 			}).then(res => {
-				if(res.data.data){
-					
+				if (res.data.data) {
+
 				}
 			})
-			this.managementType=options.managementType
+			this.managementType = options.managementType
 		},
 		onShow() {
-			this.purchasePriceList=uni.getStorageSync('purchasePriceList')
-			if(uni.getStorageSync('checkcustomer')){
-				this.gridList.customerName=uni.getStorageSync('checkcustomer').customerName
-				this.gridList.customerPhone=uni.getStorageSync('checkcustomer').customerPhone
+			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
+			if (uni.getStorageSync('checkcustomer')) {
+				this.gridList.customerName = uni.getStorageSync('checkcustomer').customerName
+				this.gridList.customerPhone = uni.getStorageSync('checkcustomer').customerPhone
 			}
-			this.gridList.grade=this.gradeList[0].value
-			this.gridList.gradeKey=this.gradeList[0].key
+			this.gridList.grade = this.gradeList[0].value
+			this.gridList.gradeKey = this.gradeList[0].key
 			var that = this
-				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer',{
-					compId:'',
-					authenticationStatusKey:7
-				}).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.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName',{
-					warehouseId:this.cangid
-				}).then(res => {
-					if(res.data.data){
-						that.goodsList = res.data.data
-						if(that.goodsList.length > 0){
-							that.gridList.goodsName=that.goodsList[0].goodsName
-							uni.setStorageSync('purchasePriceList',that.goodsList)
-							that.purchasePriceList=uni.getStorageSync('purchasePriceList')
-							that.waterContentChange()
-						}
-						
-						// for (let i = 0; i < res.data.data.length; i++) {
-						// 	this.goodsList.push(res.data.data[i].goodsName)
-						// }
-							// if(this.goodsList.some(item=>{return item.goodsName=='玉米'})){
-							// 	this.gridList.goodsName='玉米'
-							// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
-							// }else{
-							// 	this.gridList.goodsName=this.goodsList[0].goodsName
-							// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
-							// }
+			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+				compId: '',
+				authenticationStatusKey: 7
+			}).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.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.cangid
+			}).then(res => {
+				if (res.data.data) {
+					that.goodsList = res.data.data
+					if (that.goodsList.length > 0) {
+						that.gridList.goodsName = that.goodsList[0].goodsName
+						uni.setStorageSync('purchasePriceList', that.goodsList)
+						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
+						that.waterContentChange()
 					}
-				})
+
+					// for (let i = 0; i < res.data.data.length; i++) {
+					// 	this.goodsList.push(res.data.data[i].goodsName)
+					// }
+					// if(this.goodsList.some(item=>{return item.goodsName=='玉米'})){
+					// 	this.gridList.goodsName='玉米'
+					// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
+					// }else{
+					// 	this.gridList.goodsName=this.goodsList[0].goodsName
+					// 	uni.setStorageSync('goodsName',this.gridList.goodsName)
+					// }
+				}
+			})
 		},
 		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
 						}
 					})
 				}
 			},
-			gocustomer(){
+			gocustomer() {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/customer?cangid='+this.cangid
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid
 				})
 			},
 			getdate() {
@@ -386,14 +394,14 @@
 				var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
 				var datetime = date.getDate() //获取当前日(1-31)
 				if (mouth < 10) {
-				  mouth = '0' + mouth
+					mouth = '0' + mouth
 				}
 				if (datetime < 10) {
-				  datetime = '0' + datetime
+					datetime = '0' + datetime
 				}
-				return year +'' + mouth + '' + datetime
+				return year + '' + mouth + '' + datetime
 			},
-			submit(){
+			submit() {
 				var that = this
 				if (!this.gridList.qualityNo) {
 					this.$api.msg('编号不能为空')
@@ -427,17 +435,16 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (this.gridList.buckleWeightRatio < 0 ||this.gridList.buckleWeightRatio > 2) {
+				if (this.gridList.buckleWeightRatio < 0 || this.gridList.buckleWeightRatio > 2) {
 					this.$api.msg('扣重比输入错误')
 					return
 				}
 				if (
 					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.gridList.type) {
 					this.$api.msg('类型不能为空')
@@ -481,63 +488,64 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/addQualityInspection',that.gridList).then(res => {
-								if(res.data.code==200){
-									that.$api.msg('提交成功')
-									uni.navigateBack({
-									})
-								}else{
-									hat.$api.msg('提交失败')
-								}
-							})
+							that.$api.doRequest('post',
+									'/qualityInspectionManagement/api/addQualityInspection', that.gridList)
+								.then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										uni.navigateBack({})
+									} else {
+										hat.$api.msg('提交失败')
+									}
+								})
 						}
 					}
 				})
 			},
-			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()
 			},
-			goodspicker(e){
+			goodspicker(e) {
 				console.log(e)
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
-				this.gridList.goodsName=this.goodsList[e[0]].goodsName
-				uni.setStorageSync('goodsName',this.gridList.goodsName)
-				if(this.gridList.type == "干粮" && this.gridList.goodsName){
-				  this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-					warehouseId:this.cangid,
-					goodsName:this.gridList.goodsName
-				  }).then(res => {
-					that.gridList.dryGrainPrice = res.data.data
-				  })
+				this.gridList.goodsName = this.goodsList[e[0]].goodsName
+				uni.setStorageSync('goodsName', this.gridList.goodsName)
+				if (this.gridList.type == "干粮" && this.gridList.goodsName) {
+					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
+						warehouseId: this.cangid,
+						goodsName: this.gridList.goodsName
+					}).then(res => {
+						that.gridList.dryGrainPrice = res.data.data
+					})
 				}
 				this.waterContentChange()
 			},
-			typepicker(e){
+			typepicker(e) {
 				var that = this
-				this.gridList.type=this.typeList[e[0]]
-				if(this.gridList.type == "干粮" &&this.gridList.goodsName){
-				  this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-					warehouseId:this.cangid,
-					goodsName:this.gridList.goodsName
-				  }).then(res => {
-					that.gridList.dryGrainPrice = res.data.data
-				  })
+				this.gridList.type = this.typeList[e[0]]
+				if (this.gridList.type == "干粮" && this.gridList.goodsName) {
+					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
+						warehouseId: this.cangid,
+						goodsName: this.gridList.goodsName
+					}).then(res => {
+						that.gridList.dryGrainPrice = res.data.data
+					})
 				}
 			},
-			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('系统异常,请联系管理员')
 					}
 				})
@@ -638,15 +646,17 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
+
 	.title_b {
 		margin: 20rpx 20rpx 0rpx 20rpx;
 		padding: 20rpx 10rpx 20rpx 10rpx;
 		font-size: 18px;
 		font-weight: 550;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -657,7 +667,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -674,35 +684,40 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
-	.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;
 		}
-		
+
 	}
-	.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;
 		}
 	}
 </style>
-
-

+ 52 - 46
pages/erpbusiness/edit_quality_testing.vue

@@ -93,62 +93,68 @@
 				</view>
 			</view>
 		</view>
-		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title_b'>化验信息</view>
+		<view style='padding-bottom:300rpx;'>
+			<view class='wrap'>
+				<view class='title_b'>化验信息</view>
 
-			<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>
-					<view v-if='flag!=1' @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
-					<view v-else>{{gridList.grade}}</view>
+				<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>
+						<view v-if='flag!=1' @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+						<view v-else>{{gridList.grade}}</view>
+					</view>
 				</view>
-			</view>
-			<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>
+				<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>
+					</view>
 				</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>
+				<view class="c-row ">
+					<view class="title">容重(克/升)</view>
+					<view class="con-list">
+						<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重"
+							name="input"></input>
+					</view>
 				</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>
+				<view class="c-row ">
+					<view class="title">不完善粒(%)</view>
+					<view class="con-list">
+						<input :disabled='flag==1' v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
+							name="input"></input>
+					</view>
 				</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>
+				<view class="c-row ">
+					<view class="title">杂质(%)</view>
+					<view class="con-list">
+						<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比"
+							name="input"></input>
+					</view>
 				</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>
+				<view class="c-row ">
+					<view class="title">霉变粒(%)</view>
+					<view class="con-list">
+						<input :disabled='flag==1' v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
+							name="input"></input>
+					</view>
 				</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>
+				<view class="c-row ">
+					<view class="title">热损伤(%)</view>
+					<view class="con-list">
+						<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+							name="input"></input>
+					</view>
 				</view>
 			</view>
 		</view>
+
 		<view class="footer">
 			<view @click='submit' class="button">提交</view>
 		</view>

+ 148 - 126
pages/erpbusiness/examine_quality_testing.vue

@@ -38,7 +38,7 @@
 					{{gridList.carNumber}}
 				</view>
 			</view>
-			<view v-if="gridList.paramType != '1'"  class="c-row ">
+			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
 			</view>
 			<view v-if='managementType==1' class="c-row ">
@@ -54,9 +54,9 @@
 				<view class="title">扣杂</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
-						 name="input"></input>
+						name="input"></input>
 					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
-						 	 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view v-if='managementType==1' class="c-row ">
@@ -102,59 +102,62 @@
 				</view>
 			</view>
 		</view>
-		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title_b'>化验信息</view>
+		<view style='margin-bottom:300rpx;'>
+			<view class='wrap'>
+				<view class='title_b'>化验信息</view>
 
-			<view class="c-row ">
-				<view class="title">等级</view>
-				<view class="con-list">
-					{{gridList.grade}}
+				<view class="c-row ">
+					<view class="title">等级</view>
+					<view class="con-list">
+						{{gridList.grade}}
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">水分(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
-					 name="input"></input>
-					 <input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
-					  name="input"></input>
+				<view class="c-row ">
+					<view class="title">水分(%)</view>
+					<view class="con-list">
+						<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}}
+					</view>
+
 				</view>
-				<view class="con-list">
-					{{gridList.rewaterContent}}
+				<view class="c-row ">
+					<view class="title">容重(克/升)</view>
+					<view class="con-list">
+						{{gridList.bulkDensity}}
+					</view>
 				</view>
-				
-			</view>
-			<view class="c-row ">
-				<view class="title">容重(克/升)</view>
-				<view class="con-list">
-					{{gridList.bulkDensity}}
+				<view class="c-row ">
+					<view class="title">不完善粒(%)</view>
+					<view class="con-list">
+						{{gridList.imperfectGrain}}
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">不完善粒(%)</view>
-				<view class="con-list">
-					{{gridList.imperfectGrain}}
-				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">杂质(%)</view>
-				<view class="con-list">
-					{{gridList.impurity}}
+				<view class="c-row ">
+					<view class="title">杂质(%)</view>
+					<view class="con-list">
+						{{gridList.impurity}}
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">霉变粒(%)</view>
-				<view class="con-list">
-					{{gridList.mildewGrain}}
+				<view class="c-row ">
+					<view class="title">霉变粒(%)</view>
+					<view class="con-list">
+						{{gridList.mildewGrain}}
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">热损伤(%)</view>
-				<view class="con-list">
-					{{gridList.jiaorenli}}
+				<view class="c-row ">
+					<view class="title">热损伤(%)</view>
+					<view class="con-list">
+						{{gridList.jiaorenli}}
+					</view>
 				</view>
 			</view>
 		</view>
+
 	</view>
 </template>
 
@@ -176,48 +179,59 @@
 				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,
 				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: {
-					type:'潮粮'
+					type: '潮粮'
 				},
-				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: ''
 			}
 		},
-		
+
 		onLoad() {
-			
+
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -242,57 +256,57 @@
 		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){
+		onLoad(options) {
 			console.log(options)
-			this.id=options.id
-			this.cangid=options.cangid
-			this.managementType=options.managementType
+			this.id = options.id
+			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.$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
+					})
+				}
+			})
 		},
 		methods: {
-			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
 			},
-			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('系统异常,请联系管理员')
 					}
 				})
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -403,15 +417,17 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
+
 	.title_b {
 		margin: 20rpx 20rpx 0rpx 20rpx;
 		padding: 20rpx 10rpx 20rpx 10rpx;
 		font-size: 18px;
 		font-weight: 550;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -422,7 +438,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -439,37 +455,43 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
-	.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;
 		}
 	}
 </style>
-
-

+ 148 - 132
pages/erpbusiness/out_quality_testing.vue

@@ -23,80 +23,77 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
-						 name="input"></input>
+					<input v-model='gridList.carNumber' placeholder="请输入车牌号" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber}}</view>
-					<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>
 			</view>
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
-						 name="input"></input>
+					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 		</view>
-		<view style='margin-bottom:100px;' class='wrap'>
-			<view class='title_b'>化验信息</view>
+		<view style='margin-bottom:300rpx;'>
+			<view class='wrap'>
+				<view class='title_b'>化验信息</view>
 
-			<view class="c-row ">
-				<view class="title">等级</view>
-				<view class="con-list">
-					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
-					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
-					</u-picker>
+				<view class="c-row ">
+					<view class="title">等级</view>
+					<view class="con-list">
+						<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+						<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1"
+							mode="selector">
+						</u-picker>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">水分(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.waterContent' placeholder="请输入水分占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">水分(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.waterContent' placeholder="请输入水分占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">容重(克/升)</view>
-				<view class="con-list">
-					<input v-model='gridList.bulkDensity' placeholder="请输入容重"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">容重(克/升)</view>
+					<view class="con-list">
+						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">不完善粒(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
-						 name="input"></input>
+				<view class="c-row ">
+					<view class="title">不完善粒(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">杂质(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">杂质(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.impurity' placeholder="请输入杂质占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">霉变粒(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">霉变粒(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比" name="input"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row ">
-				<view class="title">热损伤(%)</view>
-				<view class="con-list">
-					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-					 name="input"></input>
+				<view class="c-row ">
+					<view class="title">热损伤(%)</view>
+					<view class="con-list">
+						<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input"></input>
+					</view>
 				</view>
 			</view>
 		</view>
+
 		<view class="footer">
 			<view @click='submit' class="button">提交</view>
 		</view>
@@ -121,41 +118,52 @@
 				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,
 				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: {},
-				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
@@ -181,36 +189,36 @@
 		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.cangid=options.cangid
-			this.managementType=options.managementType
+		onLoad(options) {
+			this.id = options.id
+			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.$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
+					})
+				}
+			})
 		},
 		methods: {
-			submit(){
+			submit() {
 				var that = this
 				if (!this.gridList.contractNo) {
 					this.$api.msg('编号不能为空')
@@ -274,38 +282,39 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/addQualityInspectionOut',that.gridList).then(res => {
-								if(res.data.code==200){
-									that.$api.msg('提交成功')
-									uni.navigateBack({
-									})
-								}
-							})
+							that.$api.doRequest('post',
+									'/qualityInspectionManagement/api/addQualityInspectionOut', 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
 			},
-			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('系统异常,请联系管理员')
 					}
 				})
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -416,15 +425,17 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
+
 	.title_b {
 		margin: 20rpx 20rpx 0rpx 20rpx;
 		padding: 20rpx 10rpx 20rpx 10rpx;
 		font-size: 18px;
 		font-weight: 550;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -435,7 +446,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -452,34 +463,39 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
-	.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;
 		}
 	}
-	.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;
 		}
 	}
 </style>
-
-

+ 291 - 244
pages/erpbusiness/quality_testing.vue

@@ -2,27 +2,27 @@
 	<view class="center">
 		<view class='navbar' style='position:fixed;background:#fff;top:0;width:100%;z-index:3;'>
 			<view class="back-btn cuIcon-back" @click="navBack"></view>
-				<view class='header-content' v-if='managementType==3'>出库质检</view>
-				<view class='header-content' v-if='managementType==1'>收购质检</view>
+			<view class='header-content' v-if='managementType==3'>出库质检</view>
+			<view class='header-content' v-if='managementType==1'>收购质检</view>
 		</view>
-		
 		<view class="header">
-
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 				<view style='flex:6;' class="search-form round Medium">
 					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-					<input v-if='managementType==1' type="text" maxlength="20"  v-model="searchKeyWord" @confirm="doSearch()"
-						 placeholder="输入编号、客户名、车牌号" confirm-type="search"></input>
-					<input v-if='managementType==3' type="text" maxlength="20"  v-model="searchKeyWord" @confirm="doSearch()"
-						 placeholder="输入合同编号、车牌号" confirm-type="search"></input>
+					<input v-if='managementType==1' type="text" maxlength="20" v-model="searchKeyWord"
+						@confirm="doSearch()" placeholder="输入编号、客户名、车牌号" confirm-type="search"></input>
+					<input v-if='managementType==3' type="text" maxlength="20" v-model="searchKeyWord"
+						@confirm="doSearch()" placeholder="输入合同编号、车牌号" confirm-type="search"></input>
 				</view>
 				<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
-				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34" name="close-circle-fill" color="#D6D9E0"></u-icon>
+				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34"
+					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 			<view class='changewarehouse'>
 				<view @click='show=true'>{{warehouseName}}<text class='cuIcon-unfold'></text></view>
-				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"  :range="selector"></u-picker>
+				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show"
+					:range="selector"></u-picker>
 			</view>
 		</view>
 		<view class="content">
@@ -37,8 +37,8 @@
 						<view class="left status3" v-if="item.confirm=='1'">确</view>
 						<view>
 							<view class="top-title">
-								<view  v-if='managementType==1' >{{item.qualityNo}}</view>
-								<view  v-if='managementType==3' >{{item.contractNo}}</view>
+								<view v-if='managementType==1'>{{item.qualityNo}}</view>
+								<view v-if='managementType==3'>{{item.contractNo}}</view>
 							</view>
 							<view class="bottom">{{item.updateDate}}</view>
 						</view>
@@ -46,17 +46,24 @@
 					<view class="right">{{item.customer}}</view>
 					<view class='right'>{{item.qualityInspector}} {{item.reInspector}}</view>
 				</view>
-				<view class="row2" >
+				<view class="row2">
 					<view v-if='managementType==1'>{{item.customerName}}</view>
 					<view>{{item.carNumber}}</view>
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
 				<view class="row3">
-					<view v-if='getRoles("acquisitionQuality.delete")&&item.weighingManagement&&item.weighingManagement.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
-						<view v-if='getRoles("acquisitionQuality.initial")&&item.status=="已初检"&&managementType==1' @click.stop='edit(item,0)' class='button'>初检</view>
-						<view v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' class='button'>确认</view>
-						<view v-if='getRoles("acquisitionQuality.again")&&item.confirm!="1"&&managementType==1' @click.stop='edit(item,1)' class='button'>复检</view>
-						<view v-if='getRoles("acquisitionQualityOut.edit")&&item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+					<view
+						v-if='getRoles("acquisitionQuality.delete")&&item.weighingManagement&&item.weighingManagement.status=="已质检"&&managementType==1'
+						@click.stop='del(item)' class='button'>删除</view>
+					<view v-if='getRoles("acquisitionQuality.initial")&&item.status=="已初检"&&managementType==1'
+						@click.stop='edit(item,0)' class='button'>初检</view>
+					<view
+						v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1'
+						@click.stop='edit(item,2)' class='button'>确认</view>
+					<view v-if='getRoles("acquisitionQuality.again")&&item.confirm!="1"&&managementType==1'
+						@click.stop='edit(item,1)' class='button'>复检</view>
+					<view v-if='getRoles("acquisitionQualityOut.edit")&&item.status=="已称毛重"&&managementType==3'
+						@click.stop='quality_testing(item)' class='button'>质检</view>
 				</view>
 			</view>
 			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
@@ -89,13 +96,13 @@
 				<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 			</view>
 		</view> -->
-		<!-- <view class='flex buttons'>
+			<!-- <view class='flex buttons'>
 			<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
 			<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
 			<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 		</view> -->
 		</view>
-		
+
 		<view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
@@ -122,38 +129,38 @@
 				modalName: '',
 				mycarStyle: '',
 				feild: undefined,
-				params:{},
-				selector:[],
-				isContent:false,
-				loadStatus:'noMore',
+				params: {},
+				selector: [],
+				isContent: false,
+				loadStatus: 'noMore',
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
 				footprintList: [],
-				searchKeyWord:'',
+				searchKeyWord: '',
 				isVip: false,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
-				show:false,
-				pageSize:10,
-				currentPage:1,
+				show: false,
+				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: [],
-				managementType:1,
+				managementType: 1,
 				warehouseName: '',
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				warehouseCount:'',
-				commonWarehouseNo:'',
-				cangid:''
-				
+				warehouseCount: '',
+				commonWarehouseNo: '',
+				cangid: ''
+
 			}
 		},
 		// #ifndef MP
@@ -179,61 +186,60 @@
 		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");
 				}
 			}
 		},
 		onPullDownRefresh() {
-			this.currentPage=1
-			this.gridList=[]
+			this.currentPage = 1
+			this.gridList = []
 			this.getList(true)
-			setTimeout(function () {
+			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
-		 onReachBottom() {
-			 this.currentPage+=1
-		    this.getList(false)
+		onReachBottom() {
+			this.currentPage += 1
+			this.getList(false)
 			// this.getMoreNews()
 		},
-		onLoad(options){
-			this.managementType=options.managementType
+		onLoad(options) {
+			this.managementType = options.managementType
 		},
 		onShow() {
 			this.pageSize = 10
 			this.currentPage = 1
 			var that = this
-			if(this.cangid){
-				uni.setStorageSync("cangid",this.cangid)
-			}
-			else{
+			if (this.cangid) {
+				uni.setStorageSync("cangid", this.cangid)
+			} else {
 				this.cangid = uni.getStorageSync("cangid")
 			}
-			this.gridList=[]
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf',{
-				compId:'',
-				personCharge:this.userInfo.phone
+			this.gridList = []
+			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
+				compId: '',
+				personCharge: this.userInfo.phone
 			}).then(res => {
-				if(res.data.data){
+				if (res.data.data) {
 					let list = res.data.data
-					for(var i=0;i<list.length;i++){
-						if (that.cangid&&that.cangid == list[i].id) {
-						  that.warehouseName = list[i].warehouseName
-						  that.warehouseCount =  list[i].count
-						  that.commonWarehouseNo =  list[i].commonWarehouseNo
-						  // uni.setStorageSync('purchasePriceList',list[i].purchasePriceList)
-						  break
-						} 
+					for (var i = 0; i < list.length; i++) {
+						if (that.cangid && that.cangid == list[i].id) {
+							that.warehouseName = list[i].warehouseName
+							that.warehouseCount = list[i].count
+							that.commonWarehouseNo = list[i].commonWarehouseNo
+							// uni.setStorageSync('purchasePriceList',list[i].purchasePriceList)
+							break
+						}
 					}
-					that.selector=res.data.data
-					if(that.selector.length > 0 && !that.cangid){
+					that.selector = res.data.data
+					if (that.selector.length > 0 && !that.cangid) {
 						that.warehouseName = that.selector[0].warehouseName
-						that.warehouseCount =  that.selector[0].count
-						that.commonWarehouseNo =  that.selector[0].commonWarehouseNo
-						that.cangid =  that.selector[0].id
+						that.warehouseCount = that.selector[0].count
+						that.commonWarehouseNo = that.selector[0].commonWarehouseNo
+						that.cangid = that.selector[0].id
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)
 					}
 					this.getList(true)
@@ -246,112 +252,117 @@
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {
-						 return true
-					} 
+						return true
+					}
 				}
 				return false
 			},
-			quality_testing(item){
+			quality_testing(item) {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/out_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+					url: '/pages/erpbusiness/out_quality_testing?id=' + item.id + '&managementType=' + this
+						.managementType + '&cangid=' + this.cangid
 				})
 			},
-			examine(item){
+			examine(item) {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/examine_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+					url: '/pages/erpbusiness/examine_quality_testing?id=' + item.id + '&managementType=' + this
+						.managementType + '&cangid=' + this.cangid
 				})
 			},
-			emptysearch(){
-				this.searchKeyWord=''
-				this.gridList=[]
-				this.currentPage=1
+			emptysearch() {
+				this.searchKeyWord = ''
+				this.gridList = []
+				this.currentPage = 1
 				this.getList(true)
 			},
-			doSearch(){
-				this.gridList=[]
-				this.currentPage=1
+			doSearch() {
+				this.gridList = []
+				this.currentPage = 1
 				this.getList(true)
 			},
-			warehousechange(e){
-				this.warehouseName=this.selector[e[0]].warehouseName
-				this.cangid=this.selector[e[0]].id
-				uni.setStorageSync("cangid",this.cangid)
+			warehousechange(e) {
+				this.warehouseName = this.selector[e[0]].warehouseName
+				this.cangid = this.selector[e[0]].id
+				uni.setStorageSync("cangid", this.cangid)
 				this.warehouseCount = this.selector[e[0]].count
-				this.commonWarehouseNo=this.selector[e[0]].commonWarehouseNo
+				this.commonWarehouseNo = this.selector[e[0]].commonWarehouseNo
 				// uni.setStorageSync('purchasePriceList',this.selector[e[0]].purchasePriceList)
 				this.getList(true)
 				console.log(e)
 			},
-			getList(flag){
+			getList(flag) {
 				var that = this
 				uni.showLoading({
-					title:"正在加载"
+					title: "正在加载"
 				})
-				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection',{
-					pageSize: this.pageSize,
-					currentPage: this.currentPage,
-					searchKeyWord: this.searchKeyWord,
-					searchType: this.searchType,
-					managementType:this.managementType,
-					warehouseName: this.warehouseName,
-					compId:'',
-					// pcFlag:1
-				}).then(res => {
-					uni.hideLoading()
-					if(res.data.data){
-						let data = res.data.data.records
-						//采购信息
-						if (data.length > 0) {
-							if(flag){
-								that.gridList = data
-							}
-							else{
-								that.gridList = that.gridList.concat(data)
-							}
-						}else{
-							if(this.currentPage==1){
-								that.gridList=[]
+				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection', {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						searchKeyWord: this.searchKeyWord,
+						searchType: this.searchType,
+						managementType: this.managementType,
+						warehouseName: this.warehouseName,
+						compId: '',
+						// pcFlag:1
+					}).then(res => {
+						uni.hideLoading()
+						if (res.data.data) {
+							let data = res.data.data.records
+							//采购信息
+							if (data.length > 0) {
+								if (flag) {
+									that.gridList = data
+								} else {
+									that.gridList = that.gridList.concat(data)
+								}
+							} else {
+								if (this.currentPage == 1) {
+									that.gridList = []
+								}
+								this.isContent = true
 							}
-							this.isContent=true
 						}
-					}
-					// console.log(that.gridList)
-				})
-				.catch(res => {
-					uni.showToast({
-						title: '系统异常,请联系管理员',
-						icon: 'none',
-						duration: 2000
+						// console.log(that.gridList)
+					})
+					.catch(res => {
+						uni.showToast({
+							title: '系统异常,请联系管理员',
+							icon: 'none',
+							duration: 2000
+						})
+						uni.hideLoading()
 					})
-					uni.hideLoading()
-				})
 			},
-			edit(item,status){
+			edit(item, status) {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid+'&flag='+status
+					url: '/pages/erpbusiness/edit_quality_testing?id=' + item.id + '&managementType=' + this
+						.managementType + '&cangid=' + this.cangid + '&flag=' + status
 				})
 			},
-			add(){
+			add() {
 				uni.navigateTo({
-					url:'/pages/erpbusiness/add_quality_testing?managementType='+this.managementType+'&cangid='+this.cangid+'&warehouseCount='+this.warehouseCount+'&commonWarehouseNo='+this.commonWarehouseNo+'&warehouseName='+this.warehouseName
+					url: '/pages/erpbusiness/add_quality_testing?managementType=' + this.managementType +
+						'&cangid=' + this.cangid + '&warehouseCount=' + this.warehouseCount +
+						'&commonWarehouseNo=' + this.commonWarehouseNo + '&warehouseName=' + this.warehouseName
 				})
 			},
-			del(item){
-				var that=this
+			del(item) {
+				var that = this
 				uni.showModal({
 					content: "是否删除该质检信息?",
 					showCancel: true,
 					confirmText: '删除',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/deleteQualityInspection',{
-								id:item.id
-							}).then(res => {
-								if(res.data.code==200){
+							that.$api.doRequest('post',
+								'/qualityInspectionManagement/api/deleteQualityInspection', {
+									id: item.id
+								}).then(res => {
+								if (res.data.code == 200) {
 									that.$api.msg('删除成功')
-									that.gridList=[]
+									that.gridList = []
 									that.getList()
-								}else{
+								} else {
 									that.$api.msg('系统异常,请联系管理员')
 								}
 							})
@@ -359,7 +370,7 @@
 					}
 				})
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -461,12 +472,12 @@
 		}
 	}
 </script>
-<style scoped lang='scss' >
-	page{
-		background:#F5F6FA;		
-		margin-bottom:160rpx;
+<style scoped lang='scss'>
+	page {
+		background: #F5F6FA;
+		margin-bottom: 160rpx;
 	}
-	
+
 	.container {
 		padding-top: 85px;
 		padding-top: 35px;
@@ -479,44 +490,45 @@
 		background-size: 100% 100%;
 		margin: 0 auto;
 	}
+
 	.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;
@@ -527,14 +539,15 @@
 			color: #878C9C;
 			align-items: center;
 		}
-	
+
 		.row3 {
 			display: flex;
 			margin-top: 30rpx;
+
 			.row3-item {
 				display: flex;
 				margin-right: 40rpx;
-	
+
 				.left {
 					background: #22C572;
 					border-radius: 10rpx;
@@ -546,12 +559,12 @@
 				}
 			}
 		}
-	
+
 		.row4 {
 			display: flex;
 			justify-content: flex-end;
 			margin-top: 10px;
-	
+
 			.right {
 				border: 1px solid #CDCDCD;
 				border-radius: 45rpx;
@@ -559,8 +572,9 @@
 				margin-left: 20rpx;
 			}
 		}
-	
+
 	}
+
 	.cu-tag.badge {
 		right: 26rpx;
 	}
@@ -584,6 +598,7 @@
 		color: #fff;
 		font-size: 32rpx;
 	}
+
 	@keyframes move_wave {
 		0% {
 			transform: translateX(0) translateZ(0) scaleY(1)
@@ -631,10 +646,11 @@
 		border-radius: 10upx;
 	}
 
-.cuIcon {
+	.cuIcon {
 		position: absolute;
 		right: 80px;
 	}
+
 	.grid-item-box {
 		flex: 1;
 		/* position: relative;
@@ -675,12 +691,13 @@
 			/* opacity: .7; */
 		}
 	}
+
 	.cover-container {
-		padding: 1px 10px ;
+		padding: 1px 10px;
 		padding-bottom: 200upx;
-		
-	   /* background-color: #F5F6FA; */
-	/* 	border-radius: 20px; */
+
+		/* background-color: #F5F6FA; */
+		/* 	border-radius: 20px; */
 		margin-top: 60upx;
 
 		.arc {
@@ -770,7 +787,8 @@
 			}
 		}
 	}
-.search-form {
+
+	.search-form {
 		background: #F5F6F9;
 	}
 
@@ -829,6 +847,7 @@
 		width: 100%;
 		background-color: rgb(242, 242, 242);
 	}
+
 	.grid {
 		display: flex;
 		align-items: center;
@@ -881,14 +900,17 @@
 		border-radius: 40px;
 		border: 2px solid #ffffff;
 	}
+
 	.information {
 		font-size: 15px;
 		font-weight: 600;
 		height: 36px;
 	}
-	.cu-list>.cu-item:after{
-		border:none;
+
+	.cu-list>.cu-item:after {
+		border: none;
 	}
+
 	.back-btn {
 		position: fixed;
 		left: 40upx;
@@ -898,9 +920,11 @@
 		font-size: 36upx;
 		color: $font-color-dark;
 	}
-	.navbar{
-		height:50px;
+
+	.navbar {
+		height: 50px;
 	}
+
 	.header-content {
 		position: fixed;
 		left: 50%;
@@ -911,106 +935,129 @@
 		font-size: 36upx;
 		color: $font-color-dark;
 	}
-	.sign{
+
+	.sign {
 		width: 40px;
 		height: 40px;
 		top: 4px;
 		margin-right: 6px;
 	}
-	.indexUp{
-		padding:0 20px;
+
+	.indexUp {
+		padding: 0 20px;
 		align-items: center;
 	}
-	.wrap{
-		background:#fff;
-		margin:10px;
-		border-radius:10px;
-		padding:10px;
-		
-	}
-	.qualityNo{
-		font-size:16px;
-	}
-	.type{
-		font-size:12px;
-		color:#fff;
-		padding:3px 5px;
-		border-radius:50%;
-		line-height:16px;
-	}
-	.type-zhi{
-		background:#22C572;
-	}
-	.type-mao{
-		background:#3296FA;
-	}
-	.type-pi{
-		background:#FD714F;
-	}
-	.time{
-		font-size:12px;
-		color:#878C9C;
-	}
-	.qualityInspector{
-		font-size:14px;
-	}
-	.customerinformation{
-		background:#F9F9FA;
-		padding:7px;
-		margin:20px 0;
-		border-radius:10px;
-		color:#9698A2;
-	}
-	.buttons{
-		flex-direction:row-reverse;
-	}
-	.button{
-		padding:13rpx 30rpx;
-		border:1px solid #CDCDCD;
-		border-radius:15px;
-		margin:0 10px;
-	}
-	.changewarehouse{
-		padding:10px 20px;
-	}
-	.header{
-		background:#fff;
-		margin-top:60px;
-		border-radius:0px 0px 16px 16px;
-	}
-	.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;
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+	}
+
+	.qualityNo {
+		font-size: 16px;
+	}
+
+	.type {
+		font-size: 12px;
+		color: #fff;
+		padding: 3px 5px;
+		border-radius: 50%;
+		line-height: 16px;
+	}
+
+	.type-zhi {
+		background: #22C572;
+	}
+
+	.type-mao {
+		background: #3296FA;
+	}
+
+	.type-pi {
+		background: #FD714F;
+	}
+
+	.time {
+		font-size: 12px;
+		color: #878C9C;
+	}
+
+	.qualityInspector {
+		font-size: 14px;
+	}
+
+	.customerinformation {
+		background: #F9F9FA;
+		padding: 7px;
+		margin: 20px 0;
+		border-radius: 10px;
+		color: #9698A2;
+	}
+
+	.buttons {
+		flex-direction: row-reverse;
+	}
+
+	.button {
+		padding: 13rpx 30rpx;
+		border: 1px solid #CDCDCD;
+		border-radius: 15px;
+		margin: 0 10px;
+	}
+
+	.changewarehouse {
+		padding: 10px 20px;
+	}
+
+	.header {
+		background: #fff;
+		margin-top: 60px;
+		border-radius: 0px 0px 16px 16px;
+	}
+
+	.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;
 		}
 	}
-	.status1,.status2,.status3{
+
+	.status1,
+	.status2,
+	.status3 {
 		padding: 8rpx 12rpx;
 		border-radius: 50%;
 		color: white;
 	}
-	.status1{
+
+	.status1 {
 		background: #FD714F;
 	}
-	.status2{
+
+	.status2 {
 		background: #22C572;
 	}
-	.status3{
+
+	.status3 {
 		background: #3296FA;
 	}
-	.center{
+
+	.center {
 		padding-bottom: 150rpx;
 	}
 </style>
-

+ 4 - 3
pages/task/audit/salecontract.vue

@@ -101,8 +101,6 @@
 			<u-form-item label-width='260' label="已开发票(元)">
 				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>
-
-
 			<u-form-item label-width='260' label="费用支出(元)">
 				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled />
 			</u-form-item>
@@ -175,6 +173,8 @@
 				pageSize: 10,
 				list: {
 					status: "",
+					contractGoodsInfo: {},
+					contractProcessInfo: {}
 				},
 				imglist: [],
 				auditMind: '',
@@ -499,7 +499,8 @@
 	}
 
 	.textarea {
-		margin: 0 auto;
+		margin: 20px auto;
+		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
 		border: 1px solid #EEEEEE;