diff --git a/jsconfig.json b/jsconfig.json
index 86b1741..288cafc 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,4 +1,3 @@
-/* 主要作用是vscode导入使用别名时可以自动化提示文件路径 */
 {
   "compilerOptions": {
     "experimentalDecorators": true,
diff --git a/package.json b/package.json
index ffc8e62..384604f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@vueuse/core": "^10.7.0",
     "@wangeditor/editor": "^5.1.1",
     "@wangeditor/editor-for-vue": "^5.1.11",
+    "@xpyjs/gantt": "^2.1.14",
     "axios": "^1.6.2",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.13",
@@ -27,6 +28,7 @@
     "element-plus": "^2.8.5",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.6",
+    "gantt-elastic": "^1.0.12",
     "highlight.js": "^11.5.1",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.2.1",
diff --git a/src/api/reportFlow/index.js b/src/api/reportFlow/index.js
index f38ac81..72364e7 100644
--- a/src/api/reportFlow/index.js
+++ b/src/api/reportFlow/index.js
@@ -1,4 +1,14 @@
 import request from '@/utils/request'
+
+// 获取工单列表
+export function GetWorkOrdersByDate(params) {
+  return request({
+    url: '/mobile/reportflow/get_workorders_by_date',
+    method: 'get',
+    params
+  })
+}
+
 // 获取工单信息
 export function GetWorkOrderDetail(params) {
   return request({
diff --git a/src/main.js b/src/main.js
index 46bef90..c9dbba2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,6 +33,11 @@ const vuetify = createVuetify({
   directives
 })
 
+/// ============= 甘特图 =================
+import Gantt from '@xpyjs/gantt'
+import '@xpyjs/gantt/index.css'
+/// ====================================
+
 import App from './App'
 import router from './router'
 import directive from './directive' // directive
@@ -105,4 +110,4 @@ app.component('MyTable', MyTable)
 
 directive(app)
 vxetb(app)
-app.use(pinia).use(router).use(plugins).use(ElementPlus, {}).use(elementIcons).use(vueI18n).use(vuetify).mount('#app')
+app.use(pinia).use(router).use(plugins).use(ElementPlus, {}).use(elementIcons).use(vueI18n).use(vuetify).use(Gantt).mount('#app')
diff --git a/src/views/productManagement/WorkGantt/components/gantt.vue b/src/views/productManagement/WorkGantt/components/gantt.vue
new file mode 100644
index 0000000..3d21e23
--- /dev/null
+++ b/src/views/productManagement/WorkGantt/components/gantt.vue
@@ -0,0 +1,22 @@
+<template>
+    <x-gantt data-id="index" :data="props.dataList">
+        <x-gantt-column prop="name" />
+    </x-gantt>
+</template>
+<script setup>
+const props = defineProps({
+    dataList: {
+        type: Array,
+        default: () => []
+    }
+})
+
+
+
+</script>
+<style scoped>
+#gantt {
+    width: 100%;
+    height: 500px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/productManagement/WorkGantt/index.vue b/src/views/productManagement/WorkGantt/index.vue
new file mode 100644
index 0000000..1af92ca
--- /dev/null
+++ b/src/views/productManagement/WorkGantt/index.vue
@@ -0,0 +1,104 @@
+<!--
+ * @Descripttion: (进度跟踪)
+ * @Author: (admin)
+ * @Date: (2024-07-16)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" @submit.prevent>
+            <!-- <el-form-item label="工序" prop="workorder">
+                <el-input v-model.trim="queryParams.workorder" clearable placeholder="请输入工单号" />
+            </el-form-item>
+            <el-form-item label="产品名称" prop="productionName">
+                <el-input v-model.trim="queryParams.productionName" clearable placeholder="请输入产品名称" />
+            </el-form-item>
+            <el-form-item label="产品编码" prop="productionCode">
+                <el-input v-model.trim="queryParams.productionCode" clearable placeholder="请输入产品编码" />
+            </el-form-item> -->
+            <el-form-item label="查询日期" prop="workorderDate">
+                <el-date-picker v-model="queryParams.workorderDate" type="daterange" range-separator="到"
+                    start-placeholder="开始时间" end-placeholder="结束时间" placeholder="请选择日期区间" />
+            </el-form-item>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <Gantt v-loading="loading" :dataList="dataList"></Gantt>
+    </div>
+</template>
+
+<script setup>
+/// ======================= 甘特图 ========================
+import Gantt from './components/gantt.vue'
+/// =======================================================
+
+
+
+const { proxy } = getCurrentInstance()
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    workorderDate: [proxy.dayjs(), proxy.dayjs()],
+    status: -1,
+    sort: 'sort',
+    sortType: 'asc'
+})
+const loading = ref(false)
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+import {
+    listProWorkorderNoCheck
+} from '@/api/productManagement/proworkorder.js'
+function getList() {
+    dataList.value = [
+        {
+            index: 1,
+            startDate: "2024-011-01",
+            endDate: "2024-011-20",
+            name: "周计划1",
+            children: []
+        },
+        {
+            index: 2,
+            startDate: "2024-12-01",
+            endDate: "2024-12-31",
+            name: "周计划2",
+            children: [
+                {
+                    index: 3,
+                    startDate: "2024-12-01",
+                    endDate: "2024-12-15",
+                    name: "日计划1",
+                    children: []
+                }
+            ]
+        }
+    ]
+    // loading.value = true
+    // listProWorkorderNoCheck(queryParams).then((res) => {
+    //     const { code, data } = res
+    //     if (code == 200) {
+    //         dataList.value = data.result
+    //         console.log(data);
+    //         total.value = data.totalNum
+    //         loading.value = false
+    //     }
+    // })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/components/scanInput.vue b/src/views/touchScreen/components/scanInput.vue
index 76de8ef..405cfb3 100644
--- a/src/views/touchScreen/components/scanInput.vue
+++ b/src/views/touchScreen/components/scanInput.vue
@@ -3,13 +3,18 @@
         <!-- <el-input ref="inputRef" v-model="input" type="password" placeholder="请扫码" @blur="doInputBlur"
             @change="doInputChange">
         </el-input> -->
-        <v-text-field prepend-inner-icon="mdi-line-scan" type="password" ref="inputRef" autofocus label="请扫码"
-            v-model="input" variant="solo-inverted" @keydown="handleKeyPress">
+        <v-text-field prepend-inner-icon="mdi-line-scan" ref="inputRef" :type="passwordShow ? 'text' : 'password'"
+            autofocus label="请扫码" v-model="input" variant="solo-inverted" @keydown="handleKeyPress">
             <template v-slot:append>
-                <v-btn class="bg-blue-darken-1" size="x-large" prepend-icon="mdi-line-scan"
-                    @click="doInputChange(input)">
-                    扫码
-                </v-btn>
+                <div>
+                    <v-icon :icon="passwordShow ? 'mdi-eye' : 'mdi-eye-off'"
+                        @click="passwordShow = !passwordShow"></v-icon>
+
+                    <v-btn class="bg-blue-darken-1 ml-2" size="x-large" prepend-icon="mdi-line-scan"
+                        @click="doInputChange(input)">
+                        扫码
+                    </v-btn>
+                </div>
             </template>
         </v-text-field>
 
@@ -21,6 +26,7 @@
 import { getCurrentInstance, onMounted, onUnmounted, ref } from 'vue'
 const { proxy } = getCurrentInstance()
 const inputRef = ref(null)
+const passwordShow = ref(true)
 const input = ref('')
 // 自动重新聚焦
 function autoInputFocus() {
diff --git a/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue b/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue
new file mode 100644
index 0000000..6456d51
--- /dev/null
+++ b/src/views/touchScreen/report/components/TheDayAllProcessRecord.vue
@@ -0,0 +1,64 @@
+<template>
+    <div>
+        <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="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" />
+    </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+    workorder: {
+        type: String,
+        default: ''
+    },
+    processId: {
+        type: [String, Number],
+        default: ''
+    },
+})
+watch([() => props.workorder, () => props.processId], () => {
+    getList();
+})
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const queryParams = reactive({
+    name: '',
+    pageNum: 1,
+    pageSize: 10,
+    processId: null,
+})
+import { GetReportByProcessId } from '@/api/reportFlow/index'
+function getList() {
+    loading.value = true
+    list.value = []
+    let params = queryParams
+    params.workorder = props.workorder
+    params.processId = props.processId
+    GetReportByProcessId(params).then(res => {
+        const { code, data } = res
+        if (code == 200) {
+            list.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+onMounted(() => {
+    getList()
+})
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/report/components/ThePersonReportRecord.vue b/src/views/touchScreen/report/components/ThePersonReportRecord.vue
new file mode 100644
index 0000000..5a9bab2
--- /dev/null
+++ b/src/views/touchScreen/report/components/ThePersonReportRecord.vue
@@ -0,0 +1,78 @@
+<template>
+    <div>
+        <v-text-field label="作业员" v-model="queryParams.name">
+            <template v-slot:append>
+                <v-btn class="bg-blue-darken-1" size="x-large" @click="getList()">
+                    搜索
+                </v-btn>
+            </template>
+        </v-text-field>
+        <vxe-table v-loading="loading" :data="list">
+            <vxe-column type="seq" width="60"></vxe-column>
+            <vxe-column field="worker" title="作业员"></vxe-column>
+            <vxe-column field="processName" title="工序"></vxe-column>
+            <vxe-column field="jobDateTime" title="提交时间"></vxe-column>
+            <vxe-column field="finishNum" title="完成数"></vxe-column>
+            <vxe-column field="badNum" title="不良数"></vxe-column>
+        </vxe-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" />
+    </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+    workorder: {
+        type: String,
+        default: ''
+    },
+    processId: {
+        type: [String, Number],
+        default: ''
+    },
+})
+// watch([() => props.workorder, () => props.processId], () => {
+//     getList();
+// })
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const queryParams = reactive({
+    name: '',
+    pageNum: 1,
+    pageSize: 10,
+    processId: null,
+})
+import { GetReportInfoByName } from '@/api/reportFlow/index'
+function getList() {
+    if (queryParams.name === '') {
+        let msgJson = {
+            dialog: true,
+            class: 'bg-amber',
+            title: '异常提示',
+            text: '请扫姓名拼音'
+        }
+        proxy.$emit('openMessage', msgJson)
+        return
+    }
+    loading.value = true
+    list.value = []
+    let params = queryParams
+    params.workorder = props.workorder
+    params.processId = props.processId
+    GetReportInfoByName(params).then(res => {
+        const { code, data } = res
+        if (code == 200) {
+            list.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+onMounted(() => {
+
+})
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/report/components/TheWorkOrderList.vue b/src/views/touchScreen/report/components/TheWorkOrderList.vue
new file mode 100644
index 0000000..bd585ea
--- /dev/null
+++ b/src/views/touchScreen/report/components/TheWorkOrderList.vue
@@ -0,0 +1,86 @@
+<template>
+    <div>
+        <div class="mb-2">
+            <el-form inline="">
+                <el-form-item label="开始时间">
+                    <el-date-picker :clearable="false" v-model="queryParams.startDate" type="date" size="large" />
+                </el-form-item>
+                <el-form-item label="结束时间">
+                    <el-date-picker :clearable="false" v-model="queryParams.endDate" type="date" size="large" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" size="large" @click="getList()">
+                        查询
+                    </el-button>
+                </el-form-item>
+            </el-form>
+
+        </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="productionName" title="主体品名"></vxe-column>
+            <vxe-column field="productionCode" title="主体型号"></vxe-column>
+            <vxe-column field="stoveCode" title="炉号"></vxe-column>
+            <vxe-column field="planNum" title="计划数量"></vxe-column>
+            <vxe-column title="操作" width="160">
+                <template #default="{ row }">
+                    <el-button type="success" @click="handleChouse(row)">选择</el-button>
+                </template>
+            </vxe-column>
+        </vxe-table>
+        <!-- <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" /> -->
+    </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+    workorder: {
+        type: String,
+        default: ''
+    },
+    processId: {
+        type: [String, Number],
+        default: ''
+    },
+})
+// watch([() => props.workorder, () => props.processId], () => {
+//     getList();
+// })
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const queryParams = reactive({
+    name: '',
+    startDate: proxy.dayjs().startOf('day').toDate(),
+    endDate: proxy.dayjs().endOf('day').toDate(),
+    pageNum: 1,
+    pageSize: 10,
+    processId: null,
+})
+import { GetWorkOrdersByDate } from '@/api/reportFlow/index'
+function getList() {
+    loading.value = true
+    list.value = []
+    let params = queryParams
+    params.workorder = props.workorder
+    params.processId = props.processId
+    GetWorkOrdersByDate(params).then(res => {
+        const { code, data } = res
+        if (code == 200) {
+            list.value = data
+            loading.value = false
+        }
+    })
+}
+function handleChouse(row) {
+    proxy.$emit('chouseWorkorder', row.workorder)
+}
+onMounted(() => {
+    getList()
+})
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue b/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue
new file mode 100644
index 0000000..3020d16
--- /dev/null
+++ b/src/views/touchScreen/report/components/TheWorkOrderProcessRecord.vue
@@ -0,0 +1,53 @@
+<template>
+    <div>
+        <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="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-column field="jobDateTime" title="提交时间"></vxe-column>
+        </vxe-table>
+    </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+    workorder: {
+        type: String,
+        default: ''
+    },
+    processId: {
+        type: [String, Number],
+        default: ''
+    },
+})
+watch([() => props.workorder, () => props.processId], () => {
+    getList();
+})
+const loading = ref(false)
+const list = ref([])
+import { GetWorkOrderReportWorkList } from '@/api/reportFlow/index'
+function getList() {
+    loading.value = true
+    list.value = []
+    const params = { workorder: props.workorder, processId: props.processId }
+    GetWorkOrderReportWorkList(params).then(res => {
+        if (res.code == 200) {
+            list.value = res.data
+        } else {
+            list.value = []
+        }
+        loading.value = false
+    })
+}
+onMounted(() => {
+    getList()
+})
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/report/index.vue b/src/views/touchScreen/report/index.vue
index 602aedc..33296db 100644
--- a/src/views/touchScreen/report/index.vue
+++ b/src/views/touchScreen/report/index.vue
@@ -8,6 +8,7 @@
                         <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>
                         <v-fade-transition>
@@ -33,57 +34,29 @@
                                 </v-tabs-window-item>
                                 <v-tabs-window-item value="此工单工序记录">
                                     <el-card v-if="formData.workorder" class="mt-4">
-                                        <vxe-table align="center" :data="reportWorkerOrderList">
-                                            <vxe-column type="seq" width="60"></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-column field="jobDateTime" title="提交时间"></vxe-column>
-                                        </vxe-table>
+                                        <TheWorkOrderProcessRecord :workorder="formData.workorder"
+                                            :processId="processId">
+                                        </TheWorkOrderProcessRecord>
                                     </el-card>
                                 </v-tabs-window-item>
                                 <v-tabs-window-item value="此工序今日记录">
                                     <el-card class="mt-4">
-                                        <v-btn style="margin-bottom: 20px" class="bg-blue-darken-1 margin-bottom-4"
-                                            size="x-large" @click="nowdayReportOrderList()">
-                                            搜索
-                                        </v-btn>
-                                        <vxe-table align="center" :data="nowdayReportDataList">
-                                            <vxe-column type="seq" width="60"></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-column field="jobDateTime" title="提交时间"></vxe-column>
-                                        </vxe-table>
-                                        <pagination :total="total1" v-model:page="queryParams1.pageNum"
-                                            v-model:limit="queryParams1.pageSize" @pagination="nowdayReportOrderList" />
+                                        <TheDayAllProcessRecord :workorder="formData.workorder" :processId="processId">
+                                        </TheDayAllProcessRecord>
                                     </el-card>
                                 </v-tabs-window-item>
                                 <v-tabs-window-item value="员工报工记录">
                                     <el-card class="mt-4">
-                                        <div>
-                                            <v-text-field label="作业员" v-model="queryParams2.name">
-                                                <template v-slot:append>
-                                                    <v-btn class="bg-blue-darken-1" size="x-large"
-                                                        @click="queryUserReport()">
-                                                        搜索
-                                                    </v-btn>
-                                                </template>
-                                            </v-text-field>
-                                        </div>
-                                        <vxe-table v-loading="loading" align="center" :data="userReportDataList">
-                                            <vxe-column type="seq" width="60"></vxe-column>
-                                            <vxe-column field="workorder" 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-column field="jobDateTime" title="提交时间"></vxe-column>
-                                        </vxe-table>
-                                        <pagination :total="total2" v-model:page="queryParams2.pageNum"
-                                            v-model:limit="queryParams2.pageSize" @pagination="queryUserReport" />
+                                        <ThePersonReportRecord :workorder="formData.workorder" :processId="processId"
+                                            @openMessage="showDialog">
+                                        </ThePersonReportRecord>
+                                    </el-card>
+                                </v-tabs-window-item>
+                                <v-tabs-window-item value="工单查看">
+                                    <el-card class="mt-4">
+                                        <TheWorkOrderList :workorder="formData.workorder" :processId="processId"
+                                            @chouseWorkorder="getFormData">
+                                        </TheWorkOrderList>
                                     </el-card>
                                 </v-tabs-window-item>
                             </v-tabs-window>
@@ -154,9 +127,15 @@
 </template>
 
 <script setup>
+
 const { proxy } = getCurrentInstance()
 import * as ReportApi from '@/api/reportFlow/index'
 import scanInput from '../components/scanInput.vue'
+import ThePersonReportRecord from './components/ThePersonReportRecord.vue'
+import TheWorkOrderProcessRecord from './components/TheWorkOrderProcessRecord.vue'
+import TheDayAllProcessRecord from './components/TheDayAllProcessRecord.vue'
+import TheWorkOrderList from './components/TheWorkOrderList.vue'
+
 const processOptions = [
     {
         value: 10,
@@ -256,12 +235,12 @@ function getFormData(workorder) {
                 formData.value = res.data
                 ReportApi.GetProcessReportWorkDetail(params).then(res2 => {
                     if (!res2.data) {
-                        formData.value.finishNum = 0;
+                        formData.value.finishNum = formData.value.planNum;
                         formData.value.badNum = 0;
                         formData.value.worker = '';
                     }
                     else {
-                        formData.value.finishNum = res2.data.finishNum ?? 0;
+                        formData.value.finishNum = res2.data.finishNum;
                         formData.value.badNum = res2.data.badNum ?? 0;
                         formData.value.worker = res2.data.worker;
                         if (formData.value.finishNum > 0) {
@@ -339,6 +318,12 @@ function submit() {
     })
 }
 
+function showDialog(dialogJson = {}) {
+    dialog.show = true
+    dialog.class = dialogJson.class
+    dialog.title = dialogJson.title
+    dialog.text = dialogJson.text
+}
 
 const queryParams1 = reactive({
     name: '',