修改上架记录

mycomponents/location/requiredLocation.vue

@@ -5,9 +5,12 @@
 	 padding-right: 10rpx;
 	 font-size:32rpx;">
 		<view class="uni-flex uni-row u-col-center" @click="showLocation">
-			<text style="font-size: 35rpx;">{{title}} </text>
+			<view>
-			<text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
+				{{title}}
-			<text style="font-size: 35rpx;color:#3FBAFF;">&nbsp {{locationCode}}</text>
+				<!-- <text style="font-size: 35rpx;">{{title}}&nbsp {{locationCode}} </text> -->
+				<text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
+				<text style="font-size: 35rpx;color:#3FBAFF;">&nbsp {{locationCode}}</text>
+			</view>
 			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
@@ -59,7 +62,7 @@
 		},
 		methods: {
 			showLocation() {
-				if(this.isShowEdit){
+				if (this.isShowEdit) {
 					this.$refs.scanLocationCode.openScanPopup();
 				}
 

mycomponents/record/recordComDetailCard.vue

@@ -44,6 +44,7 @@
 	import {
 		getDetailOption,
 		getDetailRemoveOption,
+		getDetailEditRemoveOption,
 		getClearOption
 	} from '@/common/array.js';
 	export default {
@@ -113,7 +114,7 @@
 
 		mounted() {
 			this.detailOptions = getDetailOption();
-			this.scanOptions = getDetailRemoveOption();
+			this.scanOptions = getDetailEditRemoveOption();
 			this.removeOptions = getClearOption();
 		},
 

pages/putaway/record/putawayRecord.vue

@@ -17,13 +17,12 @@
 				</scroll-view>
 			</view>
 
-			<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
-				@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
-
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -56,12 +55,6 @@
 		getDirectoryItemArray
 	} from '@/common/directory.js';
 
-	import {
-		getDetailOption,
-		getDetailRemoveOption,
-		getDetailEditRemoveOption
-	} from '@/common/array.js';
-
 	import {
 		getBusinessType,
 		createItemInfo,
@@ -116,15 +109,6 @@
 			};
 		},
 		onLoad(option) {
-			this.fromType = option.fromType
-			if (this.fromType == "requestType") {
-				this.showToLoaction = false
-				updateTitle("原料上架申请")
-			} else {
-				updateTitle("原料上架记录")
-				this.showToLoaction = true
-
-			}
 			var typeCode = "PurchasePutaway"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -188,10 +172,10 @@
 
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
+					if (res) {}
-					}
 				});
 			},
+
 			calcHandleQty() {
 				for (let item of this.detailSource) {
 					item.qty = 0;
@@ -207,6 +191,7 @@
 			updateData() {
 				this.calcHandleQty();
 			},
+
 			removeItem(index, item) {
 				this.detailSource.splice(index, 1)
 			},
@@ -228,6 +213,7 @@
 				}
 				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
 			},
+
 			showFromLocationPopup() {
 				this.$nextTick(() => {
 					this.$refs.scanLocationCode.openScanPopup();
@@ -259,110 +245,60 @@
 					mask: true
 				});
 
-				if (this.fromType == "requestType") {
+				//记录有目标库位，需要查询管理模式
-					var params = this.setRequestParams()
+				var itemCodes = []
-					console.log("提交" + JSON.stringify(params))
-					// putawayRequestSubmit(params).then(res => {
-					// 	uni.hideLoading()
-					// 	if (res.data) {
-					// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
-					// 	} else {
-					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-					// 	}
-					// }).catch(error => {
-					// 	uni.hideLoading()
-					// 	this.showErrorMessage(error)
-					// })
-				} else {
-					//记录有目标库位，需要查询管理模式
-					var itemCodes = []
-					this.detailSource.forEach(item => {
-						itemCodes.push(item.itemCode)
-					})
-					//获取管理模式，封装参数
-					getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-						if (res.success) {
-							this.managementList = res.list;
-							var params = this.setRecordParams(true)
-							console.log("提交参数", JSON.stringify(params));
-
-							// putawayRecordSubmit(params).then(res => {
-							// 	uni.hideLoading()
-							// 	if (res.data) {
-							// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
-							// 	} else {
-							// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-							// 	}
-							// }).catch(error => {
-							// 	uni.hideLoading()
-							// 	this.showErrorMessage(error)
-							// })
-						} else {
-							uni.hideLoading();
-							this.showErrorMessage(res.message);
-						}
-					});
-				}
-			},
-
-			setRecordParams(queryModel) {
-				var subList = []
-				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
+					itemCodes.push(item.itemCode)
-						if (detail.scaned) {
+				})
-							if (queryModel) {
+				//获取管理模式，封装参数
-								var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-									detail.packingNumber, detail.batch);
+					if (res.success) {
-								detail.toPackingNumber = info.packingNumber;;
+						this.managementList = res.list;
-								detail.toContainerNumber = detail.containerNumber
+						var params = this.setRecordParams(true)
-								detail.toBatch = info.batch;
+						console.log("提交参数", JSON.stringify(params));
-								detail.toInventoryStatus = detail.inventoryStatus
+
-								detail.toLocationCode = this.toLocationCode
+						putawayRecordSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购上架记录" + res.data, )
 							} else {
-								// detail.toPackingNumber = detail.packingNumber;
+								this.showErrorMessage("提交失败[" + res.msg + "]")
-								// detail.toContainerNumber = detail.containerNumber
-								// detail.toBatch = detail.toBatch;
-								// detail.toInventoryStatus = detail.inventoryStatus
-								// detail.toLocationCode = ""
 							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
 
-							subList.push(detail)
-						}
-					})
-				})
-				this.dataContent.subList = subList
-				this.dataContent.creator = creator;
-				return this.dataContent;
 			},
 
-			setRequestParams(){
+			setRecordParams(queryModel) {
 				var subList = []
-				var supplierCode=""
+				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							if(supplierCode==""){
+							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-								supplierCode = detail.package.supplierCode
+								detail.packingNumber, detail.batch);
-							}
+							detail.toPackingNumber = info.packingNumber;;
+							detail.toContainerNumber = detail.containerNumber
+							detail.toBatch = info.batch;
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
+							detail.package=null;
 							subList.push(detail)
 						}
 					})
 				})
-				
 				this.dataContent.subList = subList
-				this.dataContent.supplierCode = supplierCode
+				this.dataContent.creator = creator;
-				this.dataContent.businessType = "PurchasePutaway"
-				this.dataContent.departmentCode= "研发部门";
-				this.dataContent.status=  1 ;
-				this.dataContent.autoCommit =  "FALSE";
-				this.dataContent.autoAgree = "FALSE";
-				this.dataContent.autoExecute = "FALSE";
-				this.dataContent.directCreateRecord = "FALSE";
 				return this.dataContent;
 			},
 
-
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {}

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",