浏览代码

```
feat(order): 订单发货页面优化发货状态筛选功能

- 将订单状态筛选改为发货状态筛选,使用专门的发货订单状态字典

hurx 22 小时之前
父节点
当前提交
80586f27a1
共有 2 个文件被更改,包括 4 次插入11 次删除
  1. 4 9
      src/views/order/orderDeliver/index.vue
  2. 0 2
      src/views/order/saleOrder/index.vue

+ 4 - 9
src/views/order/orderDeliver/index.vue

@@ -18,17 +18,11 @@
                 <el-option v-for="dict in order_source" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="订单状态" prop="orderStatus">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
-                <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="发货状态" prop="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择发货状态" clearable>
+                <el-option v-for="dict in deliverOrderStatus" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="业务员" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择业务员" clearable> </el-select>
             </el-form-item>
-            <el-form-item label="部门" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择部门" clearable> </el-select>
-            </el-form-item> -->
             <el-form-item label="提交时间" prop="createTime">
               <el-date-picker
                 v-model="dateRange"
@@ -127,6 +121,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, fee_type, pay_method, order_source, deliver_method } = toRefs<any>(
   proxy?.useDict('order_status', 'fee_type', 'pay_method', 'order_source', 'deliver_method')
 );
+const deliverOrderStatus = computed(() => order_status.value.filter((d: any) => ['2', '3', '4'].includes(d.value)));
 
 const orderMainList = ref<OrderMainVO[]>([]);
 const buttonLoading = ref(false);

+ 0 - 2
src/views/order/saleOrder/index.vue

@@ -347,8 +347,6 @@ const reset = () => {
 const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();