From 5ceebe7d8aaa81f4157e3c2d36022f3b5bb5cbc9 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 10:04:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 8 ++++++++
Source/UBCS-WEB/src/views/docking/infoForm.vue | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 687f9bd..2d86517 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -88,6 +88,14 @@
newPassword: '',
newPassword1: '',
},
+ loginRules:{
+ username:[
+ { required: true, message: '璇疯緭鍏ヨ处鍙�', trigger: 'blur' }
+ ],
+ password: [
+ { required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' }
+ ],
+ },
rules: {
oldPassword: [
{ required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur' }
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 2403681..a40ebb4 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -28,7 +28,7 @@
</el-option>
</el-select>
</el-form-item>
- <div v-if="formData.dataFlowType=='push'">
+ <div v-if="formData.pushType !='5' && formData.pushType !='6'">
<el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
<vciWebRefer
:referConfig="{
--
Gitblit v1.9.3