From 2a97deaa6deb2b5e94b2edba33a3e885cab4892b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 22 十二月 2025 17:11:21 +0800
Subject: [PATCH] 1.海川开心-设备保养添加定时任务 2.海川开心-销售管理、采购管理展示字段修改

---
 src/views/productionManagement/productionDispatching/index.vue |   73 ++++++++++++++++++++++++++++--------
 1 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/views/productionManagement/productionDispatching/index.vue b/src/views/productionManagement/productionDispatching/index.vue
index e976013..2d39890 100644
--- a/src/views/productionManagement/productionDispatching/index.vue
+++ b/src/views/productionManagement/productionDispatching/index.vue
@@ -38,18 +38,33 @@
 					clearable
 					prefix-icon="Search"
 				/>
-				<span class="search_title ml10">椤圭洰鍚嶇О锛�</span>
+				<span class="search_title ml10">鍚堝悓鍙凤細</span>
 				<el-input
-					v-model="searchForm.projectName"
+					v-model="searchForm.salesContractNo"
 					style="width: 240px"
 					placeholder="璇疯緭鍏�"
 					@change="handleQuery"
 					clearable
 					prefix-icon="Search"
 				/>
+<!--				<span class="search_title ml10">椤圭洰鍚嶇О锛�</span>-->
+<!--				<el-input-->
+<!--					v-model="searchForm.projectName"-->
+<!--					style="width: 240px"-->
+<!--					placeholder="璇疯緭鍏�"-->
+<!--					@change="handleQuery"-->
+<!--					clearable-->
+<!--					prefix-icon="Search"-->
+<!--				/>-->
 				<span class="search_title ml10">褰曞叆鏃ユ湡锛�</span>
 				<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
 										placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
+				<el-checkbox
+					style="margin-left: 10px"
+					v-model="searchForm.status"
+					label="涓嶆樉绀哄緟鎺掓暟閲忎负0"
+					@change="handleQuery"
+				/>
 				<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
 			</div>
 			<div>
@@ -87,10 +102,12 @@
 const data = reactive({
 	searchForm: {
 		customerName: "",
+		salesContractNo: "",
 		projectName: "",
-		entryDate: null, // 褰曞叆鏃ユ湡
-		entryDateStart: undefined,
-		entryDateEnd: undefined,
+		status: true,
+		entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 褰曞叆鏃ユ湡锛岄粯璁ゅ綋澶�
+		entryDateStart: dayjs().format("YYYY-MM-DD"),
+		entryDateEnd: dayjs().format("YYYY-MM-DD"),
 	},
 });
 const { searchForm } = toRefs(data);
@@ -101,19 +118,9 @@
 		width: 220,
 	},
 	{
-		label: "瀹㈡埛鍚堝悓鍙�",
-		prop: "customerContractNo",
-		width: 250,
-	},
-	{
 		label: "瀹㈡埛鍚嶇О",
 		prop: "customerName",
 		width: 250,
-	},
-	{
-		label: "椤圭洰鍚嶇О",
-		prop: "projectName",
-		width:300
 	},
 	{
 		label: "浜у搧澶х被",
@@ -128,7 +135,7 @@
 	{
 		label: "缁戝畾鏈哄櫒",
 		prop: "speculativeTradingName",
-		width: 220,
+		width: 160,
 	},
 	{
 		label: "鍗曚綅",
@@ -139,6 +146,32 @@
 		label: "褰曞叆鏃ユ湡",
 		prop: "entryDate",
 		width: 120,
+	},
+	{
+		label: "鐘舵��",
+		prop: "status",
+		dataType: "tag",
+		formatType: (params) => {
+			if (params == '鐢熶骇涓�') {
+				return "warning";
+			} else if (params == '鏈紑濮�') {
+				return "danger";
+			} else {
+				return "success";
+			}
+		},
+	},
+	{
+		label: "鐢熶骇杩涘害",
+		prop: "progress",
+		formatData: (cellValue) => {
+			// 濡傛灉鍊间负绌烘垨undefined锛屾樉绀虹┖瀛楃涓�
+			if (cellValue === null || cellValue === undefined || cellValue === '') {
+				return '';
+			}
+			// 鐩存帴鍦ㄦ暟瀛楀悗闈㈡坊鍔犵櫨鍒嗗彿
+			return `${cellValue}%`;
+		}
 	},
 	{
 		label: "鏁伴噺",
@@ -153,6 +186,7 @@
 		label: "寰呮帓鏁伴噺",
 		prop: "pendingQuantity",
 		width: 100,
+		fixed: 'right',
 	},
 ]);
 const tableData = ref([]);
@@ -587,3 +621,10 @@
 	white-space: nowrap;
 }
 </style>
+
+
+
+
+
+
+

--
Gitblit v1.9.3