diff --git a/src/pages.json b/src/pages.json index 08280fd..ffa060b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1951,11 +1951,17 @@ } },{ "path": "pages/mes/workScheduling/processReportPeopleCheck", + "style": { + "navigationBarTitleText": "工序报工-选择人员", + "enablePullDownRefresh": true + } + },{ + "path": "pages/mes/workScheduling/processReportForm", "style": { "navigationBarTitleText": "工序报工", "enablePullDownRefresh": true } - }, + },, { "path": "pages/mes/productOffline/index", "style": { diff --git a/src/pages/mes/workScheduling/processReportForm.vue b/src/pages/mes/workScheduling/processReportForm.vue index 46ebc60..2ec730d 100644 --- a/src/pages/mes/workScheduling/processReportForm.vue +++ b/src/pages/mes/workScheduling/processReportForm.vue @@ -1,50 +1,42 @@ @@ -155,7 +139,14 @@ onShow(() => { } } } + ::v-deep .u-checkbox-group { display: grid !important; } + +.is-hover { + color: rgba(255, 255, 255, 0.6); + background-color: #179b16; + border-color: #179b16; +} diff --git a/src/pages/mes/workScheduling/processReportPeopleCheck.vue b/src/pages/mes/workScheduling/processReportPeopleCheck.vue index cd52bff..cf38ed7 100644 --- a/src/pages/mes/workScheduling/processReportPeopleCheck.vue +++ b/src/pages/mes/workScheduling/processReportPeopleCheck.vue @@ -57,17 +57,23 @@ async function getList() { if (status.value === 'nomore') return status.value = 'loading' proxy.$modal.loading('加载中') - if (list.value.length == 0) { - await workSchedulingApi.getConfigProcessWorker({ - planDayCode: "PO20240426-0022", - processCode: "FF-CY-002", - teamCode: "T01" - }).then((res) => { - if (res.data.length > 0) { - list.value = res.data - } - }) - } + await workSchedulingApi.getConfigProcessWorker({ + planDayCode: "PO20240426-0022", + processCode: "FF-CY-002", + teamCode: "T01" + }).then((res) => { + // if(res.data.leader){ + // list.value = res.data.list + // }else{ + uni.setNavigationBarTitle({ + title: 'test' + }) + uni.setStorageSync('processReportList', res.data.list); + uni.redirectTo({ + url: './processReportForm' + }); + // } + }) proxy.$modal.closeLoading() }