1

dengjunjie

6 天以前 72390e0230b64cd43fedf0ba8e17aba097568a4a

1

 ´úÂë¹ÜÀí/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 {

 ´úÂë¹ÜÀí/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>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/system/Sys_User.vue

@@ -29,6 +29,7 @@
    const editFormFields = ref({
      systemType: "0",
      userName: "",
      userPwd: "",
      userTrueName: "",
      role_Id: [],
      deptIds: "",

 ´úÂë¹ÜÀí/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);
      }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34dfae94-920f-45ce-adeb-f8ad3bd2cda4.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4ff40b11-cd92-4788-a7be-20a5831dbc17.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6ca39b57-30a9-4b8e-bcf3-3e33452cf0d1.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/721d8a3e-6a6f-42af-b8a7-5c6804a8cb29.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/814b887d-c395-4156-b140-fec1f52b0a29.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/87c3d422-999c-4f0e-bcd1-ad1ce5be2f12.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/af454f43-a2e0-43b7-b5ea-099c1370dd5d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c8b66c0c-0dc9-480a-b8ba-b20f8c6d6704.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1d2ae79-a1ef-4fd9-b947-642f84e68ae2.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ea43ea12-ae8d-4d02-b381-7885d15583e4.vsidx

Binary files differ

 ´úÂë¹ÜÀí/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);
    }
}

 ´úÂë¹ÜÀí/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);

 ´úÂë¹ÜÀí/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]

 ´úÂë¹ÜÀí/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));//注册