移库

src/views/main.vue

@@ -73,6 +73,12 @@
           <span class="section-title">拣货出库</span>
         </div>
         <div class="button-grid">
+          <div class="menu-item" @click="navigateWithWarehouseCheck('inventory-move')">
+            <div class="menu-icon inventory-move">
+              <van-icon name="exchange" size="24" />
+            </div>
+            <div class="menu-text">移库</div>
+          </div>
           <div class="menu-item" @click="navigateWithWarehouseCheck('otherinout')">
             <div class="menu-icon other">
               <van-icon name="exchange" size="24" />
@@ -97,8 +103,6 @@
             </div>
             <div class="menu-text">委外发料</div>
           </div>
-        </div>
-        <div class="button-grid" style="margin-top: 8px;">
           <div class="menu-item disabled" @click="handleDisabledFeature('saleshipping')">
             <div class="menu-icon sales-delivery">
               <van-icon name="logistics" size="24" />
@@ -688,6 +692,10 @@ export default {
   background: linear-gradient(135deg, #17B3A3 0%, #1dc5ef 100%);
 }
 
+.menu-icon.inventory-move {
+  background: linear-gradient(135deg, #17B3A3 0%, #1dc5ef 100%);
+}
+
 .menu-text {
   font-size: 11px;
   color: #333;

src/views/modules/other-transaction/inventory-move.vue

@@ -107,10 +107,11 @@
 
         <!-- 底部操作按钮 -->
         <div class="bottom-actions" v-if="scannedItems.length > 0">
-          <button class="action-btn primary" @click="confirmMove">
-            确认移库
+          <button class="action-btn primary" @click="confirmMove" :disabled="loading">
+            <i v-if="loading" class="el-icon-loading"></i>
+            {{ loading ? '移库中...' : '确认移库' }}
           </button>
-          <button class="action-btn secondary" style="margin-left: 10px;" @click="cancelProcess">
+          <button class="action-btn secondary" style="margin-left: 10px;" @click="cancelProcess" :disabled="loading">
             取消
           </button>
         </div>
@@ -132,7 +133,8 @@ export default {
         targetLocationId: ''
       },
       scannedItems: [],
-      site: localStorage.getItem('site') || 'SITE01'
+      site: localStorage.getItem('site') || 'SITE01',
+      loading: false
     };
   },
   methods: {
@@ -307,8 +309,12 @@ export default {
         scannedItems: this.scannedItems
       };
 
+      // 开始loading
+      this.loading = true;
+
       // 调用后端API
       confirmInventoryMove(params).then(({ data }) => {
+        this.loading = false;
         if (data && data.code === 0) {
           this.$message({
             message: '移库成功！处理单元: ' + handlingUnitIds.length + '个',
@@ -316,19 +322,43 @@ export default {
             duration: 3000
           });
 
-          // 跳转回其他出入库页面
-          setTimeout(() => {
-            this.$router.push({ path: '/otherinout' });
-          }, 1000);
+          // 清空页面内容，留在当前页面
+          this.clearPageContent();
         } else {
           this.$message.error(data.msg || '移库失败');
         }
       }).catch(error => {
+        this.loading = false;
         console.error('移库失败:', error);
         this.$message.error('移库失败，请重试');
       });
     },
 
+    // 清空页面内容
+    clearPageContent() {
+      // 清空表单数据
+      this.moveForm = {
+        moveReason: '',
+        targetLocationId: ''
+      };
+      
+      // 清空已扫描的物料列表
+      this.scannedItems = [];
+      
+      // 清空扫描框
+      this.scanCode = '';
+      
+      // 重置为添加模式
+      this.isRemoveMode = false;
+      
+      // 让扫描框重新获得焦点
+      this.$nextTick(() => {
+        if (this.$refs.scanInput) {
+          this.$refs.scanInput.focus();
+        }
+      });
+    },
+
     // 取消处理
     cancelProcess() {
       if (this.scannedItems.length > 0) {
@@ -656,6 +686,27 @@ export default {
   transform: scale(0.98);
 }
 
+.action-btn:disabled {
+  background: #c0c4cc !important;
+  border-color: #c0c4cc !important;
+  color: white !important;
+  cursor: not-allowed !important;
+  transform: none !important;
+  box-shadow: none !important;
+}
+
+.action-btn:disabled:hover {
+  background: #c0c4cc !important;
+  transform: none !important;
+  box-shadow: none !important;
+}
+
+.action-btn.secondary:disabled {
+  background: #f5f7fa !important;
+  color: #c0c4cc !important;
+  border-color: #e4e7ed !important;
+}
+
 /* 响应式设计 */
 @media (max-width: 360px) {
   .status-bar {

src/views/modules/recv/inspectionResults.vue

@@ -127,15 +127,7 @@ export default {
       if (!this.scanCode.trim()) {
         return;
       }
-
-      // 判断是否为采购单条码或HandlingUnit条码
-      if (this.scanCode.startsWith('PO') || this.scanCode.startsWith('REC')) {
-        // 采购单或接收单条码，查询不合格单据
       this.searchUnqualifiedList();
-      } else {
-        // HandlingUnit条码，扫描添加明细
-        this.scanHandlingUnit();
-      }
     },
 
     // 查询检验不合格单据
@@ -264,7 +256,10 @@ export default {
       const typeMap = {
         'RETURN': '退货',
         'SCRAP': '报废',
-        'EXCHANGE': '换货'
+        'EXCHANGE': '换货',
+        'RETWORK': '退货',
+        'INVSCRAP': '报废',
+        'REWORK': '换货'
       };
       return typeMap[processType] || '未知';
     },
@@ -274,7 +269,10 @@ export default {
       const labelMap = {
         'RETURN': '退货数量',
         'SCRAP': '报废数量',
-        'EXCHANGE': '换货数量'
+        'EXCHANGE': '换货数量',
+        'RETWORK': '退货数量',
+        'INVSCRAP': '报废数量',
+        'REWORK': '换货数量'
       };
       return labelMap[processType] || '数量';
     },
@@ -284,7 +282,10 @@ export default {
       const styleMap = {
         'RETURN': 'color: #E6A23C; font-weight: 500;', // 橙色
         'SCRAP': 'color: #F56C6C; font-weight: 500;',  // 红色
-        'EXCHANGE': 'color: #409EFF; font-weight: 500;' // 蓝色
+        'EXCHANGE': 'color: #409EFF; font-weight: 500;', // 蓝色
+        'RETWORK': 'color: #E6A23C; font-weight: 500;', // 橙色
+        'INVSCRAP': 'color: #F56C6C; font-weight: 500;', // 红色
+        'REWORK': 'color: #409EFF; font-weight: 500;' // 蓝色
       };
       return styleMap[processType] || 'color: #666; font-weight: 500;';
     },

src/views/modules/recv/recv.vue

@@ -370,7 +370,8 @@ export default {
           username: localStorage.getItem('userName'),
           site: localStorage.getItem('site'),
           receiptNo: receiptNo,
-          needCheck:needCheck
+          needCheck:needCheck,
+          printLabel:"BIL标签"
         }
         const { data } = await printLabel(printRequest)
         if (data.code === 200) {

src/views/modules/recv/reprint-label.vue

@@ -245,7 +245,8 @@ export default {
           userId: localStorage.getItem('userName'),
           username: localStorage.getItem('userName'),
           site: localStorage.getItem('site'),
-          unitId: unitId
+          unitId: unitId,
+          printLabel:"BIL标签"
         }
         const { data } = await printLabel(printRequest)
         if (data.code === 200) {

src/views/modules/recv/unqualifiedProcess.vue

@@ -217,7 +217,7 @@ export default {
     validateAndAddLabel(unitId) {
       const params = {
         unitId: unitId,
-        site: this.$store.state.user.site,
+        site: localStorage.getItem('site'),
       };
 
       scanHandlingUnitLabel(params).then(({ data }) => {
@@ -237,11 +237,6 @@ export default {
             return;
           }
 
-          if (huInfo.orderRef2 !== this.processInfo.transNo) {
-            this.$message.error('该HandlingUnit不属于当前接收单，请检查');
-            return;
-          }
-
           // 检查物料是否匹配
           if (this.processInfo.partNo && huInfo.partNo !== this.processInfo.partNo) {
             this.$message.error('物料编码不匹配，请检查');