From e1b484d806f853c14a71ddda361b6bdbc9e42e4f Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Sun, 15 Oct 2023 13:16:55 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/GoodsManager/GoodsCategorys/index.vue   |  2 +-
 src/views/business/OrderManage/Orders/index.vue      | 12 ++++++++----
 .../business/OrderManage/Orders/orderDetail.vue      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/business/GoodsManager/GoodsCategorys/index.vue b/src/views/business/GoodsManager/GoodsCategorys/index.vue
index 2bd0e92..886bc34 100644
--- a/src/views/business/GoodsManager/GoodsCategorys/index.vue
+++ b/src/views/business/GoodsManager/GoodsCategorys/index.vue
@@ -130,7 +130,7 @@ const total = ref(0)
 // 是否加载
 const loading = ref(true)
 // 是否展开，默认全部折叠
-const isExpandAll = ref(false)
+const isExpandAll = ref(true)
 const refreshTable = ref(true)
 
 const data = reactive({
diff --git a/src/views/business/OrderManage/Orders/index.vue b/src/views/business/OrderManage/Orders/index.vue
index f92b335..8e182af 100644
--- a/src/views/business/OrderManage/Orders/index.vue
+++ b/src/views/business/OrderManage/Orders/index.vue
@@ -174,7 +174,7 @@
           <!-- <el-button type="primary" size="small" icon="edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['business:order:addOrUpdate']">编辑</el-button> -->
           <el-button type="primary" size="small" icon="view" @click="handleDetail(scope.row)">详情</el-button>
-          <el-button v-if="scope.row.payStatus == 1" @click="handleChangePrice(scope.row)" size="small">订单改价</el-button>
+          <!-- <el-button v-if="scope.row.payStatus == 1" @click="handleChangePrice(scope.row)" size="small">订单改价</el-button> -->
           <!-- 发货 -->
           <el-button v-if="(
             scope.row.payStatus == 2
@@ -182,11 +182,11 @@
             && scope.row.deliveryStatus == 1
             && scope.row.orderStatus != 2
             && scope.row.orderStatus != 3
-          )" type="primary" size="small" @click="handleDeliver(scope.row)">发 货</el-button>
+          )" type="warning" size="small" @click="handleDeliver(scope.row)" icon="check">发 货</el-button>
 
           <!-- 审核取消订单 -->
-          <el-button type="primary" size="small" v-if="scope.row.orderStatus == 3"
-            @click="handleCancelOrder(scope.row)">审核取消订单</el-button>
+          <el-button type="warning" size="small" v-if="scope.row.orderStatus == 3"
+            @click="handleCancelOrder(scope.row)" icon="check">审核取消订单</el-button>
           <el-button type="danger" size="small" icon="delete" @click="handleDelete(scope.row)"
             v-hasPermi="['business:order:delete']">删除</el-button>
         </template>
@@ -312,10 +312,13 @@ function handleChangeOrderStatus() {
   switch (statusName) {
     case "待发货":
       queryParams.value.deliveryStatus = 1;
+      queryParams.value.payStatus = 2;
       queryParams.value.orderStatus = 1;
       break;
     case "待收货":
+      queryParams.value.deliveryStatus = 2;
       queryParams.value.receiptStatus = 1;
+      queryParams.value.payStatus = 2;
       queryParams.value.orderStatus = 1;
       break;
     case "待付款":
@@ -323,6 +326,7 @@ function handleChangeOrderStatus() {
       queryParams.value.orderStatus = 1;
       break;
     case "已完成":
+      queryParams.value.payStatus = 2;
       queryParams.value.orderStatus = 4;
       break;
     case "已取消":
diff --git a/src/views/business/OrderManage/Orders/orderDetail.vue b/src/views/business/OrderManage/Orders/orderDetail.vue
index 1f973bb..ac2c9aa 100644
--- a/src/views/business/OrderManage/Orders/orderDetail.vue
+++ b/src/views/business/OrderManage/Orders/orderDetail.vue
@@ -38,7 +38,7 @@
 
                 <!-- 订单改价 -->
                 <div class="btn-box">
-                    <el-button v-if="detail.payStatus == 1" @click="handleChangePrice(detail)">订单改价</el-button>
+                    <!-- <el-button v-if="detail.payStatus == 1" @click="handleChangePrice(detail)">订单改价</el-button> -->
 
                     <!-- 发货 -->
                     <el-button v-if="(