```

feat(order):
- 将订单分配对话框中的"自营客户"选项更新为"自营客户发货"
- 在订单发货页面添加发货状态筛选功能

- 为项目订单发货页面添加发货状态筛选功能

```

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -147,7 +147,7 @@
               <span class="required-mark">*</span>
               <span class="label">分配对象类型：</span>
               <el-select v-model="assignForm.targetType" placeholder="请选择分配对象类型" clearable style="flex: 1" @change="handleTargetTypeChange">
-                <el-option label="自营客户" value="zy" />
+                <el-option label="自营客户发货" value="zy" />
                 <el-option label="供应商" value="srm" />
               </el-select>
             </div>

src/views/order/orderDeliver/index.vue

@@ -18,17 +18,16 @@
                 <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 deliverOrderStatus" :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-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"
@@ -122,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);
@@ -339,8 +339,6 @@ const reset = () => {
 const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();

src/views/order/orderDeliver/indexProject.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,7 +121,7 @@ import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
 import DeliverDialog from '../saleOrder/deliverDialog.vue';
 import LogisticsDetail from '../saleOrder/logisticsDetail.vue';
-
+const deliverOrderStatus = computed(() => order_status.value.filter((d: any) => ['2', '3', '4'].includes(d.value)));
 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')
@@ -344,8 +338,6 @@ const reset = () => {
 const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();

src/views/order/saleOrder/index.vue

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