From 93bc3ed3aac6ae9df688a8a44b6dd62b58ce8e2a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 八月 2023 15:28:09 +0800
Subject: [PATCH] 出入库删除物流提示语文案修改
---
h5_standard/src/views/requisition/scrapped.vue | 3 ++-
minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue | 2 +-
server/src/main/java/doumeemes/config/shiro/ShiroSessionManager.java | 1 -
server/src/main/resources/application.yml | 2 +-
h5_standard/src/views/needToBeDealtWith/addWarehousing.vue | 3 ++-
h5_standard/src/views/needToBeDealtWith/outbound.vue | 3 ++-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/h5_standard/src/views/needToBeDealtWith/addWarehousing.vue b/h5_standard/src/views/needToBeDealtWith/addWarehousing.vue
index 3ab6379..1d9ab0b 100644
--- a/h5_standard/src/views/needToBeDealtWith/addWarehousing.vue
+++ b/h5_standard/src/views/needToBeDealtWith/addWarehousing.vue
@@ -272,7 +272,8 @@
// 鍒犻櫎
const dele = (index: any) => {
if (list.value.length === 1) {
- Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ // Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ Toast('鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭�')
return
}
list.value.splice(index, 1)
diff --git a/h5_standard/src/views/needToBeDealtWith/outbound.vue b/h5_standard/src/views/needToBeDealtWith/outbound.vue
index 4f4b6e4..5e71a6d 100644
--- a/h5_standard/src/views/needToBeDealtWith/outbound.vue
+++ b/h5_standard/src/views/needToBeDealtWith/outbound.vue
@@ -172,7 +172,8 @@
// 鍒犻櫎
const dele = (index: any) => {
if (list.value.length === 1) {
- Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ // Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ Toast('鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭紒')
return
}
list.value.splice(index, 1)
diff --git a/h5_standard/src/views/requisition/scrapped.vue b/h5_standard/src/views/requisition/scrapped.vue
index aca07c6..3c4852c 100644
--- a/h5_standard/src/views/requisition/scrapped.vue
+++ b/h5_standard/src/views/requisition/scrapped.vue
@@ -122,7 +122,8 @@
// 鍒犻櫎
const dele = (index: any) => {
if (list.value.length === 1) {
- Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ // Toast('鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�')
+ Toast('鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭�')
return
}
list.value.splice(index, 1)
diff --git a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
index 3217796..4e5b4ab 100644
--- a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
+++ b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
@@ -170,7 +170,7 @@
// 鍒犻櫎
dele(index) {
if (this.list.length === 1) {
- this.$refs.uToast.show({ type: 'default', message: "鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�" })
+ this.$refs.uToast.show({ type: 'default', message: "鑷冲皯淇濈暀涓�鏉＄墿娴佹竻鍗曚俊鎭�" })
return
}
this.list.splice(index, 1)
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroSessionManager.java b/server/src/main/java/doumeemes/config/shiro/ShiroSessionManager.java
index 4e58bec..cfc4c75 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroSessionManager.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroSessionManager.java
@@ -65,7 +65,6 @@
}
return sessionId;
}
-
@Override
public boolean isServletContainerSessions() {
return false;
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 954b731..c86705c 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -7,7 +7,7 @@
spring:
# application:
-# name: doumeemes
+# name: doumeemes
profiles:
active: standard
# JSON杩斿洖閰嶇疆
--
Gitblit v1.9.3