From 226f411c28e7d16660c997fcc382a2218d1d9ca7 Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期五, 22 十一月 2024 13:46:06 +0800
Subject: [PATCH] fix 工单
---
billion-ui/src/views/main/om/scheduling/index.vue | 4 ++--
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 2 +-
billion-ui/src/views/main/om/info/index.vue | 13 +++++++++----
billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java | 4 ++--
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java b/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
index 5280618..50b16b4 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmOrderScheduling.java
@@ -44,11 +44,11 @@
private Date offlineTime;
/** 璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�) */
- @Excel(name = "璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�)")
+ @Excel(name = "璐ㄩ噺鐘舵��(1鍚堟牸锛�2涓嶅悎鏍�)", readConverterExp = "1=鍚堟牸,2=涓嶅悎鏍�")
private String qualityStatus;
/** 鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�) */
- @Excel(name = "鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�)")
+ @Excel(name = "鐘舵��(1鏈紑濮嬶紝2鎵ц涓紝3宸插畬鎴�)", readConverterExp = "1=鏈紑濮�,2=鎵ц涓�,3=宸插畬鎴�")
private String status;
/** 澶囨敞 */
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
index 6857122..6a60569 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
@@ -47,7 +47,7 @@
private Date planEndTime;
/** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
- @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂�")
+ @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
private String orderStatus;
/** 澶囨敞 */
diff --git a/billion-ui/src/views/main/om/info/index.vue b/billion-ui/src/views/main/om/info/index.vue
index 01e055c..415f7fc 100644
--- a/billion-ui/src/views/main/om/info/index.vue
+++ b/billion-ui/src/views/main/om/info/index.vue
@@ -114,15 +114,15 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
+ <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" width="120">
<template slot-scope="scope">
<a style="color: #7099F9" @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}
</a>
<!-- <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>-->
</template>
</el-table-column>
- <el-table-column label="璁㈠崟缂栧彿" align="center" prop="salesOrderCode" />
- <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode" />
+ <el-table-column label="璁㈠崟缂栧彿" align="center" prop="salesOrderCode" width="120"/>
+ <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode" width="180"/>
<el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode" />
<el-table-column label="璁″垝鏁伴噺" align="center" prop="planQty" />
<el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" prop="planStartTime" width="120">
@@ -398,7 +398,7 @@
this.loading = true;
listInfo(this.queryParams).then(response => {
this.infoList = response.rows;
- this.detailTotal = response.total;
+ this.total = response.total;
this.loading = false;
});
},
@@ -504,3 +504,8 @@
}
};
</script>
+<style>
+.table-wrapper {
+ width: 100%;
+}
+</style>
diff --git a/billion-ui/src/views/main/om/scheduling/index.vue b/billion-ui/src/views/main/om/scheduling/index.vue
index 81cc5b4..669005d 100644
--- a/billion-ui/src/views/main/om/scheduling/index.vue
+++ b/billion-ui/src/views/main/om/scheduling/index.vue
@@ -112,9 +112,9 @@
<el-table v-loading="loading" :data="schedulingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" />
+ <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" width="120"/>
<el-table-column label="鎬绘垚搴忓垪鍙�" width="180px" align="center" prop="sfcCode" />
- <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode" />
+ <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode" width="120"/>
<el-table-column label="涓婄嚎鏃堕棿" align="center" prop="onlineTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
--
Gitblit v1.9.3