From 555ce81fa427fc25b390cd6fae4210fe7e5e85c8 Mon Sep 17 00:00:00 2001
From: liang <594755172@qq.com>
Date: Tue, 15 Apr 2025 13:23:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E5=A4=A7=E7=9B=92=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/env.d.ts            |  2 +-
 src/layout/sortBoxs.vue | 25 +++++++++++++++++++++++++
 src/layout/workFlow.vue | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/env.d.ts b/src/env.d.ts
index 9996d9d..20afc3e 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1,2 +1,2 @@
 declare module "vue3-print-nb";
-declare module'element-plus/dist/locale/zh-cn.mjs';
\ No newline at end of file
+declare module 'element-plus/dist/locale/zh-cn.mjs';
\ No newline at end of file
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 85b32b8..6e28299 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -458,6 +458,31 @@ export default {
     margin-top: 25px;
 }
 
+
+.display-form-div-left {
+  display: inline-flex;
+  justify-content: center;
+  width: 240px;
+  margin: 5px;
+  padding: 5px;
+  border: 5px double #000000;
+}
+
+.display-form-div-right {
+  display: inline-flex;
+  justify-content: center;
+  width: 60px;
+  margin: 5px;
+  padding: 5px;
+  background-color: #CCCCCC;
+}
+
+.display-form-text-right {
+  align-self: center;
+  font-weight: bold;
+  font-size: 25px;
+}
+
 .header-row {
     display: flex;
     /* align-items: center; */
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
index 05d3a97..5239342 100644
--- a/src/layout/workFlow.vue
+++ b/src/layout/workFlow.vue
@@ -15,6 +15,8 @@
                         placeholder="请选择灯光状态" :options="lightStatusOptions" @change="search()"></el-select-v2>
                     <el-select-v2 v-model="workStatusQuery" style="width: 158px; margin-right: 10px;"
                         placeholder="请选择工作状态" :options="workStatusOptions" @change="search()"></el-select-v2>
+                        <el-select-v2 v-model="machineTypeQuery" style="width: 158px; margin-right: 10px;"
+                        placeholder="请选择机型" :options="workStatusOptions" @change="search()"></el-select-v2>
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
@@ -42,6 +44,8 @@
                 <el-table-column prop="pickedNum" label="已拣数量" min-width="120px" />
                 <el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px" />
                 <el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px" />
+                <el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px" />
+                <el-table-column prop="planDate" label="计划日期" :formatter="dateFormat" min-width="120px" />
                 <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
                     show-overflow-tooltip />
                 <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
@@ -246,6 +250,10 @@ export default {
                     value: -99,
                     label: '全部'
                 },
+                {
+                    value: -1,
+                    label: '暂存'
+                },
                 {
                     value: 0,
                     label: '未开始'
@@ -259,6 +267,20 @@ export default {
                     label: '已完成'
                 }
             ],
+            machineTypeOptions: [
+            {
+                    value: -99,
+                    label: '全部'
+                },
+                {
+                    value: 1,
+                    label: '装载机'
+                },
+                {
+                    value: 2,
+                    label: '平地机'
+                }
+            ],
             uploadDialogVisible: false,
             uploadRecord: reactive({
                 fileName: '',
@@ -328,6 +350,16 @@ export default {
                     return '未知'
             }
         },
+        machineTypeFormat: (row, column, cellValue, index) => {
+            switch (cellValue) {
+                case 1:
+                    return '装载机'
+                case 2:
+                    return '平地机'
+                default:
+                    return '异常'
+            }
+        },
         reset() {
             this.standIdQuery = ''
             this.workOrderQuery = ''