更新

pages/erp/exWarehousing/exWarehousing.vue

@@ -243,10 +243,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
 				}
 			}
 			if (!this.detailData.contractNo) {
@@ -303,7 +303,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].type
 			},
 			handlerPicker(e) {
@@ -314,8 +314,18 @@
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
-				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				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
+				}
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -439,7 +449,7 @@
 							(String(this.detailData.tidalGrainWater).indexOf('.') + 1) >
 							1) ||
 						this.detailData.tidalGrainWater < 1 ||
-						this.detailData.tidalGrainWater > 40	
+						this.detailData.tidalGrainWater > 40
 					) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
@@ -605,6 +615,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
+									console.log(res,"报异常")
 								if (res.data.code == 200) {
 									that.$api.msg(title)
 									setTimeout(() => {

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -306,8 +306,19 @@
 				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
-				this.detailData.inOutTypeKey = e[0]+1
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				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
+				}
+				
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -350,8 +350,18 @@
 				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
+				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
+				}
 				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 				if (this.detailData.inOutType == '采购入库') {
 					this.detailData.freight = 0

pages/erp/warehousing/warehousing.vue

@@ -250,7 +250,6 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			debugger
 			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 			if(helper.erpWarehouse.personCharge)
 			this.detailData.agent = helper.erpWarehouse.personCharge
@@ -360,8 +359,18 @@
 				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
+				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
+				}
 				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
 				if (this.detailData.inOutType == '采购入库') {
 					this.detailData.freight = 0