From 60bbac48f55d52664ce27058ff52efc568e0bdb8 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 23 Dec 2024 19:32:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=E6=89=80=E6=9C=89?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=EF=BC=8C=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=8C=89=E7=85=A7=E5=85=A8=E5=B1=80=E7=BB=9F?=
=?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../warehouse/storageOrder/storageOrder.html | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
index 6b1bbb27..6549cdb8 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
@@ -258,91 +258,91 @@
/*暂收-采购单(仓库入库)*/
if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){
- actions.push('暂收 ');
+ actions.push('暂收 ');
}
/*暂收-采购单(仓库入库)详情*/
if (row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*暂收-采购单(采购入库)*/
if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && row.warehouseStorageStatus == 0 ){
- actions.push('暂收 ');
+ actions.push('暂收 ');
}
/*暂收-采购单(采购入库)详情*/
if (row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*暂收-委外单*/
if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && row.warehouseStorageStatus == 0 ){
- actions.push('暂收 ');
+ actions.push('暂收 ');
}
/*暂收-委外单 详情*/
if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 0 || row.warehouseStorageStatus == 1)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-采购单(采购入库)*/
if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-采购单(采购入库)详情*/
if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-采购单(仓库入库)*/
if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-采购单(仓库入库) 详情*/
if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-委外单*/
if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-委外单 详情*/
if ( row.warehouseStorageType == 4 && row.warehouseOrderType == 3 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-生产订单(生产入库)*/
if ( row.warehouseStorageType == 5 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-生产订单(生产入库) 详情*/
if ( row.warehouseStorageType == 5 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4) ){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-生产订单(委内入库)*/
if ( row.warehouseStorageType == 2 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-生产订单(委内入库) 详情*/
if ( row.warehouseStorageType == 2 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-退换货单*/
if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
- actions.push('入库 ');
+ actions.push('入库 ');
}
/*入库-退换货单 详情*/
if ( row.warehouseStorageType == 3 && row.warehouseOrderType == 2 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3 || row.warehouseStorageStatus == 4)){
- actions.push('详情 ');
+ actions.push('详情 ');
}
/*入库-退料单*/