From e9cf297dddec567ddacda6f199eb6c99500ffad3 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sun, 23 Apr 2023 09:04:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/authDept.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index 72bc695..476d75d 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -92,7 +92,7 @@ 删除 From 486da451f05322a1587c1b0a3cead22472c359dd Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sun, 23 Apr 2023 11:39:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=20=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8=E5=8F=B7?= =?UTF-8?q?=20=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/register.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/views/register.vue b/src/views/register.vue index 6171533..23b3ad3 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -594,6 +594,19 @@ export default { callback(); } }; + //限制统一信用号 + const validatePatt = (rule, value, callback) => { + if ( + /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/.test( + value + ) === false + ) { + callback(new Error("请输入有效的的社会统一信用号")); + } else { + // 校验通过 + callback(); + } + }; return { inputQuery: { nickName: null, @@ -678,6 +691,7 @@ export default { creditNum: [ { required: true, message: "请输入统一社会信用号", trigger: "blur" }, + { validator: validatePatt, trigger: "blur" }, ], area: [{ required: true, message: "请选择所属地区", trigger: "blur" }], detailAddr: [ From 32d6ff45303dcc1e512d39fd375fd89750de85b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= Date: Sun, 23 Apr 2023 16:08:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/authDept.vue | 8 ++++---- src/views/system/dept/invWarehouse.vue | 11 ++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index 36e8ac8..7755d77 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -582,7 +582,7 @@ export default { }, /* 获取列表 */ getList() { - let qwe = this.checkdefault; + let line = this.checkdefault; this.loading = true; filterList(this.filterQuery) .then((response) => { @@ -591,11 +591,11 @@ export default { this.list = this.handleTree(depList, "code", "pcode"); //默认选中第一行列表 this.$nextTick(() => { - console.log(qwe); - if (qwe === null) { + console.log(line); + if (line === null) { this.$refs.deptTableRef.setCurrentRow(depList[0]); } else { - this.$refs.deptTableRef.setCurrentRow(qwe); + this.$refs.deptTableRef.setCurrentRow(line); } }); }) diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 469f037..a960f5f 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -9,15 +9,8 @@ placeholder="仓库名称" > - - - + + From fd2e7c35ad5e1be9e4baa64c9b0bc5dd3afd501f Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sun, 23 Apr 2023 16:12:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=AA=8C=E8=AF=81=E5=92=8C=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/myLogin.vue | 70 ++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.env.development b/.env.development index 3d5a50f..7d38ab8 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 供应商自助管理系统 +VUE_APP_TITLE = 供应商自助管理平台 # 开发环境配置 ENV = 'development' diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index 4496eea..322403d 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -95,13 +95,13 @@ style=" position: absolute; bottom: 0; - margin-left: 36%; - font-size: 18px; + margin-left: 20%; + font-size: 12px; color: white; " > - 软件名称: 医院UDI管理系统 + 软件名称: 医院UDI管理平台 { if (valid) { - this.loading = true; - if (this.loginForm.rememberMe) { - Cookies.set("username", this.loginForm.username, { expires: 30 }); - Cookies.set("password", encrypt(this.loginForm.password), { - expires: 30, - }); - // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30}); + if (this.loginForm.verificationCode) { + this.loading = true; + if (this.loginForm.rememberMe) { + Cookies.set("username", this.loginForm.username, { expires: 30 }); + Cookies.set("password", encrypt(this.loginForm.password), { + expires: 30, + }); + // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30}); + } else { + Cookies.remove("username"); + Cookies.remove("password"); + // Cookies.remove('rememberMe'); + } + + this.$store + .dispatch("Login", this.loginForm) + .then((res) => { + this.$router + .push({ path: this.redirect || "/" }) + .catch((res) => {}); + }) + .catch((res) => { + this.loading = false; + this.$refs.checkV.refresh(); + this.$message.error(res); + if (this.captchaEnabled) { + this.getCode(); + } + }); } else { - Cookies.remove("username"); - Cookies.remove("password"); - // Cookies.remove('rememberMe'); - } - this.$store - .dispatch("Login", this.loginForm) - .then((res) => { - this.$router - .push({ path: this.redirect || "/" }) - .catch((res) => {}); - }) - .catch((res) => { - this.loading = false; - this.$refs.checkV.refresh(); - this.$message.error(res); - if (this.captchaEnabled) { - this.getCode(); - } + this.$message({ + message: "请向右滑动完成验证", + type: "warning", }); + } } }); }, @@ -287,6 +296,7 @@ $light_gray: #eee; background-image: url("../assets/login.jpg"); background-size: 100vw 100vh; height: 100%; + overflow: hidden; input:-webkit-autofill, input:-webkit-autofill:hover, From b128d7af1e4cb4b28a40b00f13448c56b3b504f9 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Sun, 23 Apr 2023 17:30:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=95=E9=83=A8a=E6=A0=87=E7=AD=BE=20?= =?UTF-8?q?=E6=B0=B4=E5=B9=B3=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/myLogin.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index 322403d..463b006 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -95,13 +95,15 @@ style=" position: absolute; bottom: 0; - margin-left: 20%; font-size: 12px; color: white; + width: 100%; + display: flex; + justify-content: center; " > - 软件名称: 医院UDI管理平台 + 软件名称: 供应商自助管理平台