Merge branch '250217外协发出一键选择工序，报工维护修改，分选包装后自动周转' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue into 250217外协发出一键选择工序，报工维护修改，分选包装后自动周转

src/views/business/innerOutsource/DialogProducts.vue

@@ -122,9 +122,20 @@ function handleSearch() {
 /** 多选事件 */
 function handleMultipleSelected() {
   if (multipleSelected.value) {
+    let flag = true
+  selections.value.forEach(element => {
+    console.log(element.originalCarrier)
+    if(element.originalCarrier == undefined){
+      flag = false
+      proxy.$message.error("选中批次有箱号为空，请检查！");
+    }
+  });
+  if(flag){
     multipleSelected.value(selections.value);
+    close();
+  }
   }
-  close();
+  
 }
 
 defineExpose({

src/views/business/innerOutsource/index.vue

@@ -221,7 +221,8 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
-  queryParams.value = {};
+  queryParams.value = { pageNum: 1,
+    pageSize: 10,};
   innerOutsourceStore().setInnerOutsourceQueryParams(null);
   getNowDate();
   getPassDate();

src/views/business/outsource/DialogProducts.vue

@@ -122,9 +122,20 @@ function handleSearch() {
 /** 多选事件 */
 function handleMultipleSelected() {
   if (multipleSelected.value) {
+    let flag = true
+    console.log(selections.value)
+  selections.value.forEach(element => {
+    console.log(element.originalCarrier)
+    if(element.originalCarrier == undefined){
+      flag = false
+      proxy.$message.error("选中批次有箱号为空，请检查！");
+    }
+  });
+  if(flag){
     multipleSelected.value(selections.value);
+    close();
+  }
   }
-  close();
 }
 
 defineExpose({