浏览代码

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

zhongtianhaoyuan 3 年之前
父节点
当前提交
2a48f314cb

+ 31 - 2
pages/erp/exWarehousing/exWarehousing.vue

@@ -16,6 +16,10 @@
 				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
 				<input v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
 			</view>
+			<view class="row">
+				<view class="left">提示</view>
+				<view class="right">{{detailData.tips}}</view>
+			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同,自动获取"}}
@@ -367,19 +371,44 @@
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
-					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					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.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
 				})
+				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.detailData.inOutType == '销售出库') {
+								this.detailData.tips='买方'+this.contractNoList[i].buyer
+							} else if (this.detailData.inOutType == '移库出库') {
+								this.detailData.tips='入货库'+this.inOutNoList[0].warehouseName
+							}
+						}
+					}
+				})
 			},
 			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
+				if(this.inOutNoList[e[0]].contractNo){
+					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				}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
+				} else if (this.detailData.inOutType == '移库出库') {
+					this.detailData.tips='入货库'+this.inOutNoList[e[0]].warehouseName
+				}
 			},
 			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()

+ 50 - 5
pages/erp/warehousing/warehousing.vue

@@ -16,6 +16,10 @@
 				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
 				<input v-model='detailData.contractNo' class="right-bottom" placeholder="未获取到合同编号" disabled></input>
 			</view>
+			<view class="row">
+				<view class="left">提示</view>
+				<view class="right">{{detailData.tips}}</view>
+			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right">{{detailData.goodsName}}</view>
@@ -262,6 +266,7 @@
 				isAdd: true,
 				netWeight: "",
 				inOutDate1: "",
+				contractNoList:[],
 				detailData: {
 					contractNo: "请选择合同编号",
 					carNo: '请输入车牌号',
@@ -350,9 +355,10 @@
 				}
 			}
 			if(this.detailData.carNo){
-				for(let i = 0 ; i < uni.getStorageSync('erpContractNo').tranCarInfoList.length ;i++){
-					if(uni.getStorageSync('erpContractNo').tranCarInfoList[i].carNo == this.detailData.carNo)
-					this.detailData.tranCarNo = uni.getStorageSync('erpContractNo').tranCarInfoList[i].tranCarNo
+				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) {
@@ -383,19 +389,58 @@
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
-					this.detailData.contractNo = this.inOutNoList[0].contractNo
+					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.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
 				})
+				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.detailData.inOutType == '采购入库') {
+								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
+							}
+						}
+					}
+				})
 			},
 			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
+				if(this.inOutNoList[e[0]].contractNo){
+					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
+				}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
+								}
+							}
+						}
+					}
+					
 			},
 			toUpperCase(val){
 				this.detailData.boxNo = val.detail.value.toUpperCase()

+ 14 - 0
pages/erpbusiness/edit_quality_testing.vue

@@ -92,6 +92,11 @@
 					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
+			<view class="c-row-fj" v-if="flag==1">
+				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
+					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
+			</view>
+			
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -655,4 +660,13 @@
 	input:disabled {
 		color: #ccc;
 	}
+	.textarea-style{
+		border: 1px solid #EEEEEE;
+		width: 100%;
+		padding:20rpx;
+		border-radius: 20rpx;
+	}
+	.c-row-fj{
+		padding:20rpx
+	}
 </style>