Skip to content

F
factory_front
Commit 30d52ef5 by wuqian
Options

查询条件换行bug修复

parent 8fe8ccf7
Showing with 123 additions and 70 deletions
src/views/order/podUs/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="card flex-column h-100 overflow-hidden"> <div class="card flex-column h-100 overflow-hidden">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline> <ElForm :model="searchForm" size="default" inline>
<div> <!-- <div> -->
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
v-model="searchForm.warehouseId" v-model="searchForm.warehouseId"
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
</div> <!-- </div> -->
<ElFormItem label="类型"> <ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity"> <el-radio-group v-model="searchForm.customizedQuantity">
<el-radio-button label="single">单面</el-radio-button> <el-radio-button label="single">单面</el-radio-button>
...@@ -263,15 +263,14 @@ ...@@ -263,15 +263,14 @@
</span> </span>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem
<span
v-if=" v-if="
status === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' || status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION' status === 'IN_PRODUCTION'
" "
class="item"
> >
<span class="item">
<ElButton <ElButton
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
type="warning" type="warning"
...@@ -280,14 +279,15 @@ ...@@ -280,14 +279,15 @@
TIF排版 TIF排版
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if=" v-if="
status === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' || status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION' status === 'IN_PRODUCTION'
" "
class="item"
> >
<span class="item">
<ElButton <ElButton
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
type="warning" type="warning"
...@@ -296,30 +296,44 @@ ...@@ -296,30 +296,44 @@
PNG排版 PNG排版
</ElButton> </ElButton>
</span> </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 type="success" @click="confirmProduct">
确认生产 确认生产
</ElButton> </ElButton>
</span> </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 type="success" @click="updateOrder">
转至待确认 转至待确认
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3" v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 3"
class="item"
> >
<span class="item">
<ElButton type="warning" @click="asyncOrderAddress"> <ElButton type="warning" @click="asyncOrderAddress">
同步收货地址 同步收货地址
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1" v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 1"
class="item"
> >
<span class="item">
<ElButton type="warning" @click="assignOrder"> 分派 </ElButton> <ElButton type="warning" @click="assignOrder"> 分派 </ElButton>
</span> </span>
</ElFormItem>
<ElFormItem
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
>
<!-- <span <!-- <span
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2" v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2"
class="item" class="item"
...@@ -328,96 +342,115 @@ ...@@ -328,96 +342,115 @@
处理异常 处理异常
</ElButton> </ElButton>
</span> --> </span> -->
<span <span class="item">
v-if="
status === 'PICKING' ||
status === 'TO_BE_REPLENISHMENT' ||
status === 'IN_PRODUCTION'
"
class="item"
>
<ElButton type="primary" @click="printProductionOrder"> <ElButton type="primary" @click="printProductionOrder">
打印生产单 打印生产单
</ElButton> </ElButton>
</span> </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 type="success" @click="replenishmentSuccess">
补胚完成 补胚完成
</ElButton> </ElButton>
</span> </span>
<span v-if="status === 'PICKING'" class="item"> </ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="success" @click="printPickingOrder"> <ElButton type="success" @click="printPickingOrder">
打印拣货单 打印拣货单
</ElButton> </ElButton>
</span> </span>
<span v-if="status === 'PICKING'" class="item"> </ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="warning" @click="pickingComplete"> <ElButton type="warning" @click="pickingComplete">
拣胚完成 拣胚完成
</ElButton> </ElButton>
</span> </span>
<span v-if="status === 'PICKING'" class="item"> </ElFormItem>
<ElFormItem v-if="status === 'PICKING'">
<span class="item">
<ElButton type="success" @click="toOutOfStock"> 转至缺货 </ElButton> <ElButton type="success" @click="toOutOfStock"> 转至缺货 </ElButton>
</span> </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 type="warning" @click="changeExceptionOrder">
转为异常单 转为异常单
</ElButton> </ElButton>
</span> </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 type="success" @click="confirmProductToRiin">
转至锐印生产 转至锐印生产
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if="status === 'TO_BE_CONFIRMED' || status === 'EXCEPTION_ORDER'" v-if="status === 'TO_BE_CONFIRMED' || status === 'EXCEPTION_ORDER'"
class="item"
> >
<span class="item">
<ElButton type="danger" @click="cancelOrder">取消</ElButton> <ElButton type="danger" @click="cancelOrder">取消</ElButton>
</span> </span>
</ElFormItem>
<ElFormItem v-if="status === 'IN_PRODUCTION'">
<!-- <span v-if="status !== 'IN_PRODUCTION'" class="item"> <!-- <span v-if="status !== 'IN_PRODUCTION'" class="item">
<ElButton type="success" @click="handleUpdateRemark"> <ElButton type="success" @click="handleUpdateRemark">
添加内部标签 添加内部标签
</ElButton> </ElButton>
</span> --> </span> -->
<span v-if="status === 'IN_PRODUCTION'" class="item"> <span class="item">
<ElButton type="warning" @click="onFastProduction"> <ElButton type="warning" @click="onFastProduction">
快捷生产 快捷生产
</ElButton> </ElButton>
</span> </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 type="success" @click="applyForReplenishment(undefined)">
申请补胚 申请补胚
</ElButton> </ElButton>
</span> </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 type="success" @click="productioncompleted">
生产完成 生产完成
</ElButton> </ElButton>
</span> </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 type="warning" @click="printPodOrder">
播种墙配货 播种墙配货
</ElButton> </ElButton>
</span> </span>
</ElFormItem>
<ElFormItem v-if="status === 'CREATE_LOGISTICS'">
<!-- <span v-if="status === 'WAIT_SHIPMENT'" class="item"> <!-- <span v-if="status === 'WAIT_SHIPMENT'" class="item">
<ElButton type="warning" @click="inspPackagOrder"> <ElButton type="warning" @click="inspPackagOrder">
质检包装 质检包装
</ElButton> </ElButton>
</span> --> </span> -->
<span v-if="status === 'CREATE_LOGISTICS'" class="item"> <span class="item">
<ElButton type="warning" @click="logisticsToPicking"> <ElButton type="warning" @click="logisticsToPicking">
转至待排单 转至待排单
</ElButton> </ElButton>
</span> </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 type="primary" @click="completeDelivery()"
>完成发货</ElButton >完成发货</ElButton
> >
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if="status === 'WAIT_SHIPMENT' || status === 'CREATE_LOGISTICS'" v-if="status === 'WAIT_SHIPMENT' || status === 'CREATE_LOGISTICS'"
class="item"
> >
<span class="item">
<ElDropdown> <ElDropdown>
<el-button type="success"> <el-button type="success">
物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon> 物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon>
...@@ -468,75 +501,89 @@ ...@@ -468,75 +501,89 @@
</template> </template>
</ElDropdown> </ElDropdown>
</span> </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 type="warning" @click="stockOutCheck">
补货校验 补货校验
</ElButton> </ElButton>
</span> </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> <ElButton type="success" @click="toBePicking"> 转至生产 </ElButton>
</span> </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> <ElButton type="warning" @click="arrangeFinish">排单完成</ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if="status !== 'BATCH_DOWNLOAD' && status !== 'WAIT_SHIPMENT'" v-if="status !== 'BATCH_DOWNLOAD' && status !== 'WAIT_SHIPMENT'"
class="item"
> >
<span class="item">
<ElButton type="primary" @click="downloadMaterial" <ElButton type="primary" @click="downloadMaterial"
>下载素材</ElButton >下载素材</ElButton
> >
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if=" v-if="
status === 'INTERCEPTED' && status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4) (interceptCurrent === 1 || interceptCurrent === 4)
" "
class="item"
> >
<span class="item">
<ElButton type="success" @click="interceptChange(true)"> <ElButton type="success" @click="interceptChange(true)">
拦截成功 拦截成功
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if=" v-if="
status === 'INTERCEPTED' && status === 'INTERCEPTED' &&
(interceptCurrent === 1 || interceptCurrent === 4) (interceptCurrent === 1 || interceptCurrent === 4)
" "
class="item"
> >
<span class="item">
<ElButton type="danger" @click="interceptChange(false)"> <ElButton type="danger" @click="interceptChange(false)">
拦截失败 拦截失败
</ElButton> </ElButton>
</span> </span>
</ElFormItem>
<span <ElFormItem
v-if=" v-if="
status === 'TO_BE_CONFIRMED' || [
status === 'PICKING' || 'TO_BE_CONFIRMED',
status === 'STOCK_OUT' || 'PICKING',
status === 'EXCEPTION_ORDER' || 'STOCK_OUT',
status === 'TO_BE_REPLENISHMENT' || 'EXCEPTION_ORDER',
status === 'IN_PRODUCTION' || 'TO_BE_REPLENISHMENT',
status === 'TO_BE_ARRANGE' || 'IN_PRODUCTION',
status === 'WAIT_SHIPMENT' 'TO_BE_ARRANGE',
'WAIT_SHIPMENT',
].includes(status)
" "
class="item"
> >
<span class="item">
<ElButton type="success" @click="refreshMaterial"> <ElButton type="success" @click="refreshMaterial">
刷新商品信息 刷新商品信息
</ElButton> </ElButton>
</span> </span>
<span </ElFormItem>
<ElFormItem
v-if=" v-if="
status === 'STOCK_OUT' || [
status === 'CREATE_LOGISTICS' || 'STOCK_OUT',
status === 'TO_BE_ARRANGE' || 'CREATE_LOGISTICS',
status === 'PICKING' || 'TO_BE_ARRANGE',
status === 'IN_PRODUCTION' 'PICKING',
'IN_PRODUCTION',
].includes(status)
" "
class="item"
> >
<span class="item">
<ElDropdown> <ElDropdown>
<el-button type="warning"> <el-button type="warning">
驳回至<el-icon class="el-icon--right"><ArrowDown /></el-icon> 驳回至<el-icon class="el-icon--right"><ArrowDown /></el-icon>
...@@ -582,13 +629,19 @@ ...@@ -582,13 +629,19 @@
</template> </template>
</ElDropdown> </ElDropdown>
</span> </span>
<span v-if="status === 'COMPLETE'" class="item"> </ElFormItem>
<ElFormItem v-if="status === 'COMPLETE'">
<span class="item">
<ElButton type="warning" @click="statusPush">状态推送</ElButton> <ElButton type="warning" @click="statusPush">状态推送</ElButton>
</span> </span>
<span v-if="status === 'COMPLETE'" class="item"> </ElFormItem>
<ElFormItem v-if="status === 'COMPLETE'">
<span class="item">
<ElButton type="success" @click="exportData">导出</ElButton> <ElButton type="success" @click="exportData">导出</ElButton>
</span> </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 type="danger" @click="handleBatchDelete('batch')"
>批量删除</ElButton >批量删除</ElButton
> >
...@@ -4931,9 +4984,9 @@ useRouter().beforeEach((to, from, next) => { ...@@ -4931,9 +4984,9 @@ useRouter().beforeEach((to, from, next) => {
} }
} }
.item { // .item {
margin-right: 15px; // margin-right: 15px;
} // }
.tabs { .tabs {
display: flex; 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