1448

src/views/touchScreen/main/index.vue

@@ -10,7 +10,7 @@
             <template v-slot:append>
                 <kbTime></kbTime>
                 <!-- <v-btn icon="mdi-magnify"></v-btn> -->
-                <v-btn icon="mdi-dots-vertical"></v-btn>
+                <v-btn icon="mdi-overscan" @click="doScreen"></v-btn>
             </template>
         </v-app-bar>
         <!-- 右侧菜单 -->
@@ -50,6 +50,60 @@ const { proxy } = getCurrentInstance()
 const goBack = () => {
     proxy.$router.push({ path: '/' })
 }
+/// =========================== 全屏监听 ==========================
+// 定义全屏状态
+const isFullScreen = ref(false);
+function doScreen() {
+    if (isFullScreen.value) {
+        exitFullScreen()
+    } else {
+        goFullScreen()
+    }
+}
+
+
+// 检查当前是否为全屏模式
+const checkIsFullScreen = () => {
+    isFullScreen.value = document.fullscreenElement !== null;
+};
+
+// 进入全屏
+const goFullScreen = () => {
+    const appEl = document.getElementById('app');
+    if (appEl) {
+        appEl.requestFullscreen();
+        checkIsFullScreen(); // 更新状态
+    }
+};
+
+// 退出全屏
+const exitFullScreen = () => {
+    document.exitFullscreen()
+        .catch(() => {
+            console.error('退出全屏失败');
+        });
+    checkIsFullScreen(); // 更新状态
+};
+
+// 监听全屏状态变化
+const fullScreenChangeHandler = () => {
+    checkIsFullScreen();
+};
+
+// 在组件挂载时设置事件监听
+onMounted(() => {
+    document.addEventListener('fullscreenchange', fullScreenChangeHandler);
+});
+
+// 在组件卸载时移除事件监听
+onUnmounted(() => {
+    document.removeEventListener('fullscreenchange', fullScreenChangeHandler);
+});
+/// ==================================================================================
+
+
+
+
 // 右侧菜单
 const listItems = ref([
     { title: '报工', value: '报工', icon: 'mdi-clipboard-file-outline' },

src/views/touchScreen/report/index.vue

@@ -22,6 +22,7 @@
                                             v-model="formData.feedOrder"></v-text-field>
                                         <v-text-field v-if="processId === 90" label="客户定单"
                                             v-model="formData.customerOrder"></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>
@@ -36,7 +37,7 @@
                                                 <v-list-item-subtitle class="d-flex justify-space-between">
                                                     <span class="text-subtitle-1">
                                                         {{
-                                                            `完成数:${item.finishNum} 不良数:${item.badNum}`
+                                                            `完成数:${item.finishNum ?? 0} 不良数:${item.badNum ?? 0}`
                                                         }}
                                                     </span>
                                                     <span>{{ `作业员:${item.worker} 提交时间:${item.jobDate}` }}</span>
@@ -209,18 +210,39 @@ function handleScanInput(val) {
 }
 
 function getFormData(workorder) {
-    ReportApi.GetWorkOrderDetail({ workorder }).then(res => {
+    const params = { workorder, processId: processId.value }
+    ReportApi.GetWorkOrderDetail(params).then(res => {
         if (res.code == 200) {
             if (res.data) {
                 formData.value = res.data
-                ReportApi.GetWorkOrderReportWorkList({ workorder, processId: processId.value }).then(res => {
+                ReportApi.GetProcessReportWorkDetail(params).then(res2 => {
+                    if (!res2.data) {
+                        formData.value.finishNum = 0;
+                        formData.value.badNum = 0;
+                        formData.value.worker = '';
+                    }
+                    else {
+                        formData.value.finishNum = res2.data.finishNum ?? 0;
+                        formData.value.badNum = res2.data.badNum ?? 0;
+                        formData.value.worker = res2.data.worker;
+                        if (formData.value.finishNum > 0) {
+                            dialog.show = true
+                            dialog.class = 'bg-yellow'
+                            dialog.title = '提示'
+                            dialog.text = '工单此工序已报工过'
+                        }
+                    }
+                })
+                ReportApi.GetWorkOrderReportWorkList(params).then(res => {
                     if (res.code == 200) {
                         reportWorkerOrderList.value = res.data
                     }
                 })
             } else {
                 dialog.show = true
-                dialog.text = '没有找到该工单'
+                dialog.class = 'bg-amber'
+                dialog.title = '工单提示'
+                dialog.text = '工单号不正确,没有找到该工单'
             }
         }
     })
@@ -237,7 +259,7 @@ function submit() {
             feed_order: formData.value.feedOrder,
             stove_code: formData.value.stoveCode,
             customer_order: formData.value.customerOrder,
-            // worker: formData.value.worker
+            process_operator: formData.value.worker
         };
         // 领料
         if (processId.value === 10) {
@@ -245,6 +267,7 @@ function submit() {
                 if (res.code == 200) {
                     dialog.show = true
                     dialog.class = 'bg-green'
+                    dialog.title = '成功提示'
                     dialog.text = '领料成功'
                 }
             })
@@ -255,6 +278,7 @@ function submit() {
                 if (res.code == 200) {
                     dialog.show = true
                     dialog.class = 'bg-green'
+                    dialog.title = '成功提示'
                     dialog.text = '出货成功'
                 }
             }
@@ -266,6 +290,7 @@ function submit() {
                 if (res.code == 200) {
                     dialog.show = true
                     dialog.class = 'bg-green'
+                    dialog.title = '成功提示'
                     dialog.text = '报工成功'
                 }
             }