扫描装箱

src/pages/mergePkg/api.js

@@ -209,3 +209,13 @@ export function batchDeleteMore(data) {
     loading: true,
   });
 }
+
+/**
+ * 扫描订单号装箱
+ */
+export function scanOrderNoCreate(data){
+	return http('/ecw/box-pkg-order/scanOrderNoCreate', data, {
+	  method: 'POST',
+	  loading: true,
+	});
+}

src/pages/mergePkg/package.vue

@@ -7,11 +7,13 @@
 	    v-model="keyword"
 	  	:focus="focusStart"
 	    :placeholder="$t('请扫描条形码')"
+		
 	    @iconClick="()=>{scanCode('loading')}"
 	    @confirm="searchCode"
 	    @submit="keyword=$event;searchCode()"
 	    ></scanlistener>
 	  </view>
+	   
     <view style="height: 60px; background: #2f4dae"></view>
     <view class="content-wrap">
       <view class="title">
@@ -290,7 +292,8 @@
 import {uniIcons} from '@dcloudio/uni-ui';
 import {
   createMergePkgOrder, createMergePkgOrderBatch, finishMergePkg,
-  getPkgPageByPkgId, getUnPkgPage, removeMergePkg, removeMergePkgBatch
+  getPkgPageByPkgId, getUnPkgPage, removeMergePkg, removeMergePkgBatch,
+  scanOrderNoCreate
 } from "./api";
 import {   batchCreateMore,batchDeleteMore,singleCreate,orderTagList } from "../tallyAir/api";
 import { getOrderDetailByBoxNo } from "../loading/api";
@@ -424,6 +427,9 @@ export default {
     },
     // 装箱
     pack(item){
+	  if(item.customsType!=='1'){
+		return msg(this.$t('订单非我司全代，不允许合包'))
+	  }	
       createMergePkgOrder({
         orderId: item.orderId,
         pkgId: this.pkgId
@@ -540,7 +546,14 @@ export default {
 	          break;
 	        case "loading":
 	          this.keyword = res.result;
-	          this.getData();
+	          //this.getData();
+			  //this.searchCode();
+			 
+			  scanOrderNoCreate({"orderNo":this.keyword,"pkgNum":this.pkgNum}).then(data=>{
+				  msg(this.$t('装箱成功'))
+				  this.getData()
+			  })
+			  
 	          break;
 	        case "unloadConfirm":
 	          this.unloadNumber = res.result;
@@ -551,8 +564,11 @@ export default {
 	  });
 	},
 	searchCode() {
+	 
 		setTimeout(this.getDetialOfSelfNO, 100)
+		
 	},
+	
 	/* 显示装柜纠错 */
 	showErrorCorrection(show) {
 	  this.errorModal = show;
@@ -576,6 +592,7 @@ export default {
 	  }, 1000);
 	},
 	getDetialOfSelfNO(){
+		
 		singleCreate({pkgId:this.pkgId,type:1,shipmentId: this.shipmentId,orderNumCode:this.keyword}).then((data)=>{
 			 this.showMessageAndReload("合包成功");
 			 let mainNumber = this.keyword.substring(