From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/721d8a3e-6a6f-42af-b8a7-5c6804a8cb29.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/814b887d-c395-4156-b140-fec1f52b0a29.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/Home.vue | 4 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue | 1
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6ca39b57-30a9-4b8e-bcf3-3e33452cf0d1.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs | 5 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34dfae94-920f-45ce-adeb-f8ad3bd2cda4.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1d2ae79-a1ef-4fd9-b947-642f84e68ae2.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs | 4 +-
代码管理/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue | 42 ++++++++++++--------
14 files changed, 37 insertions(+), 25 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
index f6f59be..60f6d2d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue"
@@ -15,22 +15,23 @@
</el-alert>
<div>
<el-input
- placeholder="璇疯緭鍏ュ瘑鐮�"
+ placeholder="璇疯緭鍏ユ棫瀵嗙爜"
v-model="password"
size="large"
style="width: 100%; margin-top: 15px"
/>
</div>
+ <div>
+ <el-input
+ placeholder="璇疯緭鍏ユ柊瀵嗙爜"
+ v-model="newpassword"
+ size="large"
+ style="width: 100%; margin-top: 15px"
+ />
+ </div>
<template #footer>
- <el-button
- type="primary"
- @click="savePwd()"
- >淇敼瀵嗙爜</el-button
- >
- <el-button
- @click="model = false"
- >鍏抽棴</el-button
- >
+ <el-button type="primary" @click="savePwd()">淇敼瀵嗙爜</el-button>
+ <el-button @click="model = false">鍏抽棴</el-button>
</template>
</vol-box>
</div>
@@ -39,30 +40,37 @@
import { defineComponent, defineAsyncComponent } from "vue";
export default defineComponent({
components: {
- VolBox: defineAsyncComponent(() => import("@/components/basic/VolBox.vue"))
+ VolBox: defineAsyncComponent(() => import("@/components/basic/VolBox.vue")),
},
data() {
return {
row: {},
password: "",
+ newpassword: "",
model: false,
};
},
methods: {
open(row) {
this.password = "";
+ this.newpassword = "";
this.row = row;
this.model = true;
},
savePwd() {
- if (!this.password) return this.$Message.error("璇疯緭瀵嗙爜");
+ if (!this.password) return this.$Message.error("璇疯緭鍏ユ棫瀵嗙爜");
+ if (!this.newpassword) return this.$Message.error("璇疯緭鍏ユ柊瀵嗙爜");
if (this.password.length < 6)
- return this.$Message.error("瀵嗙爜闀垮害鑷冲皯6浣�");
+ return this.$Message.error("鏃у瘑鐮侀暱搴﹁嚦灏�6浣�");
+ if (this.newpassword.length < 6)
+ return this.$Message.error("鏂板瘑鐮侀暱搴﹁嚦灏�6浣�");
let url =
- "/api/user/modifyUserPwd?password=" +
+ "/api/user/modifyPwd?oldPwd=" +
this.password +
- "&userName=" +
- this.row.UserName;
+ "&newPwd=" +
+ this.newpassword +
+ "&user_Id=" +
+ this.row.user_Id;
this.http.post(url, {}, true).then((x) => {
if (!x.status) {
return this.$message.error(x.message);
@@ -73,7 +81,7 @@
},
},
created() {},
-})
+});
</script>
<style lang="less" scoped>
h3 {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Home.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Home.vue"
index e94242b..10dd5e8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/Home.vue"
@@ -102,8 +102,8 @@
<p><strong>璐т綅鍙�:</strong>{{ currentLocation.locationCode }}</p>
<p>
<strong>璐т綅鎺掑垪灞�:</strong> {{ currentLocation.row }}鎺抺{
- currentLocation.layer
- }}鍒梴{ currentLocation.index }}灞�
+ currentLocation.index
+ }}鍒梴{ currentLocation.layer }}灞�
</p>
<p><strong>鐘舵��:</strong> {{ getStatusText(currentLocation) }}</p>
<p>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
index 7f971d9..acd9d1f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue"
@@ -29,6 +29,7 @@
const editFormFields = ref({
systemType: "0",
userName: "",
+ userPwd: "",
userTrueName: "",
role_Id: [],
deptIds: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
index 32eb1d3..aeeaf2e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
@@ -99,7 +99,7 @@
},
},
created() {
- this.http.post("/api/Sys_User/getCurrentUserInfo", {}, true).then((x) => {
+ this.http.post("/api/User/getCurrentUserInfo", {}, true).then((x) => {
if (!x.status) {
return this.$message(x.message);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34dfae94-920f-45ce-adeb-f8ad3bd2cda4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34dfae94-920f-45ce-adeb-f8ad3bd2cda4.vsidx"
new file mode 100644
index 0000000..633ac73
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34dfae94-920f-45ce-adeb-f8ad3bd2cda4.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ff40b11-cd92-4788-a7be-20a5831dbc17.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ff40b11-cd92-4788-a7be-20a5831dbc17.vsidx"
deleted file mode 100644
index e048ec6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ff40b11-cd92-4788-a7be-20a5831dbc17.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6ca39b57-30a9-4b8e-bcf3-3e33452cf0d1.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6ca39b57-30a9-4b8e-bcf3-3e33452cf0d1.vsidx"
new file mode 100644
index 0000000..7685b8c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6ca39b57-30a9-4b8e-bcf3-3e33452cf0d1.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/721d8a3e-6a6f-42af-b8a7-5c6804a8cb29.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/721d8a3e-6a6f-42af-b8a7-5c6804a8cb29.vsidx"
new file mode 100644
index 0000000..156889b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/721d8a3e-6a6f-42af-b8a7-5c6804a8cb29.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/814b887d-c395-4156-b140-fec1f52b0a29.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/814b887d-c395-4156-b140-fec1f52b0a29.vsidx"
new file mode 100644
index 0000000..7048f1a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/814b887d-c395-4156-b140-fec1f52b0a29.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/87c3d422-999c-4f0e-bcd1-ad1ce5be2f12.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/87c3d422-999c-4f0e-bcd1-ad1ce5be2f12.vsidx"
deleted file mode 100644
index 80a28e0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/87c3d422-999c-4f0e-bcd1-ad1ce5be2f12.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/af454f43-a2e0-43b7-b5ea-099c1370dd5d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/af454f43-a2e0-43b7-b5ea-099c1370dd5d.vsidx"
deleted file mode 100644
index f4d1b97..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/af454f43-a2e0-43b7-b5ea-099c1370dd5d.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c8b66c0c-0dc9-480a-b8ba-b20f8c6d6704.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c8b66c0c-0dc9-480a-b8ba-b20f8c6d6704.vsidx"
deleted file mode 100644
index cef5352..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c8b66c0c-0dc9-480a-b8ba-b20f8c6d6704.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1d2ae79-a1ef-4fd9-b947-642f84e68ae2.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1d2ae79-a1ef-4fd9-b947-642f84e68ae2.vsidx"
new file mode 100644
index 0000000..621d844
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1d2ae79-a1ef-4fd9-b947-642f84e68ae2.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea43ea12-ae8d-4d02-b381-7885d15583e4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea43ea12-ae8d-4d02-b381-7885d15583e4.vsidx"
deleted file mode 100644
index 7c933d8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea43ea12-ae8d-4d02-b381-7885d15583e4.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs"
index cc46628..8138bff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs"
@@ -20,6 +20,6 @@
WebResponseContent GetCurrentUserInfo();
- WebResponseContent ModifyPwd(string oldPwd, string newPwd);
+ WebResponseContent ModifyPwd(string oldPwd, string newPwd, int user_Id);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
index 11f2d94..10a75dd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
@@ -91,6 +91,8 @@
public override WebResponseContent UpdateData(SaveModel saveModel)
{
+ var role_Id = saveModel.MainData["role_Id"].ObjToInt();
+ if (role_Id < App.User.RoleId) return WebResponseContent.Instance.Error("鏃犱慨鏀规潈闄�");
UpdateIgnoreColOnExecute = x =>
{
return new List<string>
@@ -146,7 +148,7 @@
/// </summary>
/// <param name="parameters"></param>
/// <returns></returns>
- public WebResponseContent ModifyPwd(string oldPwd, string newPwd)
+ public WebResponseContent ModifyPwd(string oldPwd, string newPwd, int user_Id)
{
WebResponseContent content = WebResponseContent.Instance;
oldPwd = oldPwd?.Trim();
@@ -159,6 +161,7 @@
if (newPwd.Length < 6) return WebResponseContent.Instance.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
int userId = App.User.UserId;
+ if (user_Id != userId && user_Id != 0) return WebResponseContent.Instance.Error("涓嶅彲淇敼鍏朵粬鐢ㄦ埛瀵嗙爜");
string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == userId, s => s.UserPwd);
string _oldPwd = oldPwd.EncryptDES(AppSecret.User);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
index 47d63c8..5145232 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
@@ -43,9 +43,9 @@
}
[HttpPost, Route("modifyPwd")]
- public IActionResult ModifyPwd(string oldPwd, string newPwd)
+ public IActionResult ModifyPwd(string oldPwd, string newPwd, int user_Id)
{
- return Json(Service.ModifyPwd(oldPwd, newPwd));
+ return Json(Service.ModifyPwd(oldPwd, newPwd, user_Id));
}
[HttpGet, Route("getVierificationCode"), AllowAnonymous]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
index f16bbe7..84fdde3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
@@ -34,7 +34,7 @@
}); ;
builder.ConfigureApplication();
-App.ExpDateTime = DateTime.Parse("2025-09-01 00:00:00");
+App.ExpDateTime = DateTime.Parse("2025-09-01 09:00:00");
// 2、配置服务
builder.Services.AddSingleton(new AppSettings(builder.Configuration));//注册
--
Gitblit v1.9.3