From 8a3bfdab689684fe5ee19b2f69842e450fc7c60a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 30 一月 2026 14:02:39 +0800
Subject: [PATCH] fix: 完成生产数据分析页面
---
src/views/productionManagement/productionCosting/index.vue | 123 ++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 50 deletions(-)
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index fd3a11b..3547087 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -16,8 +16,11 @@
:column="leftTableColumn"
:tableData="leftTableData"
:tableLoading="tableLoading"
- @rowClick="handleLeftRowClick"
- ></PIMTable>
+ :page="page"
+ :height="200"
+ @row-click="handleLeftRowClick"
+ @pagination="pagination"
+ ></PIMTable>
</div>
<!-- 鍙充晶鏄庣粏锛堝師鏈夊唴瀹癸級 -->
@@ -29,10 +32,10 @@
rowKey="id"
:column="tableColumn"
:tableData="tableData"
- :page="page"
+ :page="page1"
:tableLoading="tableLoading"
style="margin-right: 20px;"
- @pagination="pagination"
+ @pagination="pagination1"
></PIMTable>
</div>
</div>
@@ -41,77 +44,66 @@
<script setup>
import {onMounted, ref} from "vue";
-import {
- listCustomer,
-} from "@/api/basicData/customerFile.js";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
-import {productionAccountingListPage} from "@/api/productionManagement/productionCosting.js";
+import {salesLedgerProductionAccountingListProductionDetails, salesLedgerProductionAccountingList} from "@/api/productionManagement/productionCosting.js";
const { proxy } = getCurrentInstance();
const tableColumn = ref([
{
label: "鐢熶骇鏃ユ湡",
- prop: "schedulingDate",
- width: 120,
+ prop: "scheduleDate",
+ minWidth: 100,
},
{
label: "鐢熶骇浜�",
prop: "schedulingUserName",
- width: 90,
+ minWidth: 100,
},
{
label: "鍚堝悓鍙�",
prop: "salesContractNo",
- width: 220,
+ minWidth: 100,
},
- // {
- // label: "瀹㈡埛鍚堝悓鍙�",
- // prop: "customerContractNo",
- // width: 250,
- // },
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
- width: 250,
+ minWidth: 100,
},
- // {
- // label: "椤圭洰鍚嶇О",
- // prop: "projectName",
- // width:300
- // },
{
label: "浜у搧澶х被",
- prop: "productCategory",
- width: 160,
+ prop: "productName",
+ minWidth: 100,
},
{
label: "瑙勬牸鍨嬪彿",
- prop: "specificationModel",
- width: 160,
+ prop: "productModelName",
+ minWidth: 100,
},
{
label: "鍗曚綅",
prop: "unit",
+ minWidth: 100,
},
{
label: "宸ュ簭",
prop: "process",
+ minWidth: 100,
},
{
label: "鐢熶骇鏁伴噺",
- prop: "finishedNum",
- width: 100,
+ prop: "quantity",
+ minWidth: 100,
},
{
label: "宸ユ椂瀹氶",
prop: "workHours",
- width: 100,
+ minWidth: 100,
},
{
label: "宸ヨ祫",
prop: "wages",
- width: 100,
+ minWidth: 100,
},
]);
@@ -120,27 +112,31 @@
{
label: "鐢熶骇浜�",
prop: "schedulingUserName",
- width: 120,
+ minWidth: 100,
},
{
label: "浜ч噺",
- prop: "finishedNum",
- width: 100,
- },
+ prop: "outputNum",
+ minWidth: 100,
+
+ },
{
label: "宸ヨ祫",
prop: "wages",
- width: 100,
+ minWidth: 100,
+
},
{
label: "鍚堟牸鐜�",
- prop: "qualifiedRate",
- width: 100,
+ prop: "outputRate",
+ minWidth: 100,
+
},
]);
const tableData = ref([]);
const tableLoading = ref(false);
+const tableLoading1 = ref(false);
const leftTableData = ref([]);
// 鏃� / 鏈� 鍒囨崲锛堥粯璁ゆ寜鏃ワ級
const dateType = ref("day");
@@ -148,6 +144,12 @@
current: 1,
size: 100,
total: 0,
+});
+
+const page1 = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
});
const data = reactive({
@@ -164,17 +166,18 @@
});
const { searchForm } = toRefs(data);
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
- page.current = 1;
- getList();
-};
const pagination = (obj) => {
page.current = obj.page;
page.size = obj.limit;
getList();
};
+
+const pagination1 = (obj) => {
+ page1.current = obj.page;
+ page1.size = obj.limit;
+ getList1();
+};
+
const changeDaterange = (value) => {
if (value) {
searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
@@ -190,13 +193,24 @@
const params = { ...searchForm.value, ...page };
params.dateType = dateType.value;
params.entryDate = undefined
- productionAccountingListPage(params).then((res) => {
+
+ salesLedgerProductionAccountingList(params).then((res) => {
tableLoading.value = false;
const records = res.data.records || [];
- tableData.value = records;
+ leftTableData.value = records;
page.total = res.data.total || 0;
- buildLeftTableData(records);
});
+
+};
+
+const getList1 = () => {
+ tableLoading1.value = true;
+ const params = { ...page1, ...searchForm.value };
+ salesLedgerProductionAccountingListProductionDetails(params).then((res) => {
+ tableLoading1.value = false;
+ tableData.value = res.data.records || [];;
+ page1.total = res.data.total || 0;
+ });
};
// 鏋勫缓宸︿晶姹囨�诲彴璐︼紙鎸夌敓浜т汉姹囨�讳骇閲忋�佸伐璧勭瓑锛�
@@ -225,7 +239,9 @@
// 宸︿晶鏃�/鏈堝垏鎹�
const handleDateTypeChange = () => {
// 杩欓噷鍙綔涓虹瓫閫夋潯浠剁殑涓�閮ㄥ垎锛岀洿鎺ラ噸鏂版煡璇㈠垪琛�
- handleQuery();
+ page.current = 1;
+ getList();
+ handleQuery()
};
// 鐐瑰嚮宸︿晶琛岋紝鍒峰彸渚ф槑缁嗭紙鎸夌敓浜т汉杩囨护锛�
@@ -233,6 +249,14 @@
searchForm.value.schedulingUserName = row.schedulingUserName || "";
handleQuery();
};
+
+// 鏌ヨ鍒楄〃
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+ page1.current = 1;
+ getList1();
+};
+
// 瀵煎嚭
const handleOut = () => {
@@ -257,12 +281,12 @@
<style scoped lang="scss">
.content-layout {
display: flex;
+ flex-direction: column;
gap: 16px;
}
.left-panel {
flex: 0 0 50%;
- max-width: 50%;
display: flex;
flex-direction: column;
gap: 10px;
@@ -270,7 +294,6 @@
.right-panel {
flex: 0 0 50%;
- max-width: 49%;
display: flex;
flex-direction: column;
gap: 10px;
--
Gitblit v1.9.3