From 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 15:07:02 +0800
Subject: [PATCH] fix: 用河南鹤壁代码覆盖山西长治
---
src/views/salesManagement/returnOrder/index.vue | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/src/views/salesManagement/returnOrder/index.vue b/src/views/salesManagement/returnOrder/index.vue
index 1bcda4d..0a8257b 100644
--- a/src/views/salesManagement/returnOrder/index.vue
+++ b/src/views/salesManagement/returnOrder/index.vue
@@ -38,9 +38,6 @@
<template #status="{ row }">
<el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
</template>
- <template #stockInApprovalStatus="{ row }">
- <el-tag :type="getStockInApprovalStatusType(row.stockInApprovalStatus)">{{ getStockInApprovalStatusText(row.stockInApprovalStatus) }}</el-tag>
- </template>
</PIMTable>
</div>
<form-dia ref="formDia" @close="handleQuery" />
@@ -117,21 +114,11 @@
const defaultColumns = [
{ label: "閫�璐у崟鍙�", prop: "returnNo", minWidth: 160 },
{ label: "鍗曟嵁鐘舵��", prop: "status", minWidth: 90, dataType: "slot", slot: "status" },
- { label: "鍏ュ簱瀹℃壒鐘舵��", prop: "stockInApprovalStatus", minWidth: 120, dataType: "slot", slot: "stockInApprovalStatus" },
{ label: "鍒跺崟鏃堕棿", prop: "makeTime", minWidth: 170 },
{ label: "瀹㈡埛鍚嶇О", prop: "customerName", minWidth: 220 },
{ label: "閿�鍞崟鍙�", prop: "salesContractNo", minWidth: 160 },
{ label: "涓氬姟鍛�", prop: "salesman", minWidth: 120 },
{ label: "鍏宠仈鍙戣揣鍗曞彿", prop: "shippingNo", minWidth: 170 },
- {
- label: "鍙戣揣绫诲瀷",
- prop: "shippingType",
- minWidth: 100,
- formatData: (val) => ({ 1: "璐ц溅", 2: "蹇��" }[String(val)] || "--"),
- },
- { label: "鍙戣揣杞︾墝鍙�", prop: "truckPlateDisplay", minWidth: 140 },
- { label: "蹇�掑叕鍙�", prop: "expressCompanyDisplay", minWidth: 140 },
- { label: "蹇�掑崟鍙�", prop: "expressNoDisplay", minWidth: 150 },
{ label: "椤圭洰鍚嶇О", prop: "projectName", minWidth: 180 },
{ label: "鍒跺崟浜�", prop: "maker", minWidth: 120 },
{
@@ -177,12 +164,7 @@
tableLoading.value = true;
returnManagementList({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false;
- tableData.value = (res?.data?.records || []).map((row) => ({
- ...row,
- truckPlateDisplay: String(row?.shippingType) === "1" ? (row?.truckPlateNo || "--") : "--",
- expressCompanyDisplay: String(row?.shippingType) === "2" ? (row?.expressCompany || "--") : "--",
- expressNoDisplay: String(row?.shippingType) === "2" ? (row?.expressNo || "--") : "--",
- }));
+ tableData.value = res?.data?.records || [];
page.total = res?.data?.total || 0;
}).finally(() => tableLoading.value = false);
};
@@ -221,24 +203,6 @@
const statusMap = {
0: "寰呭鐞�",
1: "宸插鐞�"
- };
- return statusMap[status] || "鏈煡";
-};
-
-const getStockInApprovalStatusType = (status) => {
- const statusMap = {
- 0: "",
- 1: "success",
- 2: "warning"
- };
- return statusMap[status] || "info";
-};
-
-const getStockInApprovalStatusText = (status) => {
- const statusMap = {
- 0: "鏈鎵�",
- 1: "宸插鎵�",
- 2: "瀹℃壒涓�"
};
return statusMap[status] || "鏈煡";
};
--
Gitblit v1.9.3