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 @@
 <template>
     <div>
-        <v-btn class="bg-blue-darken-1 mb-2" size="x-large" @click="getList()">
-            刷新
-        </v-btn>
+        <v-btn class="bg-blue-darken-1 mb-2" size="x-large" @click="getList()"> 刷新 </v-btn>
         <vxe-table v-loading="loading" :data="list">
             <vxe-column type="seq" width="60"></vxe-column>
             <vxe-column field="jobDateTime" title="提交时间"></vxe-column>
+            <vxe-column field="workorder" title="制造工单号"></vxe-column>
+            <vxe-column field="feedOrder" title="领料批次号"></vxe-column>
             <vxe-column field="processName" title="工序"></vxe-column>
             <vxe-column field="finishNum" title="完成数"></vxe-column>
             <vxe-column field="badNum" title="不良数"></vxe-column>
             <vxe-column field="worker" title="作业员"></vxe-column>
         </vxe-table>
-        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </div>
 </template>
 
@@ -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 @@
         </div>
         <vxe-table height="600" v-loading="loading" :data="list">
             <vxe-column type="seq" width="60"></vxe-column>
-            <vxe-column field="workorder" title="工单号"></vxe-column>
-            <vxe-column field="feedOrder" title="批次号"></vxe-column>
+            <vxe-column field="workorder" title="制造工单号"></vxe-column>
+            <vxe-column field="feedOrder" title="领料批次号"></vxe-column>
             <vxe-column field="productionName" title="主体品名"></vxe-column>
             <vxe-column field="productionCode" title="主体型号"></vxe-column>
             <vxe-column field="stoveCode" title="炉号"></vxe-column>
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 @@
         <v-btn class="bg-blue-darken-1 mb-2" size="x-large" @click="getList()"> 刷新 </v-btn>
         <vxe-table v-loading="loading" :data="list">
             <vxe-column type="seq" width="60"></vxe-column>
-            <vxe-column field="workorder" title="工单号"></vxe-column>
-            <vxe-column field="feedOrder" title="批次号"></vxe-column>
+            <vxe-column field="workorder" title="制造工单号"></vxe-column>
+            <vxe-column field="feedOrder" title="领料批次号"></vxe-column>
             <vxe-column field="processName" title="工序"></vxe-column>
             <vxe-column field="finishNum" title="完成数"></vxe-column>
             <vxe-column field="badNum" title="不良数"></vxe-column>
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 @@
                 <v-card color="blue-darken-4" class="left-content">
                     <v-tabs v-model="tab" bg-color="primary">
                         <v-tab value="工序报工">工序报工</v-tab>
-                        <v-tab value="此工单工序记录">此工单工序记录</v-tab>
+                        <v-tab value="此工单报工工序记录">此工单报工工序记录</v-tab>
                         <v-tab value="此工序今日记录">此工序今日记录</v-tab>
-                        <v-tab value="员工报工记录">员工报工记录</v-tab>
+                        <v-tab value="员工今日报工记录">员工今日报工记录</v-tab>
                         <v-tab value="工单查看">工单查看</v-tab>
                     </v-tabs>
                     <v-card-text>
@@ -18,8 +18,8 @@
                                         <v-text-field type="number" :label="processId === 10 ? '报工数' : '完成数'" v-model="formData.finishNum"></v-text-field>
                                         <v-text-field type="number" label="不良数" v-model="formData.badNum"></v-text-field>
                                         <v-text-field v-if="processId === 10" label="炉号" v-model="formData.stoveCode" required></v-text-field>
-                                        <v-text-field v-if="processId === 10" label="进料单" v-model="formData.feedOrder" required></v-text-field>
-                                        <v-text-field v-if="processId === 90" label="客户定单" v-model="formData.customerOrder" required></v-text-field>
+                                        <v-text-field v-if="processId === 10" label="领料批次号" v-model="formData.feedOrder" required></v-text-field>
+                                        <v-text-field v-if="processId === 90" label="客户订单号" v-model="formData.customerOrder" required></v-text-field>
                                         <v-text-field label="作业员" v-model="formData.worker"></v-text-field>
                                         <div class="d-flex justify-end">
                                             <v-btn class="bg-blue-darken-1" @click="submit">{{ getButtonName() }}</v-btn>
@@ -48,7 +48,7 @@
                                         </el-col>
                                     </el-row>
                                 </v-tabs-window-item>
-                                <v-tabs-window-item value="此工单工序记录">
+                                <v-tabs-window-item value="此工单报工工序记录">
                                     <el-card v-if="formData.workorder" class="mt-4">
                                         <TheWorkOrderProcessRecord :workorder="formData.workorder" :processId="processId"> </TheWorkOrderProcessRecord>
                                     </el-card>
@@ -58,7 +58,7 @@
                                         <TheDayAllProcessRecord :workorder="formData.workorder" :processId="processId"> </TheDayAllProcessRecord>
                                     </el-card>
                                 </v-tabs-window-item>
-                                <v-tabs-window-item value="员工报工记录">
+                                <v-tabs-window-item value="员工今日报工记录">
                                     <el-card class="mt-4">
                                         <ThePersonReportRecord :workorder="formData.workorder" :processId="processId" @openMessage="showDialog">
                                         </ThePersonReportRecord>
@@ -82,7 +82,7 @@
                     <v-fade-transition>
                         <el-card v-if="formData.workorder" class="mt-4">
                             <el-form :model="formData" label-width="auto" label-suffix=":">
-                                <el-form-item label="工单号">
+                                <el-form-item label="制造工单号">
                                     <el-text class="formItem text-big">{{ formData.workorder }}</el-text>
                                 </el-form-item>
                                 <el-form-item v-if="processId !== 10" label="炉号">
@@ -112,12 +112,22 @@
                                 <el-form-item label="材质">
                                     <el-text class="formItem">{{ formData.materialtextureCode }}</el-text>
                                 </el-form-item>
-                                <el-form-item label="工单日期">
+                                <el-form-item label="炉号">
+                                    <el-text class="formItem">{{ formData.stoveCode }}</el-text>
+                                </el-form-item>
+                                <el-form-item label="领料批次号">
+                                    <el-text class="formItem">{{ formData.feedOrder }}</el-text>
+                                </el-form-item>
+                                <el-form-item label="订单号">
+                                    <el-text class="formItem">{{ formData.customerOrder }}</el-text>
+                                </el-form-item>
+
+                                <!-- <el-form-item label="工单日期">
                                     <el-text class="formItem">{{ formData.workorderDate }}</el-text>
                                 </el-form-item>
                                 <el-form-item label="指示日期">
                                     <el-text class="formItem">{{ formData.instructionDate }}</el-text>
-                                </el-form-item>
+                                </el-form-item> -->
                             </el-form>
                         </el-card>
                     </v-fade-transition>