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

src/pages/productionReturn/coms/comReturnDetailCard.vue

@@ -95,12 +95,18 @@
 		},
 
 		mounted() {
-			if (this.detailOptions.length == 0) {
-				this.detailOptions = getDetailOption();
-			}
+			
 			if (this.scanOptions.length == 0) {
 				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty,this.settingParam.allowModifyLocation)
 			}
+			
+			if(import.meta.env.VITE_MANAGE_MODEL=="BY_PACKAGING"){
+				if (this.detailOptions.length == 0) {
+					this.detailOptions = getDetailOption();
+				}
+			}else {
+				this.scanOptions.splice(0,1)
+			}
 		},
 
 		methods: {

src/pages/productionReturn/job/okToReturnDetail.vue

@@ -371,8 +371,9 @@
 					var qty = result.label.qty;
 					var itemCode = result.label.itemCode;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					let itemcodes = this.detailSource.map(item=>item.itemCode).join(',')
 					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						this.showErrorMessage(`扫描的物料【 ${ result.label.itemCode} 】与任务明细中的物料【 ${itemcodes} 】不一致`)
 					} else {
 						var itemDetail = detail.subList.find(r => {
 							return r.batch == batch