From 44da46364ac30b90838b1060e32f4e707f8581b1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 11 九月 2026 09:09:02 +0800
Subject: [PATCH] fix: 生产报工和生产排产计划、实际开始时间和计划、实际结束时间不显示时分秒
---
src/views/productionManagement/workOrderEdit/index.vue | 29 ++++++++++++++++++++++++-----
src/views/productionManagement/workOrderManagement/index.vue | 21 +++++++++++++--------
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/views/productionManagement/workOrderEdit/index.vue b/src/views/productionManagement/workOrderEdit/index.vue
index e215fdb..3468597 100644
--- a/src/views/productionManagement/workOrderEdit/index.vue
+++ b/src/views/productionManagement/workOrderEdit/index.vue
@@ -47,16 +47,16 @@
label-width="120px">
<el-form-item label="璁″垝寮�濮嬫椂闂�">
<el-date-picker v-model="editrow.planStartTime"
- type="datetime"
+ type="date"
placeholder="璇烽�夋嫨"
- value-format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD"
style="width: 300px" />
</el-form-item>
<el-form-item label="璁″垝缁撴潫鏃堕棿">
<el-date-picker v-model="editrow.planEndTime"
- type="datetime"
+ type="date"
placeholder="璇烽�夋嫨"
- value-format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD"
style="width: 300px" />
</el-form-item>
</el-form>
@@ -199,21 +199,25 @@
label: "璁″垝寮�濮嬫椂闂�",
prop: "planStartTime",
width: "140",
+ dataType: "date",
},
{
label: "璁″垝缁撴潫鏃堕棿",
prop: "planEndTime",
width: "140",
+ dataType: "date",
},
{
label: "瀹為檯寮�濮嬫椂闂�",
prop: "actualStartTime",
width: "140",
+ dataType: "date",
},
{
label: "瀹為檯缁撴潫鏃堕棿",
prop: "actualEndTime",
width: "140",
+ dataType: "date",
},
{
label: "鎸囧畾鎶ュ伐浜�",
@@ -335,11 +339,26 @@
const handleEdit = row => {
editrow.value = JSON.parse(JSON.stringify(row));
+ // 鍘绘帀鏃跺垎绉掞紝鍙繚鐣欐棩鏈熺敤浜庨�夋嫨鍣ㄥ洖鏄�
+ if (editrow.value.planStartTime) {
+ editrow.value.planStartTime = editrow.value.planStartTime.split(" ")[0];
+ }
+ if (editrow.value.planEndTime) {
+ editrow.value.planEndTime = editrow.value.planEndTime.split(" ")[0];
+ }
editDialogVisible.value = true;
};
const handleUpdate = () => {
- updateProductWorkOrder(editrow.value)
+ const updateData = { ...editrow.value };
+ // 鍚庣鎺ュ彛闇�瑕佹椂鍒嗙鏍煎紡锛岄殣寮忔嫾鎺ワ細寮�濮嬫椂闂磋ˉ 00:00:00锛岀粨鏉熸椂闂磋ˉ 23:59:59
+ if (updateData.planStartTime) {
+ updateData.planStartTime = `${updateData.planStartTime} 00:00:00`;
+ }
+ if (updateData.planEndTime) {
+ updateData.planEndTime = `${updateData.planEndTime} 23:59:59`;
+ }
+ updateProductWorkOrder(updateData)
.then(() => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
editDialogVisible.value = false;
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index dcbb49f..442f5b5 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -67,11 +67,11 @@
</div>
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.planStartTime }}</span>
+ <span class="info-value">{{ formatDateOnly(transferCardRowData.planStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">璁″垝缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.planEndTime }}</span>
+ <span class="info-value">{{ formatDateOnly(transferCardRowData.planEndTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">澶囨敞</span>
@@ -96,11 +96,11 @@
</div>
<div class="info-item">
<span class="info-label">瀹為檯寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.actualStartTime }}</span>
+ <span class="info-value">{{ formatDateOnly(transferCardRowData.actualStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">瀹為檯缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.actualEndTime }}</span>
+ <span class="info-value">{{ formatDateOnly(transferCardRowData.actualEndTime) }}</span>
</div>
</div>
</div>
@@ -294,6 +294,11 @@
return Number.isFinite(status) && status >= 100;
};
+ // 鏃堕棿鍙樉绀烘棩鏈燂紝涓嶆樉绀烘椂鍒嗙
+ const formatDateOnly = val => {
+ return val ? dayjs(val).format("YYYY-MM-DD") : "";
+ };
+
const canOperate = row => !row.endOrder && !isCompleted(row);
const tableColumn = ref([
@@ -307,10 +312,10 @@
{ label: "闇�姹傛暟閲�", prop: "planQuantity", width: "140" },
{ label: "瀹屾垚鏁伴噺", prop: "completeQuantity", width: "140" },
{ label: "瀹屾垚杩涘害", prop: "completionStatus", dataType: "slot", slot: "completionStatus", width: "140" },
- { label: "璁″垝寮�濮嬫椂闂�", prop: "planStartTime", width: "140" },
- { label: "璁″垝缁撴潫鏃堕棿", prop: "planEndTime", width: "140" },
- { label: "瀹為檯寮�濮嬫椂闂�", prop: "actualStartTime", width: "140" },
- { label: "瀹為檯缁撴潫鏃堕棿", prop: "actualEndTime", width: "140" },
+ { label: "璁″垝寮�濮嬫椂闂�", prop: "planStartTime", width: "140", dataType: "date" },
+ { label: "璁″垝缁撴潫鏃堕棿", prop: "planEndTime", width: "140", dataType: "date" },
+ { label: "瀹為檯寮�濮嬫椂闂�", prop: "actualStartTime", width: "140", dataType: "date" },
+ { label: "瀹為檯缁撴潫鏃堕棿", prop: "actualEndTime", width: "140", dataType: "date" },
{
label: "鎿嶄綔", width: "260", align: "center", dataType: "action", fixed: "right",
operation: [
--
Gitblit v1.9.3