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

pages/erp/exWarehousing/exWarehousing.vue

@@ -15,7 +15,7 @@
 			<view class="row row-bottom">
 				<view class="left">合同编号</view>
 				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
-				<input v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
+				<input v-model='detailData.contractNo' style="width: 200px;" class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
 			</view>
 			<view class="row">
 				<view class="left">提示</view>
@@ -439,31 +439,32 @@
 				}).then(res => {
 					if(res.data.data.length == 0){
 						this.$api.msg('暂无出库任务')
-					}
-					this.inOutNoList = res.data.data
-				  this.detailData.goodsNameKey = res.data.data[0].goodsNameKey
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
-						.inOutTaskNo : ''
-					this.detailData.agent = this.inOutNoList[0].agent
-					if (this.inOutNoList[0].contractNo) {
-						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					} else {
-						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
-					}
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
-					if (this.detailData.inOutType == '销售出库') {
-						this.detailData.inOutTypeKey = 1
-					} else if (this.detailData.inOutType == '移库出库') {
-						this.detailData.inOutTypeKey = 3
-					} else if (this.detailData.inOutType == '暂存出库') {
-						this.detailData.inOutTypeKey = 4
-					} else if (this.detailData.inOutType == '贸易服务出库') {
-						this.detailData.inOutTypeKey = 5
-					} else if (this.detailData.inOutType == '采购出库') {
-						this.detailData.inOutTypeKey = 6
+					}else{
+						this.inOutNoList = res.data.data
+					    this.detailData.goodsNameKey = res.data.data[0].goodsNameKey
+						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
+							.inOutTaskNo : ''
+						this.detailData.agent = this.inOutNoList[0].agent
+						if (this.inOutNoList[0].contractNo) {
+							this.detailData.contractNo = this.inOutNoList[0].contractNo
+						} else {
+							this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
+						}
+						this.detailData.goodsName = this.inOutNoList[0].goodsName
+						this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
+						this.detailData.grade = this.inOutNoList[0].grade
+						this.detailData.inOutType = this.inOutNoList[0].inOutType
+						if (this.detailData.inOutType == '销售出库') {
+							this.detailData.inOutTypeKey = 1
+						} else if (this.detailData.inOutType == '移库出库') {
+							this.detailData.inOutTypeKey = 3
+						} else if (this.detailData.inOutType == '暂存出库') {
+							this.detailData.inOutTypeKey = 4
+						} else if (this.detailData.inOutType == '贸易服务出库') {
+							this.detailData.inOutTypeKey = 5
+						} else if (this.detailData.inOutType == '采购出库') {
+							this.detailData.inOutTypeKey = 6
+						}
 					}
 					console.log(this.detailData.inOutType)
 					//查询所有的合同  进行获取车牌号