Skip to content

F
factory_front
Commit 88454fd8 by qinjianhui
Options

feat: 工厂订单添加尺码筛选

parent dc385373
Showing with 44 additions and 7 deletions
src/views/order/factoryOrderNew/index.vue
...@@ -294,6 +294,26 @@ ...@@ -294,6 +294,26 @@
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="尺码筛选">
<ElSelect
v-model="searchForm.size"
multiple
collapse-tags
collapse-tags-tooltip
placeholder="请选择"
clearable
filterable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in sizes"
:key="index"
:value="item"
:label="item"
></ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="客户标签"> <ElFormItem label="客户标签">
<ElSelect <ElSelect
v-model="searchForm.tagsIdArr" v-model="searchForm.tagsIdArr"
...@@ -756,6 +776,7 @@ ...@@ -756,6 +776,7 @@
> >
<template #operation="{ row }"> <template #operation="{ row }">
<div class="main-table-operation"> <div class="main-table-operation">
<span class="item">
<ElButton <ElButton
v-if="status === 'PENDING_RECEIVE'" v-if="status === 'PENDING_RECEIVE'"
type="primary" type="primary"
...@@ -769,6 +790,8 @@ ...@@ -769,6 +790,8 @@
: '接单' : '接单'
}} }}
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if=" v-if="
showPendingLogisticsUpdateAddress() && showPendingLogisticsUpdateAddress() &&
...@@ -781,6 +804,8 @@ ...@@ -781,6 +804,8 @@
> >
修改地址 修改地址
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if="showChangeLogistics(row)" v-if="showChangeLogistics(row)"
type="warning" type="warning"
...@@ -790,6 +815,8 @@ ...@@ -790,6 +815,8 @@
> >
更换物流方式 更换物流方式
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if="showPendingLogisticsUpdateAddress()" v-if="showPendingLogisticsUpdateAddress()"
type="success" type="success"
...@@ -801,34 +828,40 @@ ...@@ -801,34 +828,40 @@
row.shipmentType === 0 ? '同步物流/地址' : '同步地址' row.shipmentType === 0 ? '同步物流/地址' : '同步地址'
}} }}
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if="status === 'SUSPEND' && suspendedSubTab !== 1" v-if="status === 'SUSPEND' && suspendedSubTab !== 1"
type="primary" type="warning"
link link
size="small" size="small"
@click.stop="handleCancelSuspend(row)" @click.stop="handleCancelSuspend(row)"
> >
取消挂起 取消挂起
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if="status === 'SUSPEND' && suspendedSubTab === 1" v-if="status === 'SUSPEND' && suspendedSubTab === 1"
type="primary" type="success"
link link
size="small" size="small"
@click.stop="handleInterceptionSuccess(row)" @click.stop="handleInterceptionSuccess(row)"
> >
拦截成功 拦截成功
</ElButton> </ElButton>
</span>
<span class="item">
<ElButton <ElButton
v-if="status === 'SUSPEND' && suspendedSubTab === 1" v-if="status === 'SUSPEND' && suspendedSubTab === 1"
type="primary" type="danger"
link link
size="small" size="small"
@click.stop="handleInterceptionFail(row)" @click.stop="handleInterceptionFail(row)"
> >
拦截失败 拦截失败
</ElButton> </ElButton>
</span>
</div> </div>
</template> </template>
</TableView> </TableView>
...@@ -1205,7 +1238,7 @@ const interceptSuccessForm = ref<{ suspendSussessType: number | undefined }>({ ...@@ -1205,7 +1238,7 @@ const interceptSuccessForm = ref<{ suspendSussessType: number | undefined }>({
suspendSussessType: undefined, suspendSussessType: undefined,
}) })
const interceptSuccessRows = ref<FactoryOrderNewListData[]>([]) const interceptSuccessRows = ref<FactoryOrderNewListData[]>([])
const sizes = ['FS', 'XS', 'S', 'M', 'L', 'XL', 'XXL', '3XL', '4XL', '5XL']
const { const {
userMarkList, userMarkList,
receiverCountryList, receiverCountryList,
...@@ -1708,7 +1741,7 @@ const mainColumns = computed(() => [ ...@@ -1708,7 +1741,7 @@ const mainColumns = computed(() => [
{ {
prop: 'operation', prop: 'operation',
label: '操作', label: '操作',
minWidth: 300, minWidth: 100,
align: 'center', align: 'center',
slot: 'operation', slot: 'operation',
fixed: 'right', fixed: 'right',
...@@ -2987,7 +3020,11 @@ onMounted(() => { ...@@ -2987,7 +3020,11 @@ onMounted(() => {
.page { .page {
display: flex; display: flex;
} }
.main-table-operation {
display: flex;
flex-direction: column;
gap: 2px;
}
.order-status { .order-status {
width: 180px; width: 180px;
......
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