From 3ca621bafb6b258ae5afc78e84ae329bcef862ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Mon, 22 Jun 2026 14:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/propertiesItem/propertiesModel.vue | 31 ++--- .../modules/srmSupplier/supplierList.vue | 2 +- src/views/modules/sys/department.vue | 130 ++++++++++-------- 3 files changed, 88 insertions(+), 75 deletions(-) diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue index 965c6fc..186fb85 100644 --- a/src/views/modules/base/propertiesItem/propertiesModel.vue +++ b/src/views/modules/base/propertiesItem/propertiesModel.vue @@ -19,14 +19,11 @@ - - - - - - - + + + + + 查询 @@ -95,7 +92,7 @@ {{ row.active === 'Y' ? '启用' : '停用' }} + :style="{color:row.active === 'Y' ? '#67C23A' : '#F56C6C'}">{{ row.active || '' }} - - + + + + + @@ -393,12 +392,8 @@ import { } from "@/api/base/properties.js" import Chooselist from '@/views/modules/common/Chooselist' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' -import DictDataSelect from "../../sys/dict-data-select.vue"; - - export default { components: { - DictDataSelect, Chooselist }, watch: { @@ -538,7 +533,7 @@ export default { columnProp: 'active', headerAlign: "center", align: "center", - columnLabel: '状态', + columnLabel: '是否在用', columnHidden: false, columnImage: false, columnSortable: false, @@ -968,7 +963,7 @@ export default { return false } if (this.modalData.active == '' || this.modalData.active == null) { - this.$alert('选择状态！', '错误', { + this.$alert('请选择是否在用！', '错误', { confirmButtonText: '确定' }) return false diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 875dce1..4895bb1 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -1153,7 +1153,7 @@ export default { supplierNo: '', supplierName: '', supplierDocType: '', - active: '', + active: 'Y', supplierGroup:'', abc: '', sourcingStaff: '', diff --git a/src/views/modules/sys/department.vue b/src/views/modules/sys/department.vue index fa1c91c..5b50142 100644 --- a/src/views/modules/sys/department.vue +++ b/src/views/modules/sys/department.vue @@ -2,18 +2,18 @@
- + - + - Query - Add + 查询 + 新增 - {{ "Export" }} + {{ "导出" }} @@ -60,17 +60,17 @@ header-align="center" align="center" width="220" - label="Actions"> + label="操作"> @@ -105,16 +105,24 @@ header-align="center" align="center" width="130" - label="Actions"> + label="操作"> + + + + + + + + - - - - - UserName + 用户名 - + - + - + - - + + - - + + + :key="u.value" + :label="u.label" + :value="u.value"> - Save - Cancel + 保存 + 关闭 - + - + - + @@ -191,8 +199,8 @@ --> - Save - Cancel + 保存 + 关闭 @@ -315,7 +323,7 @@ export default { columnProp: 'departmentId', headerAlign: "center", align: "center", - columnLabel: 'Department Id', + columnLabel: '部门编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -333,7 +341,7 @@ export default { columnProp: 'departmentName', headerAlign: "center", align: "left", - columnLabel: 'Department Name', + columnLabel: '部门名称', columnHidden: false, columnImage: false, columnSortable: false, @@ -388,7 +396,7 @@ export default { columnProp: 'createDate', headerAlign: "center", align: "center", - columnLabel: 'Create Date', + columnLabel: '创建日期', columnHidden: false, columnImage: false, columnSortable: false, @@ -406,7 +414,7 @@ export default { columnProp: 'createBy', headerAlign: "center", align: "left", - columnLabel: 'Creator', + columnLabel: '创建人', columnHidden: false, columnImage: false, columnSortable: false, @@ -424,7 +432,7 @@ export default { columnProp: 'updateDate', headerAlign: "center", align: "center", - columnLabel: 'Update Date', + columnLabel: '更新日期', columnHidden: false, columnImage: false, columnSortable: false, @@ -442,7 +450,7 @@ export default { columnProp: 'updateBy', headerAlign: "center", align: "left", - columnLabel: 'Update By', + columnLabel: '更新人', columnHidden: false, columnImage: false, columnSortable: false, @@ -498,8 +506,11 @@ export default { } const self = (this.memberForm.username || '').trim().toLowerCase() return this.memberList - .map(r => r.username) - .filter(u => u && u.trim().toLowerCase() !== self) + .filter(r => (r.username || '').trim() !== '' && (r.username || '').trim().toLowerCase() !== self) + .map(r => ({ + value: r.username, + label: this.formatUserWithDisplay(r.username, r.userDisplay) + })) } }, @@ -530,6 +541,13 @@ export default { methods: { isAuth, + formatUserWithDisplay (username, userDisplay) { + const u = (username || '').trim() + const d = (userDisplay || '').trim() + if (!u) return '' + if (!d) return u + return `${u}(${d})` + }, clearDeptMemberSelection () { this.currentDept = null this.memberList = [] @@ -583,11 +601,11 @@ export default { }, openAddMember () { if (!this.currentDept) { - this.$message.warning('Please select a department first') + this.$message.warning('请先选择部门') return } this.memberFormMode = 'add' - this.memberDialogTitle = 'Add Member' + this.memberDialogTitle = '新增成员' this.memberForm = { username: '', jobTitle: '', @@ -599,7 +617,7 @@ export default { openEditMember (row) { if (!this.currentDept) return this.memberFormMode = 'edit' - this.memberDialogTitle = 'Edit Member' + this.memberDialogTitle = '编辑成员' const dm = (row.deptManagerFlag || 'N').toString().toUpperCase() this.memberForm = { username: row.username, @@ -611,7 +629,7 @@ export default { }, openMemberUserChooser () { if (!this.currentDept || !this.currentDept.site) { - this.$message.warning('Please select a department first') + this.$message.warning('请先选择部门') return } this.memberPickerActive = true @@ -649,7 +667,7 @@ export default { if (!this.currentDept) return const username = (this.memberForm.username || '').trim() if (!username) { - this.$message.warning('Please pick an account (click Account)') + this.$message.warning('请选择用户账号（点击用户名）') return } const payload = { @@ -665,26 +683,26 @@ export default { const req = this.memberFormMode === 'add' ? saveAccessDeptMember(payload) : updateAccessDeptMember(payload) req.then(({ data }) => { if (data && data.code === 0) { - this.$message.success('Saved') + this.$message.success('保存成功') this.memberDialogVisible = false this.loadMembers() } else { - this.$message.error((data && data.msg) || 'Save failed') + this.$message.error((data && data.msg) || '保存失败') } }).catch(e => { - const msg = (e.response && e.response.data && e.response.data.msg) || e.message || 'Save failed' + const msg = (e.response && e.response.data && e.response.data.msg) || e.message || '保存失败' this.$message.error(msg) }) } if (this.memberFormMode === 'add') { this.verifyUserExistsInSite(username).then(exists => { if (!exists) { - this.$message.warning('User does not exist or has no access to this site') + this.$message.warning('用户不存在或没有当前工厂权限') return } const dup = this.memberList.some(m => (m.username || '').trim().toLowerCase() === username.toLowerCase()) if (dup) { - this.$message.warning('This member is already in the department') + this.$message.warning('该成员已在此部门中') return } doSave() @@ -857,9 +875,9 @@ export default { // 删除 deleteDepartment (row) { - this.$confirm(`Delete this department?`, 'Prompt', { - confirmButtonText: 'Confirm', - cancelButtonText: 'Cancel', + this.$confirm(`确定删除该部门吗？`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', type: 'warning' }).then(() => { departmentDelete(row).then(({data}) => {