From 585ff1cd29e9875f5f2a0fa2b0fdc876c5c6301f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 26 一月 2026 18:26:31 +0800
Subject: [PATCH] 小程序   接口开发

---
 admin/src/views/business/goodsorder.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 3e5f518..4350e14 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -85,7 +85,7 @@
             <span  v-if="item.status ==1" class="orange">{{item.receiveType==1?'寰呰嚜鎻�':'寰呭彂璐�'}}</span>
             <span  v-if="item.status ==2" class="orange">寰呮敹璐�</span>
             <span  v-if="item.status ==3" class="grey">浜ゆ槗瀹屾垚</span>
-            <span  v-if="item.status ==4" class="grey">宸插叧闂�</span>
+            <span  v-if="item.status ==4" class="grey">宸插彇娑�</span>
             <span  v-if="item.status ==6" class="grey">宸查��娆�</span>
           </div>
         </div>
@@ -125,9 +125,9 @@
           <div class="action">
             <el-button v-if="item.status==1 && item.receiveType!=1" style=" width: 80%;" type="primary" @click="$refs.operaShipmentsWindow.open('鍙戣揣', item)">鍙戣揣</el-button>
             <div></div>
-            <el-button v-if="item.status == 0" style="color: red; "  type="text" @click="$refs.OperaOrderCancelWindow.open('鍙栨秷璁㈠崟', item)">鍙栨秷璁㈠崟</el-button>
+            <el-button v-if="item.status == 0 || item.status==1" style="color: red; "  type="text" @click="$refs.OperaOrderCancelWindow.open('鍙栨秷璁㈠崟', item)">鍙栨秷璁㈠崟</el-button>
             <div></div>
-            <el-button v-if="item.status == 3" style="color: red "  type="text" @click="cancelOrder(item)">璁㈠崟閫�娆�</el-button>
+            <el-button v-if="item.status == 3" style="color: red "  type="text"  @click="$refs.OperaOrderRefundWindow.open('璁㈠崟閫�娆�', item)">璁㈠崟閫�娆�</el-button>
             <div></div>
             <el-button v-if="item.status==2 && item.receiveType!=1" style="color: #666; " type="text"  @click="$refs.operaShipmentsWindow.open('蹇�掍俊鎭彉鏇�', item)">蹇�掑彉鏇�</el-button>
             <div></div>
@@ -149,6 +149,7 @@
     <!-- 鏂板缓/淇敼 -->
     <OperaShipmentsWindow ref="operaShipmentsWindow" @success="search"/>
     <OperaOrderMarkWindow ref="operaOrderMarkWindow" @success="handlePageChange"/>
+    <OperaOrderRefundWindow ref="OperaOrderRefundWindow" @success="handlePageChange"/>
     <OperaOrderCancelWindow ref="OperaOrderCancelWindow" @success="handlePageChange"/>
     <OperaGoodsOrderDetail ref="operaGoodsOrderDetail" @success="handlePageChange"/>
   </TableLayout>
@@ -162,10 +163,11 @@
 import OperaOrderMarkWindow from '@/components/business/OperaOrderMarkWindow'
 import OperaOrderCancelWindow from '@/components/business/OperaOrderCancelWindow'
 import OperaGoodsOrderDetail from '@/components/business/OperaGoodsOrderDetail'
+import OperaOrderRefundWindow from '@/components/business/OperaOrderRefundWindow'
 export default {
   name: 'Goodsorder',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail,OperaOrderCancelWindow },
+  components: { OperaOrderRefundWindow, TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail, OperaOrderCancelWindow },
   data () {
     return {
       status: '10',
@@ -177,7 +179,7 @@
         { name: '2', label: '寰呮敹璐�', count: 0 },
         { name: '3', label: '浜ゆ槗瀹屾垚', count: 0 },
         { name: '6', label: '宸查��娆�', count: 0 },
-        { name: '4', label: '浜ゆ槗鍏抽棴', count: 0 }],
+        { name: '4', label: '宸插彇娑�', count: 0 }],
       // 鎼滅储
       searchForm: {
         id: '',

--
Gitblit v1.9.3