From d7ed7a88d1ae6a4fd63901f2ad0a4d0ce60459d9 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期二, 03 六月 2025 17:32:06 +0800 Subject: [PATCH] 客户信息修改 --- src/api/system/user.js | 5 + src/views/basicData/customerFile/index.vue | 38 ++++++++++++ src/views/login.vue | 83 +++++++++------------------ 3 files changed, 68 insertions(+), 58 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index 5b5bb50..4ce34da 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -142,9 +142,10 @@ }) } // 閮ㄩ棬鍒楄〃 -export function userDeptList(userId) { +export function userDeptList(params) { return request({ - url: '/userDeptList/' + userId, + url: '/userDeptList', method: 'get', + params: params }) } diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue index 68311f0..e3d020f 100644 --- a/src/views/basicData/customerFile/index.vue +++ b/src/views/basicData/customerFile/index.vue @@ -63,6 +63,25 @@ </el-row> <el-row :gutter="30"> <el-col :span="12"> + <el-form-item label="閾惰鍩烘湰鎴凤細" prop="basicBankAccount"> + <el-input v-model="form.basicBankAccount" placeholder="璇疯緭鍏�" clearable/> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="閾惰璐﹀彿锛�" prop="bankAccount"> + <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏�" clearable/> + </el-form-item> + </el-col> + </el-row> + <el-row :gutter="30"> + <el-col :span="12"> + <el-form-item label="寮�鎴疯鍙凤細" prop="bankCode"> + <el-input v-model="form.bankCode" placeholder="璇疯緭鍏�" clearable/> + </el-form-item> + </el-col> + </el-row> + <el-row :gutter="30"> + <el-col :span="12"> <el-form-item label="缁存姢浜猴細" prop="maintainer"> <el-select v-model="form.maintainer" placeholder="璇烽�夋嫨" clearable disabled> <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/> @@ -130,6 +149,18 @@ prop: 'contactPhone', }, { + label: '閾惰鍩烘湰鎴�', + prop: 'basicBankAccount', + }, + { + label: '閾惰璐﹀彿', + prop: 'bankAccount', + }, + { + label: '寮�鎴疯鍙�', + prop: 'bankCode', + }, + { label: '缁存姢浜�', prop: 'maintainer', }, @@ -178,6 +209,9 @@ contactPhone: '', maintainer: '', maintenanceTime: '', + basicBankAccount:'', + bankAccount:'', + bankCode:'' }, rules: { customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], @@ -188,6 +222,10 @@ contactPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], maintainer: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }], maintenanceTime: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }], + basicBankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + bankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + bankCode: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + } }) const { searchForm, form, rules } = toRefs(data) diff --git a/src/views/login.vue b/src/views/login.vue index 1cc6cfd..a6173d0 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -10,6 +10,7 @@ size="large" auto-complete="off" placeholder="璐﹀彿" + @input="deptListSearch" > <template #prefix><el-icon><User /></el-icon></template> </el-input> @@ -26,6 +27,11 @@ > <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> </el-input> + </el-form-item> + <el-form-item prop="currentFatoryId"> + <el-select v-model="loginForm.currentFatoryId" placeholder="璇烽�夋嫨鍏徃" > + <el-option v-for="item in factoryList" :key="item.deptId" :label="item.deptName" :value="item.deptId" /> + </el-select> </el-form-item> <!-- <el-form-item prop="code" v-if="captchaEnabled">--> <!-- <el-input--> @@ -59,27 +65,6 @@ </el-form-item> <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox> </el-form> - <el-dialog - v-model="modalView" - title="鐧诲綍閮ㄩ棬" - width="500" - :show-close="false"> - <el-form :model="factoryCommitForm"> - <el-form-item> - <el-select v-model="currentFatoryId"> - <el-option v-for="item in factoryList" :key="item.deptId" :label="item.deptName" :value="item.deptId" /> - </el-select> - </el-form-item> - </el-form> - <template #footer> - <div class="dialog-footer"> - <el-button @click="cancelLogin">鍙栨秷</el-button> - <el-button type="primary" @click="factoryCommit()"> - 纭 - </el-button> - </div> - </template> - </el-dialog> <!-- 搴曢儴 --> <!-- <div class="el-login-footer">--> <!-- <span>Copyright 漏 2018-2025 ruoyi.vip All Rights Reserved.</span>--> @@ -88,7 +73,7 @@ </template> <script setup> -import {getCodeImg, loginCheckFactory} from "@/api/login" +import {getCodeImg} from "@/api/login" import Cookies from "js-cookie" import { encrypt, decrypt } from "@/utils/jsencrypt" import useUserStore from '@/store/modules/user' @@ -104,12 +89,7 @@ username: "admin", password: "admin123", rememberMe: false, - // code: "", - uuid: "" -}) - -const factoryCommitForm = ref({ - deptId:'' + currentFatoryId:'', }) const loginRules = { @@ -125,8 +105,6 @@ // 娉ㄥ唽寮�鍏� const register = ref(false) const redirect = ref(undefined) - -const modalView = ref(false) const factoryList = ref([]) const currentFatoryId = ref('') @@ -150,14 +128,15 @@ Cookies.remove("password") Cookies.remove("rememberMe") } - // 璋冪敤action鐨勭櫥褰曟柟娉� - userStore.loginCheck(loginForm.value).then(res => { - // 鏌ヨ鐢ㄦ埛閮ㄩ棬 - userDeptList(res.data).then(res => { - factoryList.value = res.data - modalView.value = true - }) - + userStore.loginCheckFactory(loginForm.value).then(res => { + const query = route.query + const otherQueryParams = Object.keys(query).reduce((acc, cur) => { + if (cur !== "redirect") { + acc[cur] = query[cur] + } + return acc + }, {}) + router.push({ path: redirect.value || "/", query: otherQueryParams }) }).catch(() => { loading.value = false // 閲嶆柊鑾峰彇楠岃瘉鐮� @@ -166,21 +145,6 @@ } }) } - }) -} - -// 褰撳墠鐧诲綍鍏徃/閮ㄩ棬纭 -function factoryCommit(){ - loginForm.value.factoryId = currentFatoryId.value - userStore.loginCheckFactory(loginForm.value).then(res => { - const query = route.query - const otherQueryParams = Object.keys(query).reduce((acc, cur) => { - if (cur !== "redirect") { - acc[cur] = query[cur] - } - return acc - }, {}) - router.push({ path: redirect.value || "/", query: otherQueryParams }) }) } @@ -205,9 +169,16 @@ } } -function cancelLogin() { - modalView.value = false - loading.value = false +function deptListSearch() { + if(loginForm.value.username){ + userDeptList({userName:loginForm.value.username}).then(res => { + console.log('res', res) + factoryList.value = res.data + }) + }else { + factoryList.value = [] + } + } getCode() -- Gitblit v1.9.3