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

components/upload.vue

@@ -302,7 +302,7 @@
 			},
 			imgIndex:{
 				type: Number,
-				default: false
+				default: 0
 			}
 		},
 		mounted() {},

pages/erp/exWarehousing/exWarehousing.vue

@@ -8,7 +8,8 @@
 			<view class="row">
 				<view class="left">任务编号</view>
 				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
-				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -104,15 +105,20 @@
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
+				class="row row-bottom">
 				<view class="left">箱号</view>
-				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
-				<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"
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom"
 					placeholder="请输入箱号"></input>
 			</view>
+			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+				<view class="left">封号</view>
+				<input v-model='detailData.titleNo' class="right-bottom"
+					placeholder="请输入封号"></input>
+				<input v-model='detailData.titleNoOther' 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"
@@ -287,8 +293,8 @@
 					day: true,
 				},
 				netWeight: "",
-				inOutShow:false,
-				inOutNoList:[],
+				inOutShow: false,
+				inOutNoList: [],
 			}
 		},
 		computed: {
@@ -366,14 +372,16 @@
 			this.handler()
 		},
 		methods: {
-			inOutNo(){
-				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:1}).then(res => {
+			inOutNo() {
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
+					flag: 1
+				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
-					if(this.inOutNoList[0].contractNo){
+					if (this.inOutNoList[0].contractNo) {
 						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					}else{
+					} else {
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
@@ -383,31 +391,31 @@
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data
 					for (var i = 0; i < this.contractNoList.length; i++) {
-						if(this.contractNoList[i].contractNo==this.detailData.contractNo){
+						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 							if (this.detailData.inOutType == '销售出库') {
-								this.detailData.tips='买方'+this.contractNoList[i].buyer
+								this.detailData.tips = '买方' + this.contractNoList[i].buyer
 							} else if (this.detailData.inOutType == '移库出库') {
-								this.detailData.tips='入货库'+this.inOutNoList[0].warehouseName
+								this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
 							}
 						}
 					}
 				})
 			},
-			inOutChange(e){
+			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
 				this.detailData.agent = this.inOutNoList[e[0]].agent
-				if(this.inOutNoList[e[0]].contractNo){
+				if (this.inOutNoList[e[0]].contractNo) {
 					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
-				}else{
+				} else {
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				if (this.detailData.inOutType == '销售出库') {
-					this.detailData.tips='买方'+this.contractNoList[i].buyer
+					this.detailData.tips = '买方' + this.contractNoList[i].buyer
 				} else if (this.detailData.inOutType == '移库出库') {
-					this.detailData.tips='入货库'+this.inOutNoList[e[0]].warehouseName
+					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
 				}
 			},
 			toUpperCase(val) {

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -8,7 +8,8 @@
 			<view class="row">
 				<view class="left">任务编号</view>
 				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
-				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -89,25 +90,37 @@
 			<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">
-			<!-- 	<view class="left">车牌号</view>
+				<!-- 	<view class="left">车牌号</view>
 				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input> -->
 				<view class="left">车牌号</view>
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||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'  class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom"
+					placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+				<view class="left">封号</view>
+				<input v-model='detailData.titleNo' class="right-bottom"
+					placeholder="请输入封号"></input>
+				<input v-model='detailData.titleNoOther' 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>
@@ -188,7 +201,7 @@
 				show5: false,
 				show6: false,
 				show7: false,
-				isPC:true,
+				isPC: true,
 				typeList: [{
 						type: "干粮"
 					},
@@ -209,12 +222,23 @@
 						type: "等外"
 					}
 				],
-				show8:false,
-				multiSelector:[
-					{name:'汽运',value:'0'},
-					{name:'火运',value:'1'},
-					{name:'集装箱船',value:'2'},
-					{name:'散船',value:'3'},
+				show8: false,
+				multiSelector: [{
+						name: '汽运',
+						value: '0'
+					},
+					{
+						name: '火运',
+						value: '1'
+					},
+					{
+						name: '集装箱船',
+						value: '2'
+					},
+					{
+						name: '散船',
+						value: '3'
+					},
 				],
 				handlerList: [],
 				warehousingTypeList: [],
@@ -225,7 +249,7 @@
 				warehouseName: '',
 				binNumber: '',
 				detailData: {
-					outType:'汽运',
+					outType: '汽运',
 					contractNo: "请选择合同编号或移库任务编号",
 					type: "请选择类型",
 					grade: "请输入品级",
@@ -243,8 +267,8 @@
 				netWeight: "",
 				imgUrl: [], //图片展示
 				netWeight: "",
-				inOutShow:false,
-				inOutNoList:[],
+				inOutShow: false,
+				inOutNoList: [],
 			}
 		},
 		computed: {
@@ -258,10 +282,10 @@
 		onLoad(options) {
 			this.detailData = JSON.parse(options.data)
 			this.netWeight = this.detailData.netWeight
-			if(this.detailData.addressUrl){
+			if (this.detailData.addressUrl) {
 				this.imgUrl.push({
-				url: this.detailData.addressUrl.split(",")[0]
-			})
+					url: this.detailData.addressUrl.split(",")[0]
+				})
 			}
 			this.cangId = options.cangId
 		},
@@ -300,10 +324,10 @@
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
-			if(this.detailData.carNo){
-				for(let i = 0 ; i < uni.getStorageSync('erpContractNoCK').tranCarInfoList.length ;i++){
-					if(uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].carNo == this.detailData.carNo)
-					this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].tranCarNo
+			if (this.detailData.carNo) {
+				for (let i = 0; i < uni.getStorageSync('erpContractNoCK').tranCarInfoList.length; i++) {
+					if (uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].carNo == this.detailData.carNo)
+						this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].tranCarNo
 				}
 			}
 			//出库类型
@@ -314,8 +338,10 @@
 			this.handler()
 		},
 		methods: {
-			inOutNo(){
-				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:1}).then(res => {
+			inOutNo() {
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
+					flag: 1
+				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
@@ -325,7 +351,7 @@
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
 				})
 			},
-			inOutChange(e){
+			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
 				this.detailData.agent = this.inOutNoList[e[0]].agent
 				this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
@@ -333,14 +359,14 @@
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 			},
-			toUpperCase(val){
+			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
 			},
-			toUpperCase1(val){
+			toUpperCase1(val) {
 				this.detailData.boxNoOther = val.detail.value.toUpperCase()
 			},
-			outtypeChange(e){
-				this.detailData.outType=this.multiSelector[e].name
+			outtypeChange(e) {
+				this.detailData.outType = this.multiSelector[e].name
 				console.log(e)
 			},
 			//计算纯重
@@ -398,7 +424,7 @@
 				} else if (this.detailData.inOutType == '采购出库') {
 					this.detailData.inOutTypeKey = 6
 				}
-				
+
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -656,13 +682,13 @@
 						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.positionId = helper.erpWarehouse.positionId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
@@ -807,7 +833,7 @@
 	}
 
 	.bottom-btn {
-	    padding: 30rpx;
+		padding: 30rpx;
 		background: #FFFFFF;
 		width: 92%;
 		position: fixed;

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -109,13 +109,19 @@
 					placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
+				class="row row-bottom">
 				<view class="left">箱号</view>
-				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
-				<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.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom"
+					placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+				<view class="left">封号</view>
+				<input v-model='detailData.titleNo' class="right-bottom"
+					placeholder="请输入封号"></input>
+				<input v-model='detailData.titleNoOther' class="right-bottom"
+					placeholder="请输入封号"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>

pages/erp/warehousing/warehousing.vue

@@ -8,7 +8,8 @@
 			<view class="row">
 				<view class="left">任务编号</view>
 				<view @click='inOutShow=true'>{{detailData.inOutTaskNo}}</view>
-				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow" mode="selector">
+				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -47,12 +48,13 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input type="number"  v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number" v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input type="number" v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
+				<input type="number" v-model='detailData.deductionAmount' class="right-bottom"
+					placeholder="输入扣款"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
@@ -61,18 +63,18 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input type="number"  v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
+				<input type="number" v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input type="number"  v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
+				<input type="number" v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
-					:disabled="true"></input>
+				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
+					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row">
 				<view class="left">品级</view>
@@ -95,7 +97,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">入库类型</view>
-				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType" placeholder="自动获取"></input>
+				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType"
+					placeholder="自动获取"></input>
 				<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker>
@@ -103,27 +106,35 @@
 			<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">
 				<view class="left">车牌号</view>
-				<input v-if="!isPC"  v-model='detailData.carNo' class="right-bottom"
-					placeholder="请输入车牌号"></input>
+				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
+				class="row row-bottom">
 				<view class="left">箱号</view>
-				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
-				<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.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom"
+					placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
+				<view class="left">封号</view>
+				<input v-model='detailData.titleNo'  class="right-bottom"
+					placeholder="请输入封号"></input>
+				<input v-model='detailData.titleNoOther' 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>
@@ -131,8 +142,8 @@
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
-				<input type="number" v-model='detailData.cost' class="right-bottom"
-					placeholder="自动获取" :disabled="isEditCB"></input>
+				<input type="number" v-model='detailData.cost' class="right-bottom" placeholder="自动获取"
+					:disabled="isEditCB"></input>
 				<!-- <input type="number" v-if="detailData.inOutType!='采购入库'" v-model='detailData.cost' class="right-bottom"
 					placeholder="自动获取" :disabled="isEditCB"></input> -->
 				<u-button class="edit-btn" hover-class="none" @click="editCB">编辑</u-button>
@@ -161,8 +172,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
-					placeholder="输入水分占比"></input>
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.waterContent'
+					class="right-bottom" placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
@@ -181,8 +192,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
-					placeholder="输入霉变粒占比"></input>
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.mildewGrain'
+					class="right-bottom" placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
@@ -218,8 +229,8 @@
 				show5: false,
 				show6: false,
 				isPC: true,
-				isSelectType:true,
-				inOutShow:false,
+				isSelectType: true,
+				inOutShow: false,
 				params: {
 					year: true,
 					month: true,
@@ -230,11 +241,22 @@
 				warehouseName: '',
 				binNumber: '',
 				contractNoList: [],
-				multiSelector:[
-					{name:'汽运',value:'0'},
-					{name:'火运',value:'1'},
-					{name:'集装箱船',value:'2'},
-					{name:'散船',value:'3'},
+				multiSelector: [{
+						name: '汽运',
+						value: '0'
+					},
+					{
+						name: '火运',
+						value: '1'
+					},
+					{
+						name: '集装箱船',
+						value: '2'
+					},
+					{
+						name: '散船',
+						value: '3'
+					},
 				],
 				typeList: [{
 						type: "干粮"
@@ -256,17 +278,21 @@
 						grade: "等外"
 					}
 				],
-				inOutNoList:[],
-				show8:false,
+				inOutNoList: [],
+				show8: false,
 				handlerList: [],
-				warehousingTypeList: [{constValue:'移库入库'},{constValue:'退库'}],
+				warehousingTypeList: [{
+					constValue: '移库入库'
+				}, {
+					constValue: '退库'
+				}],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				netWeight: "",
 				inOutDate1: "",
-				contractNoList:[],
+				contractNoList: [],
 				detailData: {
 					contractNo: "请选择合同编号",
 					carNo: '请输入车牌号',
@@ -281,7 +307,7 @@
 					tare: '',
 					deductionAmount: '',
 					netWeight: 0,
-					cost:0,
+					cost: 0,
 					warehouseInOutDetail: {}
 				}
 			}
@@ -298,9 +324,9 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
-			if(helper.erpWarehouse.personCharge)
-			this.detailData.agent = helper.erpWarehouse.personCharge
+			let _data = uni.getStorageSync('erpContractNo') == '' ? {} : uni.getStorageSync('erpContractNo')
+			if (helper.erpWarehouse.personCharge)
+				this.detailData.agent = helper.erpWarehouse.personCharge
 			this.detailData.goodsName = _data.goodsName;
 			this.detailData.contractNo = _data.contractNo;
 			this.detailData.goodsNameKey = _data.goodsNameKey;
@@ -316,49 +342,49 @@
 			} else if (this.detailData.inOutType == '退库') {
 				this.detailData.inOutTypeKey = 6
 			}
-			if(_data.unitContractPrice) {
+			if (_data.unitContractPrice) {
 				this.detailData.cost = _data.unitContractPrice
 			}
-			
+
 			if (_data.inOutType == '采购入库') {
 				this.detailData.freight = 0
-				
-			}else if(_data.inOutType == '移库入库'){
+
+			} else if (_data.inOutType == '移库入库') {
 				this.isSelectType = false
-			}
-			else{
+			} else {
 				this.detailData.freight = uni.getStorageSync('CarFreight')
 				this.isSelectType = true
 			}
-			if (!_data.tranCarInfoList){
-				
+			if (!_data.tranCarInfoList) {
+
 				this.isPC = false
 				// this.detailData.carNo = ""
 				// this.detailData.cost = ""
 				// _data.tranCarInfoList = []
-			} else{
+			} else {
 				this.isPC = true
 				uni.setStorageSync('erpContractNoCarList', _data.tranCarInfoList);
-				this.detailData.freight=uni.getStorageSync('erpcarNo').tranPrice
-				if(uni.getStorageSync('ContractNoCar')){
+				this.detailData.freight = uni.getStorageSync('erpcarNo').tranPrice
+				if (uni.getStorageSync('ContractNoCar')) {
 					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectCost', {
 						contractNo: this.detailData.contractNo,
-						carNo:this.detailData.carNo
+						carNo: this.detailData.carNo
 					}).then(res => {
 						if (res.data.code == 200) {
 							this.detailData.cost = res.data.data
 						}
 					})
-				}else{
+				} else {
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
-			if(this.detailData.carNo){
-				var tranCarInfoList=uni.getStorageSync('erpContractNo').tranCarInfoList?uni.getStorageSync('erpContractNo').tranCarInfoList:[]
-				for(let i = 0 ; i < tranCarInfoList.length ;i++){
-					if(tranCarInfoList[i].carNo == this.detailData.carNo)
-					this.detailData.tranCarNo = tranCarInfoList[i].tranCarNo
+			if (this.detailData.carNo) {
+				var tranCarInfoList = uni.getStorageSync('erpContractNo').tranCarInfoList ? uni.getStorageSync(
+					'erpContractNo').tranCarInfoList : []
+				for (let i = 0; i < tranCarInfoList.length; i++) {
+					if (tranCarInfoList[i].carNo == this.detailData.carNo)
+						this.detailData.tranCarNo = tranCarInfoList[i].tranCarNo
 				}
 			}
 			if (!this.detailData.contractNo) {
@@ -384,14 +410,16 @@
 			},
 		},
 		methods: {
-			inOutNo(){
-				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag :2}).then(res => {
+			inOutNo() {
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
+					flag: 2
+				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
-					if(this.inOutNoList[0].contractNo){
+					if (this.inOutNoList[0].contractNo) {
 						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					}else{
+					} else {
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
@@ -401,62 +429,61 @@
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data
 					for (var i = 0; i < this.contractNoList.length; i++) {
-						if(this.contractNoList[i].contractNo==this.detailData.contractNo){
+						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 							if (this.detailData.inOutType == '采购入库') {
-								this.detailData.tips='卖方'+this.contractNoList[i].seller
+								this.detailData.tips = '卖方' + this.contractNoList[i].seller
 							} else if (this.detailData.inOutType == '移库入库') {
-								this.detailData.tips='出货库'+this.inOutNoList[0].warehouseName
-							}  else if (this.detailData.inOutType == '退库') {
-									this.detailData.tips='出货库'+this.inOutNoList[0].warehouseName
+								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
+							} else if (this.detailData.inOutType == '退库') {
+								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
 							}
 						}
 					}
 				})
 			},
-			inOutChange(e){
+			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
 				this.detailData.agent = this.inOutNoList[e[0]].agent
-				if(this.inOutNoList[e[0]].contractNo){
+				if (this.inOutNoList[e[0]].contractNo) {
 					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
-				}else{
+				} else {
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.grade = this.inOutNoList[e[0]].grade
-					this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
-					for (var i = 0; i < this.contractNoList.length; i++) {
-						if(this.contractNoList[i].contractNo==this.detailData.contractNo){
-							if (this.detailData.inOutType == '采购入库') {
-								this.detailData.tips='卖方'+this.contractNoList[i].seller
-							} else if (this.detailData.inOutType == '移库入库') {
-								this.detailData.tips='出货库'+this.inOutNoList[e[0]].warehouseName
-							}  else if (this.detailData.inOutType == '退库') {
-								if(this.contractNoList[i].contractNo){
-									this.deptBudgetList.tips='买方'+this.contractNoList[i].buyer
-								}
-								else{
-									this.deptBudgetList.tips='出货库'+this.inOutNoList[e[0]].warehouseName
-								}
+				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+				for (var i = 0; i < this.contractNoList.length; i++) {
+					if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
+						if (this.detailData.inOutType == '采购入库') {
+							this.detailData.tips = '卖方' + this.contractNoList[i].seller
+						} else if (this.detailData.inOutType == '移库入库') {
+							this.detailData.tips = '出货库' + this.inOutNoList[e[0]].warehouseName
+						} else if (this.detailData.inOutType == '退库') {
+							if (this.contractNoList[i].contractNo) {
+								this.deptBudgetList.tips = '买方' + this.contractNoList[i].buyer
+							} else {
+								this.deptBudgetList.tips = '出货库' + this.inOutNoList[e[0]].warehouseName
 							}
 						}
 					}
-					
+				}
+
 			},
-			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
 			},
-			outtypeChange(e){
-				this.detailData.outType=this.multiSelector[e].name
+			outtypeChange(e) {
+				this.detailData.outType = this.multiSelector[e].name
 				console.log(e)
 			},
-			selectType(){
-				if(this.isSelectType) return
+			selectType() {
+				if (this.isSelectType) return
 				this.show5 = true
 			},
 			//计算纯重
@@ -489,7 +516,7 @@
 				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
-				this.detailData.gradeKey = e[0]+1
+				this.detailData.gradeKey = e[0] + 1
 				this.detailData.grade = this.pjList[e].grade
 			},
 			handlerPicker(e) {
@@ -514,11 +541,13 @@
 				} else if (this.detailData.inOutType == '退库') {
 					this.detailData.inOutTypeKey = 6
 				}
-				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+				let _data = uni.getStorageSync('erpContractNo') == '' ? {} : uni.getStorageSync('erpContractNo')
 				if (this.detailData.inOutType == '采购入库') {
 					this.detailData.freight = 0
-				}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
-				
+				} else {
+					this.detailData.freight = uni.getStorageSync('CarFreight')
+				}
+
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -533,7 +562,8 @@
 				}
 			},
 			calculate() {
-				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight).toFixed(2)
+				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight)
+					.toFixed(2)
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -748,20 +778,20 @@
 					this.$api.msg('请上传磅单')
 					return
 				}
-					if (!this.detailData.cost && num == 2) {
-						this.$api.msg('未获取到成本，请编辑后提交')
-						return
-					}
-					if (String(this.detailData.cost).indexOf('.') != -1 && String(this.detailData
-							.cost).length - (String(
-							this.detailData.cost).indexOf('.') + 1) > 2) {
-						this.$api.msg('成本输入错误')
-						return
-					}
-					if (this.detailData.cost < 0 || this.detailData.cost > 20000) {
-						this.$api.msg('成本输入错误')
-						return
-					}
+				if (!this.detailData.cost && num == 2) {
+					this.$api.msg('未获取到成本，请编辑后提交')
+					return
+				}
+				if (String(this.detailData.cost).indexOf('.') != -1 && String(this.detailData
+						.cost).length - (String(
+						this.detailData.cost).indexOf('.') + 1) > 2) {
+					this.$api.msg('成本输入错误')
+					return
+				}
+				if (this.detailData.cost < 0 || this.detailData.cost > 20000) {
+					this.$api.msg('成本输入错误')
+					return
+				}
 				if (!this.detailData.freight && num == 2) {
 					this.$api.msg('运费不能为空')
 					return
@@ -788,13 +818,13 @@
 							return
 						}
 					}
-						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.waterContent).length - (String(
-								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('水分占比输入错误')
-							return
-						}
-					
+					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
+							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
+						this.$api.msg('水分占比输入错误')
+						return
+					}
+
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
 					if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -893,11 +923,11 @@
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
-								that.$api.msg(title)
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1000)
-								}else{
+									that.$api.msg(title)
+									setTimeout(() => {
+										uni.navigateBack()
+									}, 1000)
+								} else {
 									that.$api.msg(res.data.message)
 								}
 							})