From 3b28a3183baf6c4d864405dcfd5d8e7a52a3f046 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 05 二月 2026 17:51:37 +0800
Subject: [PATCH] 生产管控相关页面增加图纸编号
---
src/views/productionManagement/productionCosting/index.vue | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index a3bb3b0..bc78c38 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -1,8 +1,9 @@
<template>
<div class="app-container">
- <div class="content-layout">
+ <el-row :gutter="16" class="content-row">
<!-- 宸︿晶鍙拌处 + 椤堕儴绛涢�� -->
- <div class="left-panel">
+ <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8" class="left-col">
+ <div class="left-panel">
<div class="left-header">
<el-form :model="searchForm" inline>
<el-form-item prop="dateType">
@@ -21,7 +22,7 @@
end-placeholder="缁撴潫鏃ユ湡"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
- style="width: 300px"
+ style="width: 200px"
@change="handleDateRangeChange"
/>
</el-form-item>
@@ -33,17 +34,21 @@
:tableData="leftTableData"
:tableLoading="tableLoading"
:page="page"
- :height="200"
@row-click="handleLeftRowClick"
@pagination="pagination"
></PIMTable>
- </div>
+ </div>
+ </el-col>
- <!-- 鍙充晶鏄庣粏锛堝師鏈夊唴瀹癸級 -->
- <div class="right-panel">
- <div class="header-filters">
- <el-button @click="handleOut" class="ml10">瀵煎嚭</el-button>
- </div>
+ <!-- 鍙充晶鏄庣粏 -->
+ <el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16" class="right-col">
+ <div class="right-panel">
+
+ <el-form inline>
+ <el-form-item>
+ <el-button type="primary" @click="handleOut">瀵煎嚭</el-button>
+ </el-form-item>
+ </el-form>
<PIMTable
rowKey="id"
:column="tableColumn"
@@ -53,8 +58,9 @@
style="margin-right: 20px;"
@pagination="pagination1"
></PIMTable>
- </div>
- </div>
+ </div>
+ </el-col>
+ </el-row>
</div>
</template>
@@ -91,6 +97,11 @@
prop: "productName",
minWidth: 100,
},
+ {
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "drawingNumber",
+ minWidth: 100,
+ },
{
label: "瑙勬牸鍨嬪彿",
prop: "productModelName",
@@ -111,16 +122,16 @@
prop: "quantity",
minWidth: 100,
},
- {
- label: "宸ユ椂瀹氶",
- prop: "workHours",
- minWidth: 100,
- },
- {
- label: "宸ヨ祫",
- prop: "wages",
- minWidth: 100,
- },
+ // {
+ // label: "宸ユ椂瀹氶",
+ // prop: "workHours",
+ // minWidth: 100,
+ // },
+ // {
+ // label: "宸ヨ祫",
+ // prop: "wages",
+ // minWidth: 100,
+ // },
]);
// 宸︿晶姹囨�诲彴璐﹀垪锛堢敓浜т汉銆佷骇閲忋�佸伐璧勩�佸悎鏍肩巼锛�
@@ -136,17 +147,20 @@
minWidth: 100,
},
- {
- label: "宸ヨ祫",
- prop: "wages",
- minWidth: 100,
-
- },
+ // {
+ // label: "宸ヨ祫",
+ // prop: "wages",
+ // minWidth: 100,
+ //
+ // },
{
label: "鍚堟牸鐜�",
prop: "outputRate",
minWidth: 100,
-
+ formatData: (val) => {
+ if (val == null || val === '') return '-'
+ return parseFloat(val).toFixed(2)
+ },
},
]);
@@ -266,8 +280,8 @@
searchForm.value.entryDate = dayjs().format("YYYY-MM-DD");
searchForm.value.dateRange = searchForm.value.entryDate
} else {
- searchForm.value.entryDateStart = dayjs().format("YYYY-MM-DD");
- searchForm.value.entryDateEnd = dayjs().add(1, "day").format("YYYY-MM-DD");
+ searchForm.value.entryDateStart = dayjs().startOf("month").format("YYYY-MM-DD");
+ searchForm.value.entryDateEnd = dayjs().endOf("month").format("YYYY-MM-DD");
searchForm.value.dateRange = [searchForm.value.entryDateStart, searchForm.value.entryDateEnd]
}
@@ -316,31 +330,27 @@
</script>
<style scoped lang="scss">
-.content-layout {
- display: flex;
- flex-direction: column;
- gap: 16px;
+.content-row {
+ width: 100%;
}
-.left-panel {
- flex: 0 0 50%;
- display: flex;
- flex-direction: column;
- gap: 10px;
+.content-row .left-col,
+.content-row .right-col {
+ margin-bottom: 16px;
}
+.left-panel,
.right-panel {
- flex: 0 0 50%;
display: flex;
flex-direction: column;
gap: 10px;
+ min-width: 0;
}
.left-header {
display: flex;
align-items: center;
gap: 12px;
- margin-bottom: 8px;
}
.left-title {
--
Gitblit v1.9.3