From 1c4ff7adf79cd9abc1ea644a3161780a623b9f5c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 十一月 2025 16:43:31 +0800
Subject: [PATCH] 1.湟水峡-生产订单不和销售关联逻辑修改联调

---
 src/views/productionManagement/productionReporting/index.vue |   47 ++++++++++++++++++++---------------------------
 1 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 3ceae74..e26a1dc 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -31,6 +31,7 @@
 		<div class="table_list">
 			<div style="text-align: right" class="mb10">
 				<el-button type="primary" @click="openForm('add')">鐢熶骇鎶ュ伐</el-button>
+				<el-button @click="handleOut">瀵煎嚭</el-button>
 			</div>
 			<PIMTable
 				rowKey="id"
@@ -148,12 +149,9 @@
 const data = reactive({
 	searchForm: {
 		staffName: "",
-		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"),
+		entryDate: null, // 褰曞叆鏃ユ湡
+		entryDateStart: undefined,
+		entryDateEnd: undefined,
 	},
 });
 const { searchForm } = toRefs(data);
@@ -199,26 +197,6 @@
 		prop: "schedulingUserName",
 	},
 	{
-		label: "鍚堝悓鍙�",
-		prop: "salesContractNo",
-		width: 200,
-	},
-	{
-		label: "瀹㈡埛鍚堝悓鍙�",
-		prop: "customerContractNo",
-		width: 200,
-	},
-	{
-		label: "瀹㈡埛鍚嶇О",
-		prop: "customerName",
-		width: 200,
-	},
-	{
-		label: "椤圭洰鍚嶇О",
-		prop: "projectName",
-		width:300
-	},
-	{
 		label: "浜у搧澶х被",
 		prop: "productCategory",
 		width: 150,
@@ -237,6 +215,16 @@
 		prop: "process",
 	},
 	{
+		label: "鍙e懗鍒嗙被",
+		prop: "type",
+		width: 150,
+	},
+	{
+		label: "鎹熻��",
+		prop: "loss",
+		width: 150,
+	},
+	{
 		label: "鎺掍骇鏁伴噺",
 		prop: "schedulingNum",
 		width: 100,
@@ -250,6 +238,11 @@
 		label: "寰呯敓浜ф暟閲�",
 		prop: "pendingFinishNum",
 		width: 100,
+	},
+	{
+		label: "澶囨敞",
+		prop: "remark",
+		width: 200,
 	},
 ]);
 const tableData = ref([]);
@@ -416,7 +409,7 @@
 		type: "warning",
 	})
 		.then(() => {
-			proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 1}, "浜哄憳鍏ヨ亴.xlsx");
+			proxy.download("/salesLedger/work/export", {}, "鐢熶骇鎶ュ伐.xlsx");
 		})
 		.catch(() => {
 			proxy.$modal.msg("宸插彇娑�");

--
Gitblit v1.9.3