Commit 540d8b2e by wusiyi

feat: 工厂订单筛选栏对齐、待接单展示延期时间 #1011590

parent be024416
......@@ -62,7 +62,7 @@
class="search-form"
:model="searchForm"
:inline="true"
label-width="110px"
label-width="70px"
>
<ElFormItem v-if="status === 'ALL'" label="订单状态">
<ElTreeSelect
......@@ -108,16 +108,6 @@
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺">
<LogisticsWaySelect
v-model="searchForm.craftCode"
:company-list="craftList"
:start-width="'150px'"
search-placeholder="搜索工艺名称"
start-placeholder="请选择工艺名称"
></LogisticsWaySelect>
</ElFormItem>
<ElFormItem label="库存SKU">
<ElInput
v-model.trim="searchForm.thirdSkuCode"
......@@ -178,7 +168,21 @@
width="140px"
/>
</ElFormItem>
<ElFormItem v-if="status === 'PICKING'" label="操作单状态">
<ElFormItem label="工艺" label-width="50px">
<LogisticsWaySelect
v-model="searchForm.craftCode"
:company-list="craftList"
:start-width="'150px'"
search-placeholder="搜索工艺名称"
start-placeholder="请选择工艺名称"
></LogisticsWaySelect>
</ElFormItem>
<ElFormItem
v-if="status === 'PICKING'"
label="操作单状态"
label-width="100px"
>
<ElSelect
v-model="searchFormOperationStatusSelect"
placeholder="请选择"
......@@ -2659,7 +2663,7 @@ const handleUpdateCustomsInfo = async () => {
updateCustomsDialogRef.value?.resetForm()
}
// 值为空:待接单和已取消状态
const NULL_STATUSES = ['PENDING_RECEIVE', 'CANCELLED']
const NULL_STATUSES = ['CANCELLED']
// 终态订单:已完成/已归档
const TERMINAL_ORDER_STATUSES = ['COMPLETED', 'ARCHIVE']
const getOrderDelayText = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment