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

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
-	// baseUrlNew: 'http://192.168.1.119:8090/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/erp/exWarehousing/exWarehousing.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</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>
@@ -100,11 +100,15 @@
 					@confirm='outtypeChange($event)'>
 				</u-picker>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
 				<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 class="row row-bottom" v-if="detailData.outType=='火运'">
+				<view class="left">车号</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
+			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
@@ -112,7 +116,7 @@
 				<input v-model='detailData.boxNoOther' class="right-bottom"
 					placeholder="请输入箱号"></input>
 			</view>
-			<view v-if='!detailData.outType||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.titleNo' class="right-bottom"
 					placeholder="请输入封号"></input>
@@ -126,11 +130,11 @@
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号"></input>
 			</view>
-			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">航次</view>
 				<input v-model='detailData.shipNumber' class="right-bottom" placeholder="请输入航次"></input>
 			</view>
-			<view v-if='detailData.outType=="散船"||detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">船名</view>
 				<input v-model='detailData.shipName' class="right-bottom" placeholder="请输入船名"></input>
 			</view>
@@ -280,7 +284,7 @@
 				binNumber: '',
 				detailData: {
 					outType: '汽运',
-					contractNo: "请选择合同编号或移库任务编号",
+					contractNo: "",
 					type: "干粮",
 					grade: "请输入品级",
 					agent: "请选择经办人",
@@ -315,7 +319,6 @@
 		},
 		onShow() {
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
-			console.log("当前合同", _data)
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.detailData.goodsName = _data.goodsName;
@@ -331,9 +334,9 @@
 			} else if (this.detailData.inOutType == '采购出库') {
 				this.detailData.inOutTypeKey = 6
 			}
-			if (_data.contractNo) {
-				this.detailData.contractNo = _data.contractNo;
-			}
+			// if (_data.contractNo) {
+			// 	this.detailData.contractNo = _data.contractNo;
+			// }
 			this.detailData.goodsNameKey = _data.goodsNameKey;
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
@@ -378,7 +381,9 @@
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 1
+					flag: 1,
+					warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
@@ -392,18 +397,18 @@
 					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
-							}
-						}
-					}
-				})
+				// 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
@@ -417,9 +422,13 @@
 				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+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
 				} else if (this.detailData.inOutType == '移库出库') {
-					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
+					if(+this.contractNoList[i].unitContractPrice){
+						this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
+					}else{
+						this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse
+					}
 				}
 			},
 			toUpperCase(val) {

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</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>
@@ -257,7 +257,7 @@
 				binNumber: '',
 				detailData: {
 					outType: '汽运',
-					contractNo: "请选择合同编号或移库任务编号",
+					contractNo: "",
 					type: "请选择类型",
 					grade: "请输入品级",
 					agent: "请选择经办人",
@@ -313,9 +313,9 @@
 			} else if (this.detailData.inOutType == '采购出库') {
 				this.detailData.inOutTypeKey = 6
 			}
-			if (!this.detailData.contractNo) {
-				this.detailData.contractNo = '请选择合同编号'
-			}
+			// if (!this.detailData.contractNo) {
+			// 	this.detailData.contractNo = '请选择合同编号'
+			// }
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
@@ -347,7 +347,9 @@
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 1
+					flag: 1,
+					warehouseName:this.warehouseName,
+						agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -103,12 +103,20 @@
 				<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="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
 				<view class="left">车牌号</view>
 				<input v-if="!isPC" @input='' v-model='detailData.carNo' class="right-bottom"
 					placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='火运'">
+				<view class="left">车号</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='散船'">
+				<view class="left">船名</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名"></input>
+			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
@@ -116,7 +124,7 @@
 				<input v-model='detailData.boxNoOther' class="right-bottom"
 					placeholder="请输入箱号"></input>
 			</view>
-			<view v-if='!detailData.outType||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.titleNo' class="right-bottom"
 					placeholder="请输入封号"></input>
@@ -286,6 +294,9 @@
 				 inOutNoList:[],
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		onLoad(options) {
 			this.detailData =JSON.parse(options.data)
 			this.netWeight = this.detailData.netWeight
@@ -364,7 +375,9 @@
 		},
 		methods: {
 			inOutNo(){
-				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:2}).then(res => {
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', 
+				{flag:2,warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id}).then(res => {
 					this.inOutNoList = res.data.data
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo

pages/erp/warehousing/warehousing.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo}}</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>
@@ -109,10 +109,23 @@
 					@confirm='outtypeChange($event)'>
 				</u-picker>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.outType!='火运'&&detailData.outType!='散船'">
 				<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>
+				<!-- 他运合同车牌号输入 -->
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
+			    <!-- 自运合同车牌号需下拉 -->
+				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo}}</view>
+				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				</u-picker>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='火运'">
+				<view class="left">车号</view>
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号" ></input>
+			</view>
+			<view class="row row-bottom" v-if="detailData.outType=='散船'">
+				<view class="left">船名</view>
+				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名" ></input>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
@@ -120,7 +133,7 @@
 				<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 v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo'  class="right-bottom"
 					placeholder="请输入封号"></input>
