Merge branch 'dev' of http://192.168.0.115:3000/bill/4pc into dev

src/view/layout/nav.vue

@@ -43,8 +43,11 @@ import lySlide from "./slide/index.vue";
 import { usersPasswordEdit } from "@/view/quisk";
 import {
   editUserFetch,
+  UserType
 
 } from "@/request";
+import { reactive } from "vue";
+
 const name = computed(() => router.currentRoute.value.meta?.navClass as string);
 const routeName = computed(() => router.currentRoute.value.name as string);
 const logoutHandler = () => {
@@ -53,7 +56,28 @@ const logoutHandler = () => {
 };
 const passwordHandler = async () => {
   console.log('passwordHandler', user)
-  await usersPasswordEdit({ user: user.value, submit: editUserFetch });
+  const userObj = reactive<UserType>({
+    orgName: '',
+    createBy: "",
+    createTime: "",
+    fdkkId: 0,
+    head: "",
+    nickName: "",
+    orgId: 0,
+    status: 0,
+    tbStatus: 0,
+    updateBy: "",
+    updateTime: "",
+    userId: 0,
+    userName: "",
+    roleNames: ""
+  })
+  await usersPasswordEdit({
+    user: {
+      ...userObj,
+      ...user
+    }, submit: editUserFetch
+  });
 };
 errorHook.push((code) => {
   if (code === 4008) {