From ee27f72ea136ccc10ef488637713177509944113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 3 Dec 2024 16:03:34 +0800
Subject: [PATCH] 1

---
 .../productManagement/ProWorkorder/index.vue  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/views/productManagement/ProWorkorder/index.vue b/src/views/productManagement/ProWorkorder/index.vue
index 573431d..a6e34bc 100644
--- a/src/views/productManagement/ProWorkorder/index.vue
+++ b/src/views/productManagement/ProWorkorder/index.vue
@@ -94,35 +94,38 @@
         <el-table :data="dataList" v-loading="loading" ref="table" border stripe size="small"
             header-row-class-name="table-header" :cell-class-name="tableCellClassName" @sort-change="sortChange">
             <el-table-column type="index" width="50" align="center" />
-            <el-table-column prop="id" label="雪花id" align="center" :show-overflow-tooltip="true"
-                v-if="columns.showColumn('id')" />
             <el-table-column prop="sort" label="编号" align="center" v-if="columns.showColumn('sort')" />
-            <el-table-column prop="priority" label="优先级" align="center" v-if="columns.showColumn('priority')">
-                <template #default="scope">
-                    <dict-tag :options="options.priorityOptions" :value="scope.row.priority" />
-                </template>
-            </el-table-column>
             <el-table-column prop="workorder" label="工单号" />
-            <el-table-column prop="productionName" label="产品名称" />
-            <el-table-column prop="productionCode" label="产品编码" />
+            <el-table-column prop="productionName" label="主体品名" />
+            <el-table-column prop="productionCode" label="主体型号" />
             <el-table-column prop="unit" label="单位" />
             <el-table-column prop="planNum" label="计划数量" />
-            <el-table-column prop="sort" label="排序" />
-            <el-table-column prop="workorderDate" label="指示日期" />
+            <el-table-column prop="sort" label="序号" />
+            <el-table-column prop="workorderDate" label="工单日期">
+                <template #default="scope">
+                    <span v-if="scope.row.workorderDate != '' && scope.row.workorderDate != null">{{
+                        proxy.dayjs(scope.row.workorderDate).format('YYYY-MM-DD') }}</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="priority" label="优先级" />
             <el-table-column prop="beat" label="节拍" />
             <el-table-column prop="status" label="状态" />
-            <el-table-column prop="instructionDate" label="指导日期" />
-            <el-table-column prop="materialName" label="材料名称" />
+            <el-table-column prop="instructionDate" label="指示日期">
+                <template #default="scope">
+                    <span v-if="scope.row.instructionDate != '' && scope.row.instructionDate != null">{{
+                        proxy.dayjs(scope.row.instructionDate).format('YYYY-MM-DD') }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="materialName" label="材料型号" />
             <el-table-column prop="materialtextureCode" label="材质" />
-            <el-table-column prop="materialCode" label="材料编号" />
-            <el-table-column prop="drawingCode" label="主体图号" />
+            <el-table-column prop="materialCode" label="材料编码" />
+            <el-table-column prop="drawingCode" label="图号" />
             <el-table-column prop="version" label="版本" />
             <el-table-column prop="stoveCode" label="炉号" />
             <el-table-column prop="workshopCode" label="车间" />
             <el-table-column prop="routeCode" label="线" />
             <el-table-column prop="groupCode" label="组" />
-            <el-table-column prop="statusLabel" label="状态标签" />
+            <el-table-column prop="statusLabel" label="状态" />
             <el-table-column label="操作" align="center" fixed="right" width="80">
                 <template #default="scope">
                     <el-dropdown>