From 886ae8247c82e7e2dff876bba21bcafa9de98825 Mon Sep 17 00:00:00 2001 From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com> Date: Tue, 13 Jan 2026 13:49:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(forms):=20=E7=BB=9F=E4=B8=80=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81=E6=B6=88=E6=81=AF=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将多个表单验证消息统一设置为空字符串，保持一致性 - 移除导出功能按钮，使用注释方式禁用 - 调整对话框宽度、输入框样式和表单项布局 - 优化供应商列表页面的消息提示为中文 - 简化付款条款表单的验证逻辑并改进错误处理 - 调整表单分组间距和文本域行数设置 - 优化供应商货币和税率页面的验证规则配置 --- .../srmBaseInformation/srmDeliveryTerm.vue | 10 +-- .../srmBaseInformation/srmPaymentTerm.vue | 88 ++++++------------- .../srmSupplierCurrency.vue | 13 ++- .../srmBaseInformation/srmSupplierGroup.vue | 6 +- .../modules/srmBaseInformation/srmTax.vue | 12 ++- .../srmSupplier/com_srmSupplier_Address.vue | 5 ++ .../srmSupplier/srmSupplierAddress.vue | 59 ++++++------- .../modules/srmSupplier/supplierList.vue | 63 ++++--------- 8 files changed, 97 insertions(+), 159 deletions(-) diff --git a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue index 61d29bf..71e113b 100644 --- a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue +++ b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue @@ -16,7 +16,7 @@ 查询 新增 - 导出 + @@ -69,7 +69,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + @@ -83,7 +83,7 @@ - + @@ -194,14 +194,14 @@ deliveryTermId: [ { required: true, - message: '请输入交货条款编码', + message: ' ', trigger: 'blur' } ], deliveryTerm: [ { required: true, - message: '请输入交货条款描述', + message: ' ', trigger: 'blur' } ] diff --git a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue index 5776625..8b2dd0a 100644 --- a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue +++ b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue @@ -16,7 +16,7 @@ 查询 新增 - 导出 + @@ -83,7 +83,7 @@ - + @@ -284,7 +284,7 @@ export default { methods: { validateField(rule, value, callback) { if (!value || value.trim() === '') { - callback(new Error()); + callback(new Error(' ')); } else { callback(); } @@ -292,7 +292,7 @@ export default { validateDays(rule, value, callback) { if (!value || value.trim() === '') { - callback(new Error('请输入天数')); + callback(new Error(' ')); return; } const numberPattern = /^\d+$/; @@ -402,7 +402,7 @@ export default { paymentTerm: row.paymentTerm, site: row.site, active: row.active, - days: row.days, + days: row.days != null ? parseInt(row.days, 10) : '', type: row.type, createBy: row.createBy, updateBy: this.$store.state.user.name, @@ -454,64 +454,28 @@ export default { }, saveData () { - // 手动验证所有字段 - let valid = true; - if (!this.modalData.paymentTermId || this.modalData.paymentTermId.trim() === '') { - valid = false; - } - if (!this.modalData.paymentTerm || this.modalData.paymentTerm.trim() === '') { - valid = false; - } - if (!this.modalData.days || this.modalData.days.trim() === '') { - valid = false; - } + this.$refs.modalForm.validate(valid => { + if (!valid) return - if (valid) { - if (this.modalData.flag === '1') { - savePaymentTerm(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.getDataList() - this.modalFlag = false - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {} - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }).catch(error => { - console.error('保存付款条款失败:', error) - this.$message.error('保存失败: ' + (error.message || '网络错误')) - }) - } else { - updatePaymentTerm(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.getDataList() - this.modalFlag = false - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {} - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }).catch(error => { - console.error('更新付款条款失败:', error) - this.$message.error('更新失败: ' + (error.message || '网络错误')) - }) - } - } else { - // 触发表单验证，显示错误样式 - this.$refs.modalForm.validate(() => {}); - } + this.modalData.days = parseInt(this.modalData.days, 10) + + const api = this.modalData.flag === '1' + ? savePaymentTerm + : updatePaymentTerm + + api(this.modalData).then(({ data }) => { + if (data && data.code === 0) { + this.$message.success('操作成功') + this.modalFlag = false + this.getDataList() + } else { + this.$alert(data.msg || '操作失败', '错误') + } + }).catch(err => { + console.error(err) + this.$message.error('请求失败') + }) + }) }, //获取按钮的权限数据 diff --git a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue index 95e3520..da633b8 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue @@ -17,7 +17,7 @@ 查询 新增 - 导出 + @@ -236,19 +236,16 @@ export default { ], rules: { currency: [ - { required: true, message: '请输入货币编码', trigger: 'blur' } + { required: true, message: ' ', trigger: 'blur' } ], currencyDesc: [ - { required: true, message: '请输入货币描述', trigger: 'blur' } - ], - site: [ - { required: true, message: '请输入站点', trigger: 'blur' } + { required: true, message: ' ', trigger: 'blur' } ], active: [ - { required: true, message: '请选择状态', trigger: 'change' } + { required: true, message: ' ', trigger: 'change' } ], baseCurrency: [ - { required: true, message: '请选择是否基础货币', trigger: 'change' } + { required: true, message: ' ', trigger: 'change' } ] }, authSearch: false, diff --git a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue index 43cb465..e36221c 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue @@ -16,7 +16,7 @@ 查询 新增 - 导出 + @@ -232,14 +232,14 @@ supplierGroup: [ { required: true, - message: '请输入供应商分组代码', + message: ' ', trigger: ['blur','change'] } ], groupDesc: [ { required: true, - message: '请输入供应商分组描述', + message: ' ', trigger: ['blur','change'] } ] diff --git a/src/views/modules/srmBaseInformation/srmTax.vue b/src/views/modules/srmBaseInformation/srmTax.vue index 53f01cc..2dbfe3d 100644 --- a/src/views/modules/srmBaseInformation/srmTax.vue +++ b/src/views/modules/srmBaseInformation/srmTax.vue @@ -16,7 +16,7 @@ 查询 新增 - 导出 + @@ -69,10 +69,10 @@ - + - + @@ -80,7 +80,7 @@ @@ -219,6 +219,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -226,12 +227,15 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], taxRate: [ { + required: true, validator: this.validateTaxRate, + message: ' ', trigger: 'blur' } ] diff --git a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue index 9b6ab85..5b5639e 100644 --- a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue +++ b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue @@ -420,6 +420,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -427,6 +428,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -434,6 +436,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -441,6 +444,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -448,6 +452,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ] diff --git a/src/views/modules/srmSupplier/srmSupplierAddress.vue b/src/views/modules/srmSupplier/srmSupplierAddress.vue index 6b6f27b..cca1948 100644 --- a/src/views/modules/srmSupplier/srmSupplierAddress.vue +++ b/src/views/modules/srmSupplier/srmSupplierAddress.vue @@ -16,7 +16,7 @@ 查询 新增 - 导出 + @@ -68,49 +68,44 @@ - - + + - - - - - - - - + - + + - - + + + - + - - - + - + + + @@ -118,26 +113,24 @@ - - - + - + - - + + - + @@ -145,11 +138,11 @@ - - + + - + 保存 关闭 @@ -447,7 +440,7 @@ export default { supplierId: [ { required: true, - message: '供应商ID不能为空', + message: ' ', trigger: 'blur' } ], @@ -455,7 +448,7 @@ export default { addressId: [ { required: true, - message: '地址ID不能为空', + message: ' ', trigger: 'blur' } ], @@ -463,6 +456,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -470,6 +464,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -477,6 +472,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ], @@ -484,6 +480,7 @@ export default { { required: true, validator: this.validateField, + message: ' ', trigger: 'blur' } ] diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 12e7eb0..fdf0a87 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -305,37 +305,11 @@ -
- - - - - - - - - - - - - - - - - - - - - -
- -
- - + - + @@ -1101,14 +1075,11 @@ export default { site: this.$store.state.user.site, }, supplierRules: { - site: [ - { required: true, message: 'Site is required', trigger: 'blur' } - ], supplierNo: [ - { required: true, message: 'Supplier No is required', trigger: 'blur' } + { required: true, message: ' ', trigger: 'blur' } ], supplierName: [ - { required: true, message: 'Supplier Name is required', trigger: 'blur' } + { required: true, message: ' ', trigger: 'blur' } ] } } @@ -1347,7 +1318,7 @@ export default { // 编辑供应商 editSupplier() { if (!this.currentRow) { - this.$message.warning('Please select a supplier to edit') + this.$message.warning('请选择一个供应商修改') return } this.isAdd = false @@ -1362,37 +1333,37 @@ export default { apiCall.then(({data}) => { if (data && data.code === 0) { - this.$message.success(this.isAdd ? 'Supplier added successfully' : 'Supplier updated successfully') + this.$message.success(this.isAdd ? '新增供应商成功' : '修改供应商成功') this.supplierDialogVisible = false this.getMainData() // 重新加载数据 } else { - this.$message.error(data.msg || 'Operation failed') + this.$message.error(data.msg || '操作失败') } }).catch(error => { - this.$message.error('Operation failed: ' + error.message) + this.$message.error('操作失败: ' + error.message) }) } else { - this.$message.warning('Please fill in the required fields') + this.$message.warning('请填写必填字段') } }) }, // 删除供应商 deleteSupplier(row) { - this.$confirm('Are you sure you want to delete this supplier?', 'Confirm Delete', { - confirmButtonText: 'Confirm', - cancelButtonText: 'Cancel', + this.$confirm('你确定删除该供应商?', '确认删除', { + confirmButtonText: '确认', + cancelButtonText: '取消', type: 'warning' }).then(() => { deleteSrmSupplier(row.id).then(({data}) => { if (data && data.code === 0) { - this.$message.success('Supplier deleted successfully') + this.$message.success('供应商删除成功') this.getMainData() // 重新加载数据 } else { - this.$message.error(data.msg || 'Delete failed') + this.$message.error(data.msg || '删除失败') } }).catch(error => { - this.$message.error('Delete failed: ' + error.message) + this.$message.error('删除失败: ' + error.message) }) }) } @@ -1460,11 +1431,11 @@ export default { /* 表单分组样式 */ .form-section { - margin-bottom: 10px; + margin-bottom: 5px; } .form-section:last-child { - margin-bottom: 10px; + margin-bottom: 5px; } /* 输入框样式 */