@@ -227,6 +240,7 @@
 				show5: false,
 				show6: false,
 				isPC: true,
+				carno:false,
 				isSelectType: true,
 				inOutShow: false,
 				params: {
@@ -293,7 +307,7 @@
 				contractNoList: [],
 				detailData: {
 					contractNo: "请选择合同编号",
-					carNo: '请输入车牌号',
+					carNo: '',
 					type: "干粮",
 					goodsName: "",
 					inOutDate: '请选择入库日期',
@@ -307,7 +321,9 @@
 					netWeight: 0,
 					cost: 0,
 					warehouseInOutDetail: {}
-				}
+				},
+				carList:[],//车牌号下拉
+				showCar:false,
 			}
 		},
 		onLoad(options) {
@@ -407,13 +423,19 @@
 				this.pureWeightCount()
 			},
 		},
+		computed: {
+			...mapState(['hasLogin','userInfo']),
+		},
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 2
+					flag: 2,
+					warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					if(this.inOutNoList.length > 0){
+						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
 					if (this.inOutNoList[0].contractNo) {
 						this.detailData.contractNo = this.inOutNoList[0].contractNo
@@ -423,6 +445,31 @@
 					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', {
+						compId: this.compId,
+						flag: 7,
+					}).then(res => {
+						if (res.data.code == 200) {
+							for(let i = 0 ; i < res.data.data.length ; i++){
+								 // "MYCGYMHLJ2021102401"
+								if(res.data.data[i].contractNo == this.detailData.contractNo){//如果查到该合同
+								if(res.data.data[i].deliverType == 1){//判断自运1，他运2合同
+									this.showCar = true
+								}else{
+									this.showCar = false
+								}
+								if(res.data.data[i].tranCarInfoList.length > 0){
+									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+								}
+							}
+							}
+						}
+					})
+					
+					
+					}
+					
 				})
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data
@@ -453,9 +500,14 @@
 				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
+							this.detailData.tips = '卖方' + this.contractNoList[i].seller+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
 						} else if (this.detailData.inOutType == '移库入库') {
-							this.detailData.tips = '出货库' + this.inOutNoList[e[0]].warehouseName
+							if(this.contractNoList[i].unitContractPrice){
+								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
+							}else{
+								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse
+							}
+							
 						} else if (this.detailData.inOutType == '退库') {
 							if (this.contractNoList[i].contractNo) {
 								this.deptBudgetList.tips = '买方' + this.contractNoList[i].buyer
@@ -484,7 +536,6 @@
 			},
 			outtypeChange(e) {
 				this.detailData.outType = this.multiSelector[e].name
-				console.log(e)
 			},
 			selectType() {
 				if (this.isSelectType) return
@@ -523,6 +574,10 @@
 				this.detailData.gradeKey = e[0] + 1
 				this.detailData.grade = this.pjList[e].grade
 			},
+			carPicker(e) {
+				// this.detailData.gradeKey = e[0] + 1
+				this.detailData.carNo = this.carList[e].carNo
+			},
 			handlerPicker(e) {
 				console.log(e)
 				this.detailData.agent = this.handlerList[e].staffName