From b2ee80ea7ca9c86180a0afee220303e3e0616e60 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 16 一月 2026 17:21:14 +0800
Subject: [PATCH] 浪潮对接单点登录:跳转问题修复

---
 src/views/productionManagement/productionDispatching/index.vue |  306 ++++++++++++++++++++------------------------------
 1 files changed, 121 insertions(+), 185 deletions(-)

diff --git a/src/views/productionManagement/productionDispatching/index.vue b/src/views/productionManagement/productionDispatching/index.vue
index 70a3de9..840e17b 100644
--- a/src/views/productionManagement/productionDispatching/index.vue
+++ b/src/views/productionManagement/productionDispatching/index.vue
@@ -1,132 +1,93 @@
 <template>
-	<div class="app-container">
-		<div class="search_form">
-			<div>
-				<span class="search_title">瀹㈡埛鍚嶇О锛�</span>
-				<el-input
-					v-model="searchForm.customerName"
-					style="width: 240px"
-					placeholder="璇疯緭鍏�"
-					@change="handleQuery"
-					clearable
-					prefix-icon="Search"
-				/>
-				<span class="search_title ml10">椤圭洰鍚嶇О锛�</span>
-				<el-input
-					v-model="searchForm.customerName"
-					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-button type="primary" @click="handleQuery" style="margin-left: 10px"
-				>鎼滅储</el-button
-				>
-			</div>
-			<div>
-				<el-button type="primary" @click="openForm('add')">鐢熶骇娲惧伐</el-button>
-			</div>
-		</div>
-		<div class="table_list">
-			<PIMTable
-				rowKey="id"
-				:column="tableColumn"
-				:tableData="tableData"
-				:page="page"
-				:isSelection="true"
-				@selection-change="handleSelectionChange"
-				:tableLoading="tableLoading"
-				@pagination="pagination"
-				:total="page.total"
-			></PIMTable>
-		</div>
-		<form-dia ref="formDia" @close="handleQuery"></form-dia>
-	</div>
+  <div class="app-container">
+    <div class="search_form">
+      <div>
+        <span class="search_title">褰曞叆鏃ユ湡锛�</span>
+        <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
+                        placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
+        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+      </div>
+      <div>
+        <el-button type="primary" @click="openForm('add')">鐢熶骇娲惧伐</el-button>
+      </div>
+    </div>
+    <div class="table_list">
+      <PIMTable
+          rowKey="id"
+          :column="tableColumn"
+          :tableData="tableData"
+          :page="page"
+          :isSelection="true"
+          @selection-change="handleSelectionChange"
+          :tableLoading="tableLoading"
+          @pagination="pagination"
+          :total="page.total"
+      ></PIMTable>
+    </div>
+    <form-dia ref="formDia" @close="handleQuery"></form-dia>
+  </div>
 </template>
 
 <script setup>
 import {onMounted, ref} from "vue";
 import FormDia from "@/views/productionManagement/productionDispatching/components/formDia.vue";
-import {staffJoinDel, staffJoinListPage} from "@/api/personnelManagement/onboarding.js";
-import {ElMessageBox} from "element-plus";
 import dayjs from "dayjs";
+import {schedulingListPage} from "@/api/productionManagement/productionOrder.js";
 
 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"),
-	},
+  searchForm: {
+    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"),
+  },
 });
 const { searchForm } = toRefs(data);
 const tableColumn = ref([
-	{
-		label: "褰曞叆鏃ユ湡",
-		prop: "staffNo",
-	},
-	{
-		label: "鍚堝悓鍙�",
-		prop: "staffName",
-	},
-	{
-		label: "瀹㈡埛鍚堝悓鍙�",
-		prop: "addressPhone",
-		width: 250,
-	},
-	{
-		label: "瀹㈡埛鍚嶇О",
-		prop: "contactPerson",
-	},
-	{
-		label: "椤圭洰鍚嶇О",
-		prop: "contactPhone",
-		width:150
-	},
-	{
-		label: "浜у搧澶х被",
-		prop: "basicBankAccount",
-		width: 220,
-	},
-	{
-		label: "瑙勬牸鍨嬪彿",
-		prop: "bankAccount",
-		width: 220,
-	},
-	{
-		label: "鍗曚綅",
-		prop: "bankCode",
-		width:220
-	},
-	{
-		label: "鏁伴噺",
-		prop: "maintainer",
-	},
-	{
-		label: "鎺掍骇鏁伴噺",
-		prop: "maintenanceTime",
-		width: 100,
-	},
-	{
-		label: "寰呮帓鏁伴噺",
-		prop: "maintenanceTime",
-		width: 100,
-	},
+  {
+    label: "褰曞叆鏃ユ湡",
+    prop: "registerDate",
+    width: 120,
+  },
+  {
+    label: "浜у搧澶х被",
+    prop: "productCategory",
+    width: 160,
+  },
+  {
+    label: "瑙勬牸鍨嬪彿",
+    prop: "specificationModel",
+    width: 220,
+  },
+  {
+    label: "鍗曚綅",
+    prop: "unit",
+    width:90
+  },
+  {
+    label: "鏁伴噺",
+    prop: "quantity",
+  },
+  {
+    label: "鎺掍骇鏁伴噺",
+    prop: "schedulingNum",
+    width: 100,
+  },
+  {
+    label: "寰呮帓鏁伴噺",
+    prop: "pendingQuantity",
+    width: 100,
+  },
 ]);
 const tableData = ref([]);
 const selectedRows = ref([]);
 const tableLoading = ref(false);
 const page = reactive({
-	current: 1,
-	size: 100,
-	total: 0,
+  current: 1,
+  size: 100,
+  total: 0,
 });
 const formDia = ref()
 const { proxy } = getCurrentInstance()
