@@ -157,29 +146,33 @@
-
-
-
+
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}
+ {{ formatAmount(scope.row.totalAmount) }}
-
-
+
-
+
{{ scope.row.approveNode || '-' }}
+
+
+ {{ timeProcessing(scope.row.createTime) }}
+
+
+
-
+
@@ -591,6 +584,19 @@ export default {
});
}).catch(() => {
});
+ },
+ /** 格式化金额 */
+ formatAmount(value) {
+ if (value === null || value === undefined || value === '') return '0.00';
+ return Number(value).toLocaleString('en-US', {
+ minimumFractionDigits: 2,
+ maximumFractionDigits: 2
+ });
+ },
+ /** 时间处理 */
+ timeProcessing(value) {
+ if (value === null || value === undefined || value === '') return '';
+ return value.substring(0, 10);
}
}
};
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
index 50649f44..d32bd5b7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
@@ -129,6 +129,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
@Override
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
{
+ omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
+ omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
+
omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
// 设置初始版本号为 1