diff --git a/oms_web/oms_vue/src/views/login.vue b/oms_web/oms_vue/src/views/login.vue
index 996992f2..6b2f50ba 100644
--- a/oms_web/oms_vue/src/views/login.vue
+++ b/oms_web/oms_vue/src/views/login.vue
@@ -72,8 +72,8 @@ export default {
title: process.env.VUE_APP_TITLE,
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin@123",
+ username: "",
+ password: "",
rememberMe: false,
code: ""
},
diff --git a/oms_web/oms_vue/src/views/project/info/ProductConfig.vue b/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
index d4aebb76..0a1a72c1 100644
--- a/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
+++ b/oms_web/oms_vue/src/views/project/info/ProductConfig.vue
@@ -33,7 +33,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
@@ -195,7 +195,7 @@
-
+
@@ -286,7 +286,8 @@ export default {
selectProductVisible: false,
currentProductType: '1', // 1:软件 2:硬件 11,22,99:服务
currentEditType: '', // software, hardware, maintenance
- currentEditIndex: -1
+ currentEditIndex: -1,
+ editableProductBomCodes: ['8813A3YA','8813A3YB','8813A7U4','8813A7U2']
};
},
computed: {
@@ -527,6 +528,21 @@ export default {
hardwareProjectProductInfoList: this.hardwareList,
maintenanceProjectProductInfoList: this.maintenanceList
};
+ },
+ isCataloguePriceEditable(row) {
+ return !this.isActionDisabled && this.editableProductBomCodes.includes(row.productBomCode);
+ },
+ handleCataloguePriceChange(row) {
+ let cataloguePrice = parseFloat(String(row.cataloguePriceFormat).replace(/,/g, ''));
+ if (isNaN(cataloguePrice)) {
+ cataloguePrice = 0;
+ }
+ row.cataloguePrice = this.preciseCurrencyRound(cataloguePrice, 2);
+ row.cataloguePriceFormat = this.formatAmount(row.cataloguePrice);
+
+ // Recalculate based on new catalogue price
+ this.calculateRow(row);
+ this.emitChange();
}
}
};
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
index 471dd395..8f0a482c 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java
@@ -377,8 +377,8 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService {
serviceInfo.setServiceLevel(productInfo.getProductBomCode());
serviceInfo.setServiceDescribe(productInfo.getProductDesc());
serviceInfo.setServiceStartTime(startTime);
- serviceInfo.setServiceEndTime(DateUtils.addYears(startTime, year));
startTime = DateUtils.addYears(startTime, year);
+ serviceInfo.setServiceEndTime(DateUtils.addDays(startTime, -1));
serviceInfoList.add(serviceInfo);
return startTime;
}