diff --git a/dist.rar b/dist.rar new file mode 100644 index 0000000..bbf5a27 Binary files /dev/null and b/dist.rar differ diff --git a/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue b/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue index 6456d51..a6b94bf 100644 --- a/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue +++ b/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue @@ -1,18 +1,17 @@ @@ -26,10 +25,10 @@ const props = defineProps({ processId: { type: [String, Number], default: '' - }, + } }) watch([() => props.workorder, () => props.processId], () => { - getList(); + getList() }) const loading = ref(false) const list = ref([]) @@ -38,7 +37,7 @@ const queryParams = reactive({ name: '', pageNum: 1, pageSize: 10, - processId: null, + processId: null }) import { GetReportByProcessId } from '@/api/reportFlow/index' function getList() { @@ -47,7 +46,7 @@ function getList() { let params = queryParams params.workorder = props.workorder params.processId = props.processId - GetReportByProcessId(params).then(res => { + GetReportByProcessId(params).then((res) => { const { code, data } = res if (code == 200) { list.value = data.result diff --git a/src/views/touchScreen/report/components/TheWorkOrderList.vue b/src/views/touchScreen/report/components/TheWorkOrderList.vue index 94eddef..acb6bfc 100644 --- a/src/views/touchScreen/report/components/TheWorkOrderList.vue +++ b/src/views/touchScreen/report/components/TheWorkOrderList.vue @@ -15,8 +15,8 @@ - - + + diff --git a/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue b/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue index 4bad3df..fc4d05b 100644 --- a/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue +++ b/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue @@ -3,8 +3,8 @@ 刷新 - - + + diff --git a/src/views/touchScreen/report/index.vue b/src/views/touchScreen/report/index.vue index f5622d2..b17c1f7 100644 --- a/src/views/touchScreen/report/index.vue +++ b/src/views/touchScreen/report/index.vue @@ -5,9 +5,9 @@ 工序报工 - 此工单工序记录 + 此工单报工工序记录 此工序今日记录 - 员工报工记录 + 员工今日报工记录 工单查看 @@ -18,8 +18,8 @@ - - + +
{{ getButtonName() }} @@ -48,7 +48,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -82,7 +82,7 @@ - + {{ formData.workorder }} @@ -112,12 +112,22 @@ {{ formData.materialtextureCode }} - + + {{ formData.stoveCode }} + + + {{ formData.feedOrder }} + + + {{ formData.customerOrder }} + + +