瀏覽代碼

前端出入库 sdy

zhongtianhaoyuan 3 年之前
父節點
當前提交
fda7076d82

+ 2 - 2
config/index.js

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

+ 7 - 1
pages/erp/exWarehousing/exWarehousing.vue

@@ -232,7 +232,6 @@
 				this.detailData.contractNo = _data.contractNo;
 			}
 			this.detailData.goodsNameKey = _data.goodsNameKey;
-			// this.detailData.carNo = uni.getStorageSync('erpcarNoCK')
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
 				_data.tranCarInfoList = []
@@ -244,6 +243,12 @@
 					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.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			} else {
@@ -309,6 +314,7 @@
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
+				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 			},
 			filterFileType(index, lists) {

+ 7 - 0
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -251,6 +251,12 @@
 					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
+				}
+			}
 			//出库类型
 			this.outWarehouse()
 			//经办人
@@ -300,6 +306,7 @@
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
+				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 			},
 			filterFileType(index, lists) {

+ 7 - 0
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -292,6 +292,12 @@
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
+			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
+				}
+			}
 			// 获取入库类型
 			this.getrkType()
 			//获取经办人
@@ -344,6 +350,7 @@
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day + " " + e.hour + ":" + e.minute + ":" + e.second 
 			},
 			warehousingTypePicker(e) {
+				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 				if (this.detailData.inOutType == '采购入库') {

+ 8 - 0
pages/erp/warehousing/warehousing.vue

@@ -250,6 +250,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
+			debugger
 			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 			if(helper.erpWarehouse.personCharge)
 			this.detailData.agent = helper.erpWarehouse.personCharge
@@ -287,6 +288,12 @@
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
+			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
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			}
@@ -353,6 +360,7 @@
 				this.inOutDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
 			},
 			warehousingTypePicker(e) {
+				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 				if (this.detailData.inOutType == '采购入库') {