1

src/views/system/jdorder/orderList.vue

@@ -40,6 +40,24 @@
           <el-form-item label="完成日期">
             <el-checkbox v-model="queryParams.hasFinishTime" @change="handleQuery">仅显示已完成订单</el-checkbox>
           </el-form-item>
+          <el-form-item label="退款状态">
+            <el-select v-model="queryParams.isRefunded" placeholder="全部" clearable size="small" style="width: 120px;">
+              <el-option label="已退款" :value="1" />
+              <el-option label="未退款" :value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="退款到账">
+            <el-select v-model="queryParams.isRefundReceived" placeholder="全部" clearable size="small" style="width: 120px;">
+              <el-option label="已到账" :value="1" />
+              <el-option label="未到账" :value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="后返到账">
+            <el-select v-model="queryParams.isRebateReceived" placeholder="全部" clearable size="small" style="width: 120px;">
+              <el-option label="已到账" :value="1" />
+              <el-option label="未到账" :value="0" />
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             <el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -446,7 +464,10 @@ export default {
         endTime: null,
         orderBy: 'create_time',
         isAsc: 'desc',
-        hasFinishTime: false
+        hasFinishTime: false,
+        isRefunded: undefined,
+        isRefundReceived: undefined,
+        isRebateReceived: undefined
       },
       // 同步物流对话框
       syncLogisticsDialogVisible: false,
@@ -612,7 +633,10 @@ export default {
         endTime: null,
         orderBy: 'create_time',
         isAsc: 'desc',
-        hasFinishTime: false
+        hasFinishTime: false,
+        isRefunded: undefined,
+        isRefundReceived: undefined,
+        isRebateReceived: undefined
       }
       // 重置排序为默认降序
       this.queryParams.orderBy = 'create_time'
@@ -1161,15 +1185,17 @@ export default {
 
     /** 获取订单状态标签类型 */
     getOrderStatusType(status) {
+      // 取消状态（优先级最高）
+      if (status === 3) return 'danger' // 无效-取消（红色，优先级高于违规）
       // 正常状态
       if (status === 16) return 'success' // 已付款
       if (status === 17) return 'success' // 已完成
       if (status === 15) return 'warning' // 待付款
       if (status === 24) return 'warning' // 已付定金
       // 违规状态
-      if ([13, 25, 26, 27, 28].includes(status)) return 'danger' // 违规订单
+      if ([13, 25, 26, 27, 28].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
       // 无效状态
-      if ([2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单
+      if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单
       if (status === 33) return 'success' // 超市卡充值订单
       return 'info' // 其他状态
     },