Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -11,6 +11,7 @@
 						<view class="">
 							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
 								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
+								:allowEditQty="true"
 								:allowEditStatus="allowEditStatus">
 							</com-move-record-card>
 						</view>

src/pages/issue/record/directIssueByBatch.vue

@@ -12,6 +12,7 @@
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="true" @removeItem="removeItem(index,item)"
 								:isShowToLocation="false" :isShowParentToLocation="false" @updateData="updateData"
+								:allowModifyQty="true"
 								@removePack="removePack">
 							</record-com-detail-card>
 

src/pages/putaway/record/putawayRecord.vue

@@ -18,6 +18,7 @@
 							<record-com-detail-card-batch :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
 								:isShowModifedLocation="true"
+								:allowModifyQty="true"
 								@updateData="updateData"
 								@editLocation="showScanToLocation"
 								@removePack="removePack"

src/pages/scrap/record/scrapRecord.vue

@@ -21,6 +21,7 @@
 							<record-com-detail-card-batch :dataContent="item" :index="index" :isShowFromLocation="true"
 								:isShowParentToLocation="false" @removeItem="removeItem(index,item)"
 								:isShowToLocation="false" @updateData="updateData" @removePack="removePack"
+								:allowModifyQty="true"
 								v-if="managementType == 'BY_BATCH'||managementType =='BY_QUANTITY' ">
 							</record-com-detail-card-batch>
 							<record-com-detail-card v-else :dataContent="item" :index="index"

src/pages/unPlanned/record/issueRecord.vue

@@ -15,6 +15,7 @@
 							:isShowParentToLocation="false"
 								@removeItem="removeItem(index,item)" :isShowToLocation="false" @updateData="updateData"
 								 @removePack="removePack"
+								 :allowModifyQty="true"
 								v-if="managementType == 'BY_BATCH'||managementType =='BY_QUANTITY' ">
 							</record-com-detail-card-batch>
 							<record-com-detail-card v-else :dataContent="item" :index="index"

src/pages/unPlanned/record/receiptRecord.vue

@@ -18,6 +18,7 @@
 							:dataContent="item" @removeItem="removeItem(index,item)"
 								@updateData="updateData" 
 								:queryBalance="false"
+								:allowModifyQty="true"
 								:isShowLocation="false" @removePack="removePack">
 							</com-receipt-record>
 						</view>

src/pages/unPlanned/record/receiptRecordByBatch.vue

@@ -18,6 +18,7 @@
 							:dataContent="item" @removeItem="removeItem(index,item)"
 								@updateData="updateData" 
 								:queryBalance="false"
+								:allowModifyQty="true"
 								:isShowLocation="false" @removePack="removePack">
 							</com-receipt-record>
 						</view>
@@ -109,7 +110,6 @@
 				dataContent: {},
 				managementList: [],
 				toLocationAreaTypeList:[],
-				managementType:import.meta.env.VITE_MANAGE_MODEL
 			}
 		},
 
@@ -137,50 +137,7 @@
 				this.toLocationCode = code;
 			},
 			getScanResult(result) {
-				var managementTypeParams =this.managementType
-				if (managementTypeParams == "BY_BATCH" || managementTypeParams == "BY_QUANTITY") {
-					this.setDataBatch(result)
-				} else {
-					this.setData(result)
-				}
-
-			},
-			
-			setData(result){
-				let label = result.label;
-				let pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == label.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = this.createItemInfo(label, pack);
-					let newDetail = this.createDetailInfo(label, pack);
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-					this.getfocus()
-					
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == pack.number &&
-							r.batch == pack.batch) {
-							return r;
-						}
-					})
-				
-					if (detail == undefined) {
-						let newDetail = this.createDetailInfo(label, pack);
-						item.subList.push(newDetail);
-						this.getfocus()
-					} else {
-						if (detail.scaned) {
-							this.showErrorMessage("箱码[" + pack.number + "]批次[" + pack.batch + "]已经扫描")
-						}
-				
-					}
-				}
-				this.calcHandleQty();
+				this.setDataBatch(result)
 			},
 			
 			setDataBatch(result){