From fc39f41acfcb9afb8d12f3ed3799b97352bb4178 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 09 十二月 2025 16:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_food' into dev_food

---
 src/views/productionManagement/operationScheduling/index.vue |   73 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/src/views/productionManagement/operationScheduling/index.vue b/src/views/productionManagement/operationScheduling/index.vue
index 3b35180..f417aa4 100644
--- a/src/views/productionManagement/operationScheduling/index.vue
+++ b/src/views/productionManagement/operationScheduling/index.vue
@@ -4,20 +4,22 @@
 			<el-form :model="searchForm" :inline="true">
 				<el-form-item label="瀹㈡埛鍚嶇О:">
 					<el-input v-model="searchForm.customerName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+										style="width: 200px;"
 										@change="handleQuery" />
 				</el-form-item>
-				<el-form-item label="椤圭洰鍚嶇О:">
-					<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
-										@change="handleQuery" />
-				</el-form-item>
+<!--				<el-form-item label="椤圭洰鍚嶇О:">-->
+<!--					<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"-->
+<!--										style="width: 200px;"-->
+<!--										@change="handleQuery" />-->
+<!--				</el-form-item>-->
 				<el-form-item label="娲惧伐鏃ユ湡:">
 					<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
 													placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
 				</el-form-item>
 				<el-form-item label="鐘舵��:">
-					<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" style="width: 140px" clearable>
+					<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" @change="handleQuery" style="width: 140px" clearable>
 						<el-option label="寰呮帓浜�" :value="1"></el-option>
-						<el-option label="宸叉帓浜�" :value="0"></el-option>
+						<el-option label="宸叉帓浜�" :value="3"></el-option>
 						<el-option label="鎺掍骇涓�" :value="2"></el-option>
 					</el-select>
 				</el-form-item>
@@ -30,6 +32,7 @@
 			<div style="text-align: right" class="mb10">
 				<el-button type="primary" @click="openForm">宸ュ簭鎺掍骇</el-button>
 				<el-button type="danger" @click="handleDelete" plain>鍙栨秷鎺掍骇</el-button>
+				<el-button @click="handleOut">瀵煎嚭</el-button>
 			</div>
 			<PIMTable
 				rowKey="id"
@@ -58,12 +61,9 @@
 	searchForm: {
 		staffName: "",
 		status: 1,
-		entryDate: [
-			dayjs().format("YYYY-MM-DD"),
-			dayjs().add(1, "day").format("YYYY-MM-DD"),
-		], // 褰曞叆鏃ユ湡
+		entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 褰曞叆鏃ユ湡锛岄粯璁ゅ綋澶�
 		entryDateStart: dayjs().format("YYYY-MM-DD"),
-		entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
+		entryDateEnd: dayjs().format("YYYY-MM-DD"),
 	},
 });
 const { searchForm } = toRefs(data);
@@ -73,7 +73,7 @@
 		prop: "status",
 		dataType: "tag",
 		formatData: (params) => {
-			if (params == 0) {
+			if (params == 3) {
 				return "宸叉帓浜�";
 			} else if (params == 1) {
 				return "寰呮帓浜�";
@@ -82,7 +82,7 @@
 			}
 		},
 		formatType: (params) => {
-			if (params == 0) {
+			if (params == 3) {
 				return "success";
 			} else if (params == 1) {
 				return "primary";
@@ -105,21 +105,21 @@
 		prop: "salesContractNo",
 		width: 200,
 	},
-	{
-		label: "瀹㈡埛鍚堝悓鍙�",
-		prop: "customerContractNo",
-		width: 200,
-	},
+	// {
+	// 	label: "瀹㈡埛鍚堝悓鍙�",
+	// 	prop: "customerContractNo",
+	// 	width: 200,
+	// },
 	{
 		label: "瀹㈡埛鍚嶇О",
 		prop: "customerName",
 		width: 200,
 	},
-	{
-		label: "椤圭洰鍚嶇О",
-		prop: "projectName",
-		width:300
-	},
+	// {
+	// 	label: "椤圭洰鍚嶇О",
+	// 	prop: "projectName",
+	// 	width:300
+	// },
 	{
 		label: "浜у搧澶х被",
 		prop: "productCategory",
@@ -129,6 +129,11 @@
 		label: "瑙勬牸鍨嬪彿",
 		prop: "specificationModel",
 		width: 150,
+	},
+	{
+		label: "缁戝畾鏈哄櫒",
+		prop: "speculativeTradingName",
+		width: 220,
 	},
 	{
 		label: "鍗曚綅",
@@ -220,6 +225,12 @@
 const handleDelete = () => {
 	let ids = [];
 	if (selectedRows.value.length > 0) {
+		// 鏂板锛氬垽鏂槸鍚︽湁宸叉帓浜х殑鏁版嵁
+		const hasScheduled = selectedRows.value.some(item => item.status == 3);
+		if (hasScheduled) {
+			proxy.$modal.msgWarning("宸叉帓浜ф暟鎹笉鑳藉彇娑堟帓浜�");
+			return;
+		}
 		ids = selectedRows.value.map((item) => item.id);
 	} else {
 		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
@@ -242,6 +253,22 @@
 			proxy.$modal.msg("宸插彇娑�");
 		});
 };
+
+// 瀵煎嚭
+const handleOut = () => {
+	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+		confirmButtonText: "纭",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	})
+		.then(() => {
+			proxy.download("/salesLedger/scheduling/exportTwo", {}, "宸ュ簭鎺掍骇.xlsx");
+		})
+		.catch(() => {
+			proxy.$modal.msg("宸插彇娑�");
+		});
+};
+
 onMounted(() => {
 	getList();
 });

--
Gitblit v1.9.3