diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..207ed13 Binary files /dev/null and b/dist.zip differ diff --git a/src/views/business/erp/service/service-applications-form.vue b/src/views/business/erp/service/service-applications-form.vue index bb88281..19b0da3 100644 --- a/src/views/business/erp/service/service-applications-form.vue +++ b/src/views/business/erp/service/service-applications-form.vue @@ -43,7 +43,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -237,7 +237,6 @@ 取消 保存 - 提交 @@ -300,10 +299,25 @@ // 活动类型变化处理 async function onActivityCategoryChange(categoryId) { - // 只有在非只读模式下才清空活动名称 - //if (!readonlyMode.value) { - //form.activityNameId = undefined; - //} + // 只有在非只读模式下才清空相关填写信息 + if (!readonlyMode.value) { + form.activityNameId = undefined; + form.serviceStart = undefined; + form.serviceEnd = undefined; + form.serviceDuration = undefined; + form.recordNo = undefined; + form.workloadScore = undefined; + form.beneficiaryCount = undefined; + form.organizerName = undefined; + form.organizerContact = undefined; + form.organizerPhone = undefined; + form.serviceContent = undefined; + form.proofMaterials = undefined; + form.attachmentIds = undefined; + defaultFileList.value = []; + currentActivity.value = {}; + currentActivityType.value = ''; + } if (!categoryId) { activityList.value = []; @@ -571,7 +585,24 @@ // 监听活动名称变化，更新活动类型和设置默认服务时长 watch( () => form.activityNameId, - (activityNameId) => { + (activityNameId, oldActivityNameId) => { + // 只有在非只读模式下且活动名称发生变化时才清空相关字段 + if (!readonlyMode.value && activityNameId !== oldActivityNameId) { + form.serviceStart = undefined; + form.serviceEnd = undefined; + form.serviceDuration = undefined; + form.recordNo = undefined; + form.workloadScore = undefined; + form.beneficiaryCount = undefined; + form.organizerName = undefined; + form.organizerContact = undefined; + form.organizerPhone = undefined; + form.serviceContent = undefined; + form.proofMaterials = undefined; + form.attachmentIds = undefined; + defaultFileList.value = []; + } + if (activityNameId) { const selectedActivity = activityList.value.find(activity => activity.goodsId === activityNameId); if (selectedActivity) { @@ -622,9 +653,9 @@ { validator: async (rule, value) => { // 只有dict类型需要验证服务开始时间 - if (currentActivityType.value === 'DICT' && !value) { - return Promise.reject('服务开始时间 必填'); - } + //if (currentActivityType.value === 'DICT' && !value) { + // return Promise.reject('服务开始时间 必填'); + //} return Promise.resolve(); } } @@ -633,9 +664,9 @@ { validator: async (rule, value) => { // 只有dict类型需要验证服务结束时间 - if (currentActivityType.value === 'DICT' && !value) { - return Promise.reject('服务结束时间 必填'); - } + //if (currentActivityType.value === 'DICT' && !value) { + //return Promise.reject('服务结束时间 必填'); + //} return Promise.resolve(); } } @@ -735,7 +766,7 @@ await formRef.value.validateFields(); save(); } catch (err) { - message.error('参数验证错误，请仔细填写表单数据!'); + message.error('数据错误，请仔细填写表单数据!'); } } diff --git a/src/views/business/erp/service/service-applications-list.vue b/src/views/business/erp/service/service-applications-list.vue index 286f8cd..c00cad6 100644 --- a/src/views/business/erp/service/service-applications-list.vue +++ b/src/views/business/erp/service/service-applications-list.vue @@ -11,10 +11,10 @@ - + - + ]*>/g, '').trim() + + // 创建临时DOM元素来解析HTML + const tempDiv = document.createElement('div') + tempDiv.innerHTML = html + + // 获取纯文本内容，并处理换行 + let text = tempDiv.textContent || tempDiv.innerText || '' + + // 移除多余的空格和换行符 + text = text.replace(/\s+/g, ' ').trim() + + return text } // 只读模式下获取活动类型列表 diff --git a/src/views/system/department/components/department-form-modal.vue b/src/views/system/department/components/department-form-modal.vue index 673d467..c978e24 100644 --- a/src/views/system/department/components/department-form-modal.vue +++ b/src/views/system/department/components/department-form-modal.vue @@ -24,6 +24,9 @@ + + + @@ -79,6 +82,7 @@ const emits = defineEmits(['refresh']); departmentName: undefined, parentId: undefined, sort: 0, + costVisibleFlag: false, //成本查看权限 }; const employeeSelect = ref(); diff --git a/src/views/system/employee/components/employee-form-modal/index.vue b/src/views/system/employee/components/employee-form-modal/index.vue index dfb6b09..fc674bb 100644 --- a/src/views/system/employee/components/employee-form-modal/index.vue +++ b/src/views/system/employee/components/employee-form-modal/index.vue @@ -49,10 +49,13 @@ - - {{ item.roleName }} + + {{ item.roleName }} + + +
取消 @@ -92,6 +95,10 @@ Object.assign(form, formDefault); if (rowData && !_.isEmpty(rowData)) { Object.assign(form, rowData); + // 处理角色ID数组，确保是单个Long值 + if (rowData.roleIdList && Array.isArray(rowData.roleIdList) && rowData.roleIdList.length > 0) { + form.roleIdList = rowData.roleIdList[0]; + } } visible.value = true; nextTick(() => { @@ -118,9 +125,10 @@ gender: GENDER_ENUM.MAN.value, loginName: undefined, phone: undefined, - roleIdList: undefined, + roleIdList: undefined, // 单个Long值 positionId: undefined, email: undefined, + costVisibleFlag: false, //成本查看权限 }; let form = reactive(_.cloneDeep(formDefault)); @@ -176,19 +184,23 @@ message.error('参数验证错误，请仔细填写表单数据!'); return; } + + // 准备提交数据，确保roleIdList是单个Long值 + const submitData = { ...form }; + SmartLoading.show(); if (form.employeeId) { - await updateEmployee(keepAdding); + await updateEmployee(submitData, keepAdding); } else { - await addEmployee(keepAdding); + await addEmployee(submitData, keepAdding); } } - async function addEmployee(keepAdding) { + async function addEmployee(submitData, keepAdding) { try { - let { data } = await employeeApi.addEmployee(form); + let { data } = await employeeApi.addEmployee(submitData); message.success('添加成功'); - emit('show-account', form.loginName, data); + emit('show-account', submitData.loginName, data); if (keepAdding) { reset(); } else { @@ -201,9 +213,9 @@ SmartLoading.hide(); } } - async function updateEmployee(keepAdding) { + async function updateEmployee(submitData, keepAdding) { try { - let result = await employeeApi.updateEmployee(form); + let result = await employeeApi.updateEmployee(submitData); message.success('更新成功'); if (keepAdding) { reset();