现场调试更改

pda/pages/warehouse/outbound/confirm.vue

@@ -20,11 +20,42 @@
           @confirm="handleBarcode" focus />
       </view>
     </view>
+	
+	<!-- <view class="scan-section">
+	  <view class="scan-header">
+	    <text class="scan-title">扫描出库托盘条码</text>
+	    <view class="scan-btn" @click="startScan">
+	      <uni-icons type="scan" size="18" color="#fa8c16"></uni-icons>
+	      <text class="scan-btn-text orange">扫码</text>
+	    </view>
+	  </view>
+	  <view class="input-wrap">
+	    <input class="scan-input" v-model="barcode" placeholder="请输入或扫描托盘条码"
+	      @confirm="handleBarcode" focus />
+	  </view>
+	</view> -->
 
     <!-- 出库信息 -->
     <view class="form-section" v-if="outboundInfo">
       <text class="form-title">出库信息</text>
       <view class="info-row">
+        <text class="info-label">版辊编号</text>
+        <text class="info-value">{{ outboundInfo.rollerNumber }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">颜色</text>
+        <text class="info-value">{{ outboundInfo.color }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">色序</text>
+        <text class="info-value">{{ outboundInfo.colorSequence }}</text>
+      </view>
+      <view class="info-row">
+        <text class="info-label">规格</text>
+        <text class="info-value">{{ outboundInfo.spec }}</text>
+      </view>
+
+      <!-- <view class="info-row">
         <text class="info-label">物料编码</text>
         <text class="info-value">{{ outboundInfo.materialCode }}</text>
       </view>
@@ -51,7 +82,7 @@
       <view class="info-row">
         <text class="info-label">出库口</text>
         <text class="info-value">{{ outboundInfo.portName }}</text>
-      </view>
+      </view> -->
     </view>
 
     <!-- 确认信息 -->
@@ -68,8 +99,8 @@
     </view>
 
     <!-- 操作按钮 -->
-    <view class="btn-section" v-if="outboundInfo">
-      <button class="btn btn-orange" @click="confirmOutbound">确认出库</button>
+    <view class="btn-section" >
+      <button class="btn btn-orange" v-if="outboundInfo" @click="confirmOutbound">确认出库</button>
       <button class="btn btn-default" @click="resetForm">重置</button>
     </view>
   </view>
@@ -83,6 +114,7 @@
       return {
         taskNo: '',
         barcode: '',
+		traCode: '',
         outboundInfo: null,
         confirmQty: '',
         form: {
@@ -112,21 +144,31 @@
           this.$modal.msg('请输入物料条码')
           return
         }
+        
         var that = this
-        var params = { taskNo: this.taskNo, barcode: this.barcode }
-        getOutboundDetail(params).then(function(res) {
+        // var params = { taskNo: this.taskNo, barcode: this.barcode }
+        var params = { barcode: this.barcode }
+        getOutboundDetail(this.barcode).then(function(res) {
           that.outboundInfo = res.data
           that.confirmQty = String(res.data.quantity)
           that.$modal.msgSuccess('出库信息获取成功')
         }).catch(function() {
           that.outboundInfo = null
+          that.$modal.msg('未找到该版辊信息，可能是无单据明细或已出库确认完成')
         })
       },
+	  
+	  
       confirmOutbound() {
+        if (!this.barcode) {
+          this.$modal.msg('请输入版辊号')
+          return
+        }
         if (!this.confirmQty) {
           this.$modal.msg('请输入实际数量')
           return
         }
+
         var data = {
           taskNo: this.taskNo,
           barcode: this.barcode,
@@ -229,6 +271,10 @@
   .scan-input {
     font-size: 28rpx;
     padding: 16rpx;
+    word-break: break-all;
+    width: 100%;
+    height: auto;
+    line-height: 1.4;
   }
 
   .form-section {
@@ -267,6 +313,9 @@
     border: 1rpx solid #e8e8e8;
     border-radius: 8rpx;
     padding: 16rpx;
+    width: 100%;
+    height: auto;
+    line-height: 1.4;
   }
 
   .info-row {