From 20f1b568fab7025809438785e42d2a0bb281a3dc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 3 Oct 2024 17:06:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E7=94=A8=E6=88=B7=E5=8D=95=E4=B8=AA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                      |  2 +-
 src/views/system/user/index.vue | 73 ++++++++++++++++++++++-----------
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dd6eb0a..a877aa2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,7 +22,7 @@ steps:
       - export NODE_MODULES_PATH=`pwd`/node_modules
       # - npm config set registry https://registry.npmmirror.com
       - set NODE_OPTIONS=--openssl-legacy-provider
-      # - npm install
+      - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 00d5d9b..93062f8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,7 +1,9 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
-  <fvFormDialog v-if="showAddOrEditUserDialog" ref="formDialogRef" :title="dialogTitle" :form-schema="formSchema" :form-rules="formRules" @dialogCancel="handleCancel" @dialogSubmit="handleSubmit"></fvFormDialog>
+  <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
+                :form-schema="formSchema" :form-rules="formRules"
+                @dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
 </template>
 
 <script setup>
@@ -11,6 +13,7 @@ import {useCacheStore} from "@/stores/cache.js";
 
 const tableIns = ref()
 const formDialogRef = ref()
+const dialogType = ref("");
 const showAddOrEditUserDialog = ref(false)
 const dialogTitle = ref("");
 const searchConfig = reactive([
@@ -68,7 +71,7 @@ const tableConfig = reactive({
   api: '/user',
   params: {},
   btns: [
-    {name: '导入', key: 'add', type: 'primary'},
+    {name: '新增', key: 'add', type: 'primary'},
   ]
 })
 const formRules = reactive({
@@ -179,36 +182,60 @@ const headBtnClick = (key) => {
 }
 //新增用户
 const handleAdd = () => {
-  // showAddOrEditUserDialog.value = true
+  showAddOrEditUserDialog.value = true
   // formRules.value.password[0].required = true
   // restForm();
-  // dialogTitle.value = "新增用户";
-  // nextTick(()=>{
-  //   // 清空校验
-  //   formDialogRef.value.getFormInstance().clearValidate()
-  //   formDialogRef.value.getFormInstance().resetFields()
-  // })
+  dialogTitle.value = "新增用户";
+  dialogType.value = "add";
+  nextTick(() => {
+    // formDialogRef.value.getFormInstance().setValues({})
+    // 清空校验
+    formDialogRef.value.getFormInstance().clearValidate()
+    formDialogRef.value.getFormInstance().resetFields()
+  })
 };
+
+const handleEdit = (row) => {
+  formDialogRef.value.openOrCloseDialog(true)
+  getDetail(row)
+  dialogTitle.value = "编辑用户";
+  dialogType.value = "edit";
+}
+
+const getDetail = (row) => {
+  getUserDetail(row.userId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      nextTick(() => {
+        formDialogRef.value.getFormInstance().setValues(res.data)
+        // 清空校验
+        formDialogRef.value.getFormInstance().clearValidate()
+      })
+    } else {
+    }
+  })
+}
+
 //取消
 const handleCancel = () => {
   showAddOrEditUserDialog.value = false;
 };
-
 //提交
 const handleSubmit = async (formInstance) => {
   if (!formInstance) return;
-  formInstance.validate(async (valid) => {
-    if (!valid) return;
-    // if (title.value === "新增用户") {
-    //   addUser(userForm.value).then(res => {
-    //     if (res.code === 1000) {
-    //       ElMessage.success(res.msg);
-    //       isVisited.value = false;
-    //     } else {
-    //       ElMessage.error(res.msg);
-    //     }
-    //   });
-    // }
-  })
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  if (dialogType.value === "add") {
+    addUser(formInstance.getValues()).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  }
+  // editUser
 }
 </script>