diff --git a/src/files/edit/SE071.js b/src/files/edit/SE071.js index 2b1f001..fdf3361 100644 --- a/src/files/edit/SE071.js +++ b/src/files/edit/SE071.js @@ -104,13 +104,21 @@ export default { if (totalCount < 2) { return } + + var Department = {} for (var i = 1; i < totalCount; i++) { //本行数据 如果为空 取上一行的 DEPARTMENT_ID Nav_Department - if (stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) { - let iRow = { ...stateData.Nav_ListPlanDetail[i] }; - iRow.DEPARTMENT_ID = stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID - iRow.Nav_Department = stateData.Nav_ListPlanDetail[i - 1].Nav_Department - saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" }) + if ((stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) && stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID) { + Department = { + ID: stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID, + NAME: stateData.Nav_ListPlanDetail[i - 1].Nav_Department.NAME + } + if (Department.ID != null && Department.ID != undefined) { + let iRow = { ...stateData.Nav_ListPlanDetail[i] }; + iRow.DEPARTMENT_ID = Department.ID + iRow.Nav_Department = Department + saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" }) + } } } }, @@ -118,9 +126,15 @@ export default { btnSyncListDep: ({ stateData, saveRowRecord }) => { var totalCount = stateData.Nav_ListPlanDetail.length var listDetailDepartment = [] + var listDetailDepartmentPer = [] + debugger for (var i = 0; i < totalCount; i++) { - if (stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment != null && stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment.length > 0) { - listDetailDepartment = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment //取被同步的数据 只要有数据就赋值 + listDetailDepartmentPer = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment + if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) { + listDetailDepartmentPer = listDetailDepartmentPer.filter(e => e.IS_DELETED == null || !e.IS_DELETED) + } + if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) { + listDetailDepartment = listDetailDepartmentPer //取被同步的数据 只要有数据就赋值 } else if (listDetailDepartment != null && listDetailDepartment.length > 0) { let updateList = []; for (let j = 0; j < listDetailDepartment.length; j++) {