|
|
@@ -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);
|