Commit 30d52ef5 by wuqian

查询条件换行bug修复

parent 8fe8ccf7
......@@ -2,106 +2,106 @@
<div class="card flex-column h-100 overflow-hidden">
<div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline>
<div>
<ElFormItem label="仓库">
<ElSelect
v-model="searchForm.warehouseId"
clearable
filterable
placeholder="请输入"
style="width: 150px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="平台">
<ElSelect
v-model="searchForm.platform"
value-key=""
placeholder="请选择"
clearable
filterable
popper-class="customize-select-style"
style="width: 150px"
>
<ElOption
v-for="(item, index) in platformJson"
:key="index"
:label="item.type"
:value="item.type"
style="width: 160px"
>
<img
:src="`/images/icon/${item.icon.split('/').pop()}`"
style="height: 20px; margin: 5px 10px 0 0"
/>
<span :title="item.type">{{ item.type }}</span>
</ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺">
<ElSelect
v-model="searchForm.craftCode"
clearable
filterable
placeholder="请输入工艺"
style="width: 150px"
<!-- <div> -->
<ElFormItem label="仓库">
<ElSelect
v-model="searchForm.warehouseId"
clearable
filterable
placeholder="请输入"
style="width: 150px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="平台">
<ElSelect
v-model="searchForm.platform"
value-key=""
placeholder="请选择"
clearable
filterable
popper-class="customize-select-style"
style="width: 150px"
>
<ElOption
v-for="(item, index) in platformJson"
:key="index"
:label="item.type"
:value="item.type"
style="width: 160px"
>
<el-option
v-for="item in craftList"
:key="item.craftCode"
:label="item.craftName"
:value="item.craftCode"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="库存SKU">
<ElInput
v-model.trim="searchForm.thirdSkuCode"
placeholder="库存SKU"
clearable
style="width: 150px"
></ElInput>
</ElFormItem>
<ElFormItem label="款号">
<ElInput
v-model="searchForm.supplierProductNo"
placeholder="款号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="批次号">
<ElInput
v-model="searchForm.batchArrangeNumber"
placeholder="批次号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="生产单号">
<ElInput
v-model="searchForm.factorySubOrderNumber"
placeholder="生产单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem>
</div>
<img
:src="`/images/icon/${item.icon.split('/').pop()}`"
style="height: 20px; margin: 5px 10px 0 0"
/>
<span :title="item.type">{{ item.type }}</span>
</ElOption>
</ElSelect>
</ElFormItem>
<ElFormItem label="工艺">
<ElSelect
v-model="searchForm.craftCode"
clearable
filterable
placeholder="请输入工艺"
style="width: 150px"
>
<el-option
v-for="item in craftList"
:key="item.craftCode"
:label="item.craftName"
:value="item.craftCode"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="库存SKU">
<ElInput
v-model.trim="searchForm.thirdSkuCode"
placeholder="库存SKU"
clearable
style="width: 150px"
></ElInput>
</ElFormItem>
<ElFormItem label="款号">
<ElInput
v-model="searchForm.supplierProductNo"
placeholder="款号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="批次号">
<ElInput
v-model="searchForm.batchArrangeNumber"
placeholder="批次号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="生产单号">
<ElInput
v-model="searchForm.factorySubOrderNumber"
placeholder="生产单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<!-- </div> -->
<ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity">
<el-radio-button label="single">单面</el-radio-button>
......@@ -263,15 +263,14 @@
</span>
</ElFormItem>
<ElFormItem>
<span
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
class="item"
>
<ElFormItem
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
>
<span class="item">
<ElButton
:loading="tifDownloadLoading"
type="warning"
......@@ -280,14 +279,15 @@
TIF排版
</ElButton>
</span>
<span
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
>
<span class="item">
<ElButton
:loading="pngDownloadLoading"
type="warning"
......@@ -296,30 +296,44 @@
PNG排版
</ElButton>
</span>
<span v-if="status === 'TO_BE_CONFIRMED'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
<span class="item">
<ElButton type="success" @click="confirmProduct">
确认生产
</ElButton>
</span>
<span v-if="status === 'EXCEPTION_ORDER'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'EXCEPTION_ORDER'">
<span class="item">
<ElButton type="success" @click="updateOrder">
转至待确认
</ElButton>
</span>
<span
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3"
>
<span class="item">
<ElButton type="warning" @click="asyncOrderAddress">
同步收货地址
</ElButton>
</span>
<span
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1"
>
<span class="item">
<ElButton type="warning" @click="assignOrder"> 分派 </ElButton>
</span>
</ElFormItem>
<ElFormItem
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
>
<!-- <span
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2"
class="item"
......@@ -328,96 +342,115 @@
处理异常
</ElButton>
</span> -->
<span
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
class="item"
>
<span class="item">
<ElButton type="primary" @click="printProductionOrder">
打印生产单
</ElButton>
</span>
<span v-if="status === 'TO_BE_REPLENISHMENT'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'TO_BE_REPLENISHMENT'">
<span class="item">
<ElButton type="success" @click="replenishmentSuccess">
补胚完成
</ElButton>
</span>
<span v-if="status === 'PICKING'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="success" @click="printPickingOrder">
打印拣货单
</ElButton>
</span>
<span v-if="status === 'PICKING'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="warning" @click="pickingComplete">
拣胚完成
</ElButton>
</span>
<span v-if="status === 'PICKING'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="success" @click="toOutOfStock"> 转至缺货 </ElButton>
</span>
<span v-if="status === 'TO_BE_CONFIRMED'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
<span class="item">
<ElButton type="warning" @click="changeExceptionOrder">
转为异常单
</ElButton>
</span>
<span v-if="status === 'TO_BE_CONFIRMED'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
<span class="item">
<ElButton type="success" @click="confirmProductToRiin">
转至锐印生产
</ElButton>
</span>
<span
v-if="status === 'TO_BE_CONFIRMED' || status === 'EXCEPTION_ORDER'"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="status === 'TO_BE_CONFIRMED' || status === 'EXCEPTION_ORDER'"
>
<span class="item">
<ElButton type="danger" @click="cancelOrder">取消</ElButton>
</span>
</ElFormItem>
<ElFormItem v-if="status === 'IN_PRODUCTION'">
<!-- <span v-if="status !== 'IN_PRODUCTION'" class="item">
<ElButton type="success" @click="handleUpdateRemark">
添加内部标签
</ElButton>
</span> -->
<span v-if="status === 'IN_PRODUCTION'" class="item">
<span class="item">
<ElButton type="warning" @click="onFastProduction">
快捷生产
</ElButton>
</span>
<span v-if="status === 'IN_PRODUCTION'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'IN_PRODUCTION'">
<span class="item">
<ElButton type="success" @click="applyForReplenishment(undefined)">
申请补胚
</ElButton>
</span>
<span v-if="status === 'IN_PRODUCTION'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'IN_PRODUCTION'">
<span class="item">
<ElButton type="success" @click="productioncompleted">
生产完成
</ElButton>
</span>
<span v-if="status === 'WAIT_SHIPMENT'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'WAIT_SHIPMENT'">
<span class="item">
<ElButton type="warning" @click="printPodOrder">
播种墙配货
</ElButton>
</span>
</ElFormItem>
<ElFormItem v-if="status === 'CREATE_LOGISTICS'">
<!-- <span v-if="status === 'WAIT_SHIPMENT'" class="item">
<ElButton type="warning" @click="inspPackagOrder">
质检包装
</ElButton>
</span> -->
<span v-if="status === 'CREATE_LOGISTICS'" class="item">
<span class="item">
<ElButton type="warning" @click="logisticsToPicking">
转至待排单
</ElButton>
</span>
<span v-if="status === 'WAIT_SHIPMENT'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'WAIT_SHIPMENT'">
<span class="item">
<ElButton type="primary" @click="completeDelivery()"
>完成发货</ElButton
>
</span>
<span
v-if="status === 'WAIT_SHIPMENT' || status === 'CREATE_LOGISTICS'"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="status === 'WAIT_SHIPMENT' || status === 'CREATE_LOGISTICS'"
>
<span class="item">
<ElDropdown>
<el-button type="success">
物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon>
......@@ -468,75 +501,89 @@
</template>
</ElDropdown>
</span>
<span v-if="status === 'STOCK_OUT'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'STOCK_OUT'">
<span class="item">
<ElButton type="warning" @click="stockOutCheck">
补货校验
</ElButton>
</span>
<span v-if="status === 'STOCK_OUT'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'STOCK_OUT'">
<span class="item">
<ElButton type="success" @click="toBePicking"> 转至生产 </ElButton>
</span>
<span v-if="status === 'TO_BE_ARRANGE'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'TO_BE_ARRANGE'">
<span class="item">
<ElButton type="warning" @click="arrangeFinish">排单完成</ElButton>
</span>
<span
v-if="status !== 'BATCH_DOWNLOAD' && status !== 'WAIT_SHIPMENT'"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="status !== 'BATCH_DOWNLOAD' && status !== 'WAIT_SHIPMENT'"
>
<span class="item">
<ElButton type="primary" @click="downloadMaterial"
>下载素材</ElButton
>
</span>
<span
v-if="
status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4)
"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="
status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4)
"
>
<span class="item">
<ElButton type="success" @click="interceptChange(true)">
拦截成功
</ElButton>
</span>
<span
v-if="
status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4)
"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="
status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4)
"
>
<span class="item">
<ElButton type="danger" @click="interceptChange(false)">
拦截失败
</ElButton>
</span>
<span
v-if="
status === 'TO_BE_CONFIRMED' ||
status === 'PICKING' ||
status === 'STOCK_OUT' ||
status === 'EXCEPTION_ORDER' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION' ||
status === 'TO_BE_ARRANGE' ||
status === 'WAIT_SHIPMENT'
"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="
[
'TO_BE_CONFIRMED',
'PICKING',
'STOCK_OUT',
'EXCEPTION_ORDER',
'TO_BE_REPLENISHMENT',
'IN_PRODUCTION',
'TO_BE_ARRANGE',
'WAIT_SHIPMENT',
].includes(status)
"
>
<span class="item">
<ElButton type="success" @click="refreshMaterial">
刷新商品信息
</ElButton>
</span>
<span
v-if="
status === 'STOCK_OUT' ||
status === 'CREATE_LOGISTICS' ||
status === 'TO_BE_ARRANGE' ||
status === 'PICKING' ||
status === 'IN_PRODUCTION'
"
class="item"
>
</ElFormItem>
<ElFormItem
v-if="
[
'STOCK_OUT',
'CREATE_LOGISTICS',
'TO_BE_ARRANGE',
'PICKING',
'IN_PRODUCTION',
].includes(status)
"
>
<span class="item">
<ElDropdown>
<el-button type="warning">
驳回至<el-icon class="el-icon--right"><ArrowDown /></el-icon>
......@@ -582,13 +629,19 @@
</template>
</ElDropdown>
</span>
<span v-if="status === 'COMPLETE'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'COMPLETE'">
<span class="item">
<ElButton type="warning" @click="statusPush">状态推送</ElButton>
</span>
<span v-if="status === 'COMPLETE'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'COMPLETE'">
<span class="item">
<ElButton type="success" @click="exportData">导出</ElButton>
</span>
<span v-if="status === 'BATCH_DOWNLOAD'" class="item">
</ElFormItem>
<ElFormItem v-if="status === 'BATCH_DOWNLOAD'">
<span class="item">
<ElButton type="danger" @click="handleBatchDelete('batch')"
>批量删除</ElButton
>
......@@ -4931,9 +4984,9 @@ useRouter().beforeEach((to, from, next) => {
}
}
.item {
margin-right: 15px;
}
// .item {
// margin-right: 15px;
// }
.tabs {
display: flex;
......
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