diff --git a/src/pages/mes/workScheduling/processReportForm.vue b/src/pages/mes/workScheduling/processReportForm.vue index b6d211e..d5dc866 100644 --- a/src/pages/mes/workScheduling/processReportForm.vue +++ b/src/pages/mes/workScheduling/processReportForm.vue @@ -112,7 +112,13 @@ function remove(index: number){ } /* 通用方法 */ onShow(() => { - list.value = uni.getStorageSync("processReportList") + uni.getStorageSync("processReportList").forEach(person=>{ + if(person.checked){ + person.reportList.forEach(report=>{ + list.value.push(report) + }) + } + }) }) diff --git a/src/pages/mes/workScheduling/processReportPeopleCheck.vue b/src/pages/mes/workScheduling/processReportPeopleCheck.vue index 4b0a43b..b997156 100644 --- a/src/pages/mes/workScheduling/processReportPeopleCheck.vue +++ b/src/pages/mes/workScheduling/processReportPeopleCheck.vue @@ -2,7 +2,7 @@ - + @@ -44,35 +44,11 @@ const data = ref({ processCode: '', nickName: '' }) -let checked: string | any[] = [] /* 是否显示"没有更多了" */ const status = ref('loadmore') /* 列表数据集 */ const list = ref([]) - -/* 列表调用API方法 */ -async function getList() { - if (status.value === 'nomore') return - status.value = 'loading' - proxy.$modal.loading('加载中') - - await workSchedulingApi.getConfigProcessWorker(data.value).then((res) => { - uni.setStorageSync("isLeader", res.data.leader) - if (res.data.leader) { - list.value = res.data.list - } else { - if (res.data.list.length == 0){ - _toast("没有可以报工项") - return - } - uni.setStorageSync("processReportList", res.data.list) - uni.redirectTo({ - url: "./processReportForm" - }) - } - }) - proxy.$modal.closeLoading() -} +let checked: string | any[] = [] function checkChange(checkedArray: any[]) { checked = checkedArray } @@ -81,26 +57,30 @@ function openDetail(item: any) { console.log(item) // proxy.$tab.navigateTo(`/pages/mes/orderDapPlan/detail?obj=${item}`) } - +function filterList(){ + list.value = [] + uni.getStorageSync("processReportList").forEach(person=>{ + if (person.personName.includes(data.value.nickName)){ + list.value.push(person) + } + }) +} /* 通用方法 */ onShow(() => { - list.value = [] - getList() }) function onSubmit() { if (checked.length == 0){ _toast("请选择人员") return + }else{ + uni.setStorageSync("processReportList", list.value) + uni.redirectTo({ + url: "/pages/mes/workScheduling/processReportForm" + }) } - uni.setStorageSync("processReportList", checked) - uni.redirectTo({ - url: "./processReportForm" - }) } onLoad((option) => { - // "{"status":"1","remark":null,"planMasterCode":"PO20240429-0015","schedulingCode":"9bb4ab0cfcc14e3284833506b5041571","productCode":"015.886-117","productName":null,"workroomCode":"work1","lineCode":"work1-line1","prouteCode":"015.886-117","planCount":25,"finishCount":0,"qualifiedCount":null,"unqualifiedCount":null,"flagDo":"0","planSubCode":null,"workingNode":"QD_HJ_01","workingTaskSort":1,"formType":"BATCH","workSort":0,"currentWorkstation":null,"planStartTime":null,"planEndTime":1714388234000,"realStartTime":null,"realFinishedTime":null,"qualityFormNo":null,"reason":null,"planNoDay":null,"batchCode":"M015.886-117-001","id":61,"createTime":1714370517000,"creator":"1"}" - data.value.planDayCode = uni.getStorageSync("processReportListParams").planMasterCode - data.value.processCode = uni.getStorageSync("processReportListParams").workingNode + list.value = uni.getStorageSync("processReportList") }) diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue index 7028151..c3c8457 100644 --- a/src/pages/mes/workScheduling/workScheduling.vue +++ b/src/pages/mes/workScheduling/workScheduling.vue @@ -83,27 +83,22 @@