From bc365ef47ae4e01754aeadbae26170e11c9bb80e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 22 六月 2026 16:56:12 +0800
Subject: [PATCH] 新疆马铃薯 1.删除按钮添加操作权限

---
 src/views/salesManagement/returnOrder/index.vue |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/salesManagement/returnOrder/index.vue b/src/views/salesManagement/returnOrder/index.vue
index 0a8257b..99fa334 100644
--- a/src/views/salesManagement/returnOrder/index.vue
+++ b/src/views/salesManagement/returnOrder/index.vue
@@ -11,8 +11,8 @@
 				<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 />
+				<el-form-item label="鍏宠仈鎵瑰彿">
+					<el-input v-model="searchForm.shippingNo" placeholder="鍏宠仈鎵瑰彿" clearable />
 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary" @click="handleQuery">鎼滅储</el-button>
@@ -23,7 +23,7 @@
     <div class="table_list">
       <div class="table_header" style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
         <el-button type="primary" @click="openForm('add')">鏂板缓閿�鍞��璐�</el-button>
-        <el-button type="danger" :disabled="selectedRows.length === 0 || selectedRows.some(row => row.status !== 0)" @click="handleDelete">鍒犻櫎</el-button>
+        <el-button type="danger" :disabled="selectedRows.length === 0 || selectedRows.some(row => row.status !== 0)" @click="handleDelete" v-hasPermi="['salesManagement:returnOrder:remove']">鍒犻櫎</el-button>
       </div>
       <PIMTable
         rowKey="id"
@@ -37,6 +37,11 @@
       >
         <template #status="{ row }">
           <el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
+        </template>
+        <template #returnStatus="{ row }">
+          <el-tag :type="getReturnStatusType(row.returnStatus)" size="small">
+            {{ row.returnStatus || '鏃犻��璐�' }}
+          </el-tag>
         </template>
       </PIMTable>
     </div>
@@ -114,11 +119,12 @@
 const defaultColumns = [
   { label: "閫�璐у崟鍙�", prop: "returnNo", minWidth: 160 },
   { label: "鍗曟嵁鐘舵��", prop: "status", minWidth: 90, dataType: "slot", slot: "status" },
+  { 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: "salesman", minWidth: 120 },
-  { label: "鍏宠仈鍙戣揣鍗曞彿", prop: "shippingNo", minWidth: 170 },
+  { label: "鍏宠仈鎵瑰彿", prop: "shippingNo", minWidth: 170 },
   { label: "椤圭洰鍚嶇О", prop: "projectName", minWidth: 180 },
   { label: "鍒跺崟浜�", prop: "maker", minWidth: 120 },
   {
@@ -132,7 +138,7 @@
       { name: "缂栬緫", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => openForm("edit", row) },
       { name: "閫�娆惧鐞�", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => handleRowHandle(row) },
       { name: "璇︽儏", type: "text", clickFun: (row) => openDetail(row) },
-      { name: "鍒犻櫎", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => handleRowDelete(row) },
+      { name: "鍒犻櫎", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => handleRowDelete(row), hasPermi: ['salesManagement:returnOrder:remove'] },
     ],
   },
 ];
@@ -207,6 +213,15 @@
   return statusMap[status] || "鏈煡";
 };
 
+const getReturnStatusType = (returnStatus) => {
+  const statusMap = {
+    '鏃犻��璐�': 'success',
+    '閮ㄥ垎閫�璐�': 'warning',
+    '鍏ㄩ儴閫�璐�': 'danger',
+  };
+  return statusMap[returnStatus] || 'info';
+};
+
 onMounted(() => {
   getList();
 });

--
Gitblit v1.9.3