运行调整

pda/pages/warehouse/inbound/bindTray.vue

@@ -318,11 +318,13 @@
         this.items.push({
           stockinDetailId: this.currentMaterial.stockinDetailId,
           productId: this.currentMaterial.rollerNumber,
-          // productName: this.currentMaterial.productName,
+          productName: this.currentMaterial.productName,
           rollerNumber: this.currentMaterial.rollerNumber,
+          length: this.currentMaterial.length,
+          perimeter: this.currentMaterial.perimeter,
           // colorSequence: this.currentMaterial.colorSequence,
-          color: this.currentMaterial.color,
-          spec: this.currentMaterial.spec,
+          // color: this.currentMaterial.color,
+          // spec: this.currentMaterial.spec,
           quantity: Number(this.currentQty)
         })
         // 清空当前扫码区，继续扫下一个
@@ -355,10 +357,13 @@
             return {
               stockinDetailId: i.stockinDetailId,
               productId: i.rollerNumber,
+              productName: i.productName,
               rollerNumber: i.rollerNumber,
-              colorSequence: i.colorSequence,
-              color: i.color,
-              spec: i.spec,
+              length: i.length,
+              perimeter: i.perimeter,
+              // colorSequence: i.colorSequence,
+              // color: i.color,
+              // spec: i.spec,
               quantity: i.quantity
             }
           })

pda/pages/warehouse/outbound/index.vue

@@ -28,7 +28,7 @@
 	    <uni-icons type="right" size="18" color="#ccc"></uni-icons>
 	  </view>
 	  
-	  <view class="menu-card" @click="navigateTo('/pages/warehouse/outbound/trayConfirmManual')">
+	  <!-- <view class="menu-card" @click="navigateTo('/pages/warehouse/outbound/trayConfirmManual')">
 	    <view class="card-left">
 	      <view class="card-icon red">
 	        <uni-icons type="checkmarkempty" size="24" color="#fff"></uni-icons>
@@ -39,7 +39,7 @@
 	      </view>
 	    </view>
 	    <uni-icons type="right" size="18" color="#ccc"></uni-icons>
-	  </view>
+	  </view> -->
 	  
 	  <view class="menu-card" @click="navigateTo('/pages/warehouse/outbound/container')">
 	    <view class="card-left">

pda/pages/warehouse/outbound/trayConfirm.vue

@@ -57,6 +57,7 @@
 
     <!-- 操作按钮 -->
     <view class="btn-section" >
+      <button class="btn btn-blue" v-if="outboundList" @click="handleBarcode">查询</button>
       <button class="btn btn-orange" v-if="outboundList" @click="stockoutComplete">托盘确认出库</button>
       <button class="btn btn-green" v-if="outboundList" @click="stockoutCompleteAll">一键确认出库</button>
       <button class="btn btn-default" @click="resetForm">重置</button>
@@ -437,6 +438,11 @@
     margin-bottom: 20rpx;
   }
 
+	.btn-blue {
+    background: #1da6fa;
+    color: #fff;
+  }
+  
   .btn-orange {
     background: #fa8c16;
     color: #fff;