page/productionReturn/coms 文件迁移 8/8-10/25

src/pages/productionReturn/coms/comReturn.vue

@@ -199,7 +199,7 @@
 						item.subList.push(newDetail);
 					} else {
 						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]重复扫描")
 						}
 					}
 				}
@@ -297,7 +297,7 @@
 							productionReturnRecordSubmit(params).then(res => {
 								uni.hideLoading()
 								if (res.data) {
-									this.showCommitSuccessMessage("提交成功<br>生成退料收货记录<br>" + res.data)
+									this.showCommitSuccessMessage("提交成功\n生成退料收货记录\n" + res.data)
 								} else {
 									this.showErrorMessage("提交失败[" + res.msg + "]")
 								}

src/pages/productionReturn/coms/comScanReturnPack.vue

@@ -108,8 +108,9 @@ const openScanPopup = (content, jobcontent) => {
   dataContent.value = content
   jobContent.value = jobcontent
   initData()
+  show.value = true
   setTimeout((res) => {
-    show.value = true
+    getfocus()
   }, 500)
 }
 const closeScanPopup = () => {