From 9c1e0958af114e4ae2bfaaade28d49753268e9f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 06 七月 2026 13:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/salesManagement/returnOrder/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/salesManagement/returnOrder/index.vue b/src/views/salesManagement/returnOrder/index.vue
index 99fa334..9ef90b8 100644
--- a/src/views/salesManagement/returnOrder/index.vue
+++ b/src/views/salesManagement/returnOrder/index.vue
@@ -8,8 +8,8 @@
<el-form-item label="瀹㈡埛鍚嶇О">
<el-input v-model="searchForm.customerName" placeholder="瀹㈡埛鍚嶇О" clearable />
</el-form-item>
- <el-form-item label="閿�鍞崟鍙�">
- <el-input v-model="searchForm.salesContractNo" placeholder="閿�鍞崟鍙�" clearable />
+ <el-form-item label="璁㈠崟鍙�">
+ <el-input v-model="searchForm.salesContractNo" placeholder="璁㈠崟鍙�" clearable />
</el-form-item>
<el-form-item label="鍏宠仈鎵瑰彿">
<el-input v-model="searchForm.shippingNo" placeholder="鍏宠仈鎵瑰彿" clearable />
@@ -122,7 +122,8 @@
{ label: "閫�璐х姸鎬�", prop: "returnStatus", minWidth: 100, dataType: "slot", slot: "returnStatus" },
{ label: "鍒跺崟鏃堕棿", prop: "makeTime", minWidth: 170 },
{ label: "瀹㈡埛鍚嶇О", prop: "customerName", minWidth: 220 },
- { label: "閿�鍞崟鍙�", prop: "salesContractNo", minWidth: 160 },
+ { label: "璁㈠崟鍙�", prop: "salesContractNo", minWidth: 160 },
+ { label: "閿�鍞�诲悎鍚屽彿", prop: "masterContractNo", minWidth: 160 },
{ label: "涓氬姟鍛�", prop: "salesman", minWidth: 120 },
{ label: "鍏宠仈鎵瑰彿", prop: "shippingNo", minWidth: 170 },
{ label: "椤圭洰鍚嶇О", prop: "projectName", minWidth: 180 },
--
Gitblit v1.9.3