From 2b3eb93b42f379f83569b03e9c4da75edd88f013 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 30 一月 2026 16:29:28 +0800
Subject: [PATCH] fix: 生成货架时,输入100行,100列,页面生成会卡死(建议货架生成时输入数量限制小一些,以及不能输入负数、小数这些,只能正整数)

---
 src/views/productionManagement/productionCosting/index.vue |   95 ++++++++++++++++++++++++++---------------------
 1 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index fe8d781..8e1d40b 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,28 +34,33 @@
 					: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"
 						:tableData="tableData"
 						:page="page1"
-						:tableLoading="tableLoading"
+						:tableLoading="tableLoading1"
 						style="margin-right: 20px;"
 						@pagination="pagination1"
 					></PIMTable>
-			</div>
-		</div>
+				</div>
+			</el-col>
+		</el-row>
 	</div>
 </template>
 
@@ -68,7 +74,7 @@
 const tableColumn = ref([
 	{
 		label: "鐢熶骇鏃ユ湡",
-		prop: "scheduleDate",
+		prop: "schedulingDate",
     minWidth: 100,
 	},
 	{
@@ -146,7 +152,10 @@
 		label: "鍚堟牸鐜�",
 		prop: "outputRate",
     minWidth: 100,
-
+    formatData: (val) => {
+      if (val == null || val === '') return '-'
+      return parseFloat(val).toFixed(2)
+    },
 	},
 ]);
 
@@ -172,13 +181,10 @@
 		schedulingUserName: "",
 		salesContractNo: "",
     dateType: "day",
-    dateRange: undefined,
-		entryDate: [
-			dayjs().format("YYYY-MM-DD"),
-			dayjs().add(1, "day").format("YYYY-MM-DD"),
-		], // 褰曞叆鏃ユ湡
-		entryDateStart: dayjs().format("YYYY-MM-DD"),
-		entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
+    dateRange: dayjs().format("YYYY-MM-DD"),
+		entryDate: dayjs().format("YYYY-MM-DD"),
+		entryDateStart: undefined,
+		entryDateEnd: undefined,
 	},
 });
 const { searchForm } = toRefs(data);
@@ -217,11 +223,14 @@
 	const params = { ...searchForm.value, ...page };
 
   salesLedgerProductionAccountingList(params).then((res) => {
-		tableLoading.value = false;
 		const records = res.data.records || [];
     leftTableData.value = records;
 		page.total = res.data.total || 0;
-	});
+	}).finally(() => {
+    tableLoading.value = false;
+  })
+
+
 
 };
 
@@ -229,10 +238,11 @@
   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;
-  });
+  }).finally(() => {
+    tableLoading1.value = false;
+  })
 };
 
 // 鏋勫缓宸︿晶姹囨�诲彴璐︼紙鎸夌敓浜т汉姹囨�讳骇閲忋�佸伐璧勭瓑锛�
@@ -259,12 +269,17 @@
 };
 
 // 宸︿晶鏃�/鏈堝垏鎹�
-const handleDateTypeChange = () => {
+const handleDateTypeChange = (value) => {
 	// 杩欓噷鍙綔涓虹瓫閫夋潯浠剁殑涓�閮ㄥ垎锛岀洿鎺ラ噸鏂版煡璇㈠垪琛�
-  searchForm.value.dateRange = undefined;
-  searchForm.value.entryDate = undefined;
-  searchForm.value.entryDateStart = undefined;
-  searchForm.value.entryDateEnd = undefined;
+  if (value === "day") {
+    searchForm.value.entryDate = dayjs().format("YYYY-MM-DD");
+    searchForm.value.dateRange = searchForm.value.entryDate
+  } else {
+    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]
+  }
+
   reloadData()
 };
 
@@ -310,31 +325,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