From 41a1eaf59f98e0a638d1b8ac63478be5ab42a17a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 17 Apr 2024 10:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=92=8C=E6=A3=80=E9=AA=8C=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/forgetPassword.vue | 27 ++++++++---- src/views/login/updatePassword.vue | 41 +++++++++++++++---- .../qms/inspection/inspectionJob/addForm.vue | 16 +++++++- 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/src/views/login/forgetPassword.vue b/src/views/login/forgetPassword.vue index deb9c7189..3511c919b 100644 --- a/src/views/login/forgetPassword.vue +++ b/src/views/login/forgetPassword.vue @@ -1,22 +1,22 @@ @@ -69,4 +69,17 @@ .smsbtn { margin-top: 33px; } + .box{ + border: 1px solid #dedede; + width: 500px; + margin: 100px auto 0px; + padding: 20px; + box-shadow: 0px 0px 20px rgba($color: #000000, $alpha: 0.1); + } + .title{ + text-align: center; + font-size: 20px; + font-weight: bold; + padding-bottom: 20px; + } diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue index e4564fb06..cbebe4dff 100644 --- a/src/views/login/updatePassword.vue +++ b/src/views/login/updatePassword.vue @@ -1,22 +1,30 @@ @@ -27,7 +35,7 @@ import { usePermissionStore } from '@/store/modules/permission' import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login' import * as UserApi from '@/api/system/user' - + import { View,Hide } from '@element-plus/icons-vue' const { t } = useI18n() const message = useMessage() const permissionStore = usePermissionStore() @@ -46,6 +54,9 @@ againPassword: '', mailKey: '', }) + const isShowPassword = ref(false) + const isShowAgainPassword = ref(false) + const loading = ref(false); const submitForm = async () => { try { @@ -75,4 +86,20 @@ .smsbtn { margin-top: 33px; } + .box{ + border: 1px solid #dedede; + width: 500px; + margin: 100px auto 0px; + padding: 20px; + box-shadow: 0px 0px 20px rgba($color: #000000, $alpha: 0.1); + } + .title{ + text-align: center; + font-size: 20px; + font-weight: bold; + padding-bottom: 20px; + } + ::v-deep(.el-input--large .el-input__inner){ + padding-right: 30px; + } diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index fce2ca3d9..ef6854448 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -61,6 +61,14 @@ + + +
+ +
+ + + @@ -320,6 +328,9 @@ const rules = ref({ 'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [ { required: true, message: '请选择评估代码', trigger: 'blur' } ], + 'inspectionJobCharacteristicsUpdateReqVO.inspectionQty': [ + { required: true, message: '请输入检验次数', trigger: 'blur' } + ], qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }] }) @@ -534,7 +545,7 @@ const submitForm = async () => { number += parseFloat(cur.sampleAmount) }) if(number != data.value.sampleTotalAmount){ - message.error(`采样数量之和不等于总数量`) + message.error(`采样数量之和不等于采样总数量`) return } } @@ -594,6 +605,9 @@ const submitForm = async () => { numberList.push( item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some( (cur, key) => { + console.log(12,cur.qualifiedQuantity) + console.log(13,cur.unqualifiedQuantity) + console.log(14,item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty) return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty) } )