@@ -134,94 +95,69 @@
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-	page.current = 1;
-	getList();
+  page.current = 1;
+  getList();
 };
 const changeDaterange = (value) => {
-	if (value) {
-		searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
-		searchForm.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
-	} else {
-		searchForm.entryDateStart = undefined;
-		searchForm.entryDateEnd = undefined;
-	}
-	handleQuery();
+  if (value) {
+    searchForm.value.entryDateStart = value[0];
+    searchForm.value.entryDateEnd = value[1];
+  } else {
+    searchForm.value.entryDateStart = undefined;
+    searchForm.value.entryDateEnd = undefined;
+  }
+  handleQuery();
 };
 const pagination = (obj) => {
-	page.current = obj.page;
-	page.size = obj.limit;
-	getList();
+  page.current = obj.page;
+  page.size = obj.limit;
+  getList();
 };
 const getList = () => {
-	tableLoading.value = true;
-	staffJoinListPage({...page, ...searchForm.value}).then(res => {
-		tableLoading.value = false;
-		tableData.value = res.data.records
-		page.total = res.data.total;
-	}).catch(err => {
-		tableLoading.value = false;
-	})
+  tableLoading.value = true;
+  // 鏋勯�犱竴涓柊鐨勫璞★紝涓嶅寘鍚玡ntryDate瀛楁
+  const params = { ...searchForm.value, ...page };
+  params.entryDate = undefined
+  schedulingListPage(params).then((res) => {
+    tableLoading.value = false;
+    // 澶勭悊姣忔潯鏁版嵁锛屽鍔爌endingQuantity瀛楁
+    tableData.value = res.data.records.map(item => ({
+      ...item,
+      pendingQuantity: (Number(item.quantity) || 0) - (Number(item.schedulingNum) || 0)
+    }));
+    page.total = res.data.total;
+  }).catch(() => {
+    tableLoading.value = false;
+  })
 };
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
-	selectedRows.value = selection;
+  selectedRows.value = selection;
 };
 
 // 鎵撳紑寮规
-const openForm = (type, row) => {
-	if (selectedRows.value.length !== 1) {
-		proxy.$message.error("璇烽�夋嫨涓�鏉℃暟鎹�");
-		return;
-	}
-	if (selectedRows.value[0].unPaymentAmountTotal == 0) {
-		proxy.$message.warning("鏃犻渶鍐嶄粯娆�");
-		return;
-	}
-	nextTick(() => {
-		formDia.value?.openDialog(type, row)
-	})
+const openForm = (type) => {
+  if (selectedRows.value.length !== 1) {
+    proxy.$message.error("璇烽�夋嫨涓�鏉℃暟鎹�");
+    return;
+  }
+  if (selectedRows.value[0].pendingQuantity == 0) {
+    proxy.$message.warning("鏃犻渶鍐嶆淳宸�");
+    return;
+  }
+  nextTick(() => {
+    formDia.value?.openDialog(type, selectedRows.value[0])
+  })
 };
 
-// 鍒犻櫎
-const handleDelete = () => {
-	let ids = [];
-	if (selectedRows.value.length > 0) {
-		ids = selectedRows.value.map((item) => item.id);
-	} else {
-		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
-		return;
-	}
-	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			staffJoinDel(ids).then((res) => {
-				proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-				getList();
-			});
-		})
-		.catch(() => {
-			proxy.$modal.msg("宸插彇娑�");
-		});
-};
-// 瀵煎嚭
-const handleOut = () => {
-	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
-		confirmButtonText: "纭",
-		cancelButtonText: "鍙栨秷",
-		type: "warning",
-	})
-		.then(() => {
-			proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 1}, "浜哄憳鍏ヨ亴.xlsx");
-		})
-		.catch(() => {
-			proxy.$modal.msg("宸插彇娑�");
-		});
-};
 onMounted(() => {
-	getList();
+  searchForm.value.entryDate = [
+    dayjs().format("YYYY-MM-DD"),
+    dayjs().add(1, "day").format("YYYY-MM-DD"),
+  ]
+  searchForm.value.entryDateStart = dayjs().format("YYYY-MM-DD")
+  searchForm.value.entryDateEnd = dayjs().add(1, "day").format("YYYY-MM-DD")
+  getList();
 });
 </script>
 

--
Gitblit v1.9.3