Skip to content

F
factory_front
Commit 59ca3500 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !46
parents 937e619f 04823d8a
Showing with 58 additions and 9 deletions
src/views/order/podUs/index.vue
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
status === 'EXCEPTION_ORDER' || status === 'EXCEPTION_ORDER' ||
status === 'PICKING' || status === 'PICKING' ||
status === 'TO_BE_CONFIRMED' || status === 'TO_BE_CONFIRMED' ||
status === 'STOCK_OUT'|| status === 'STOCK_OUT' ||
status === 'CREATE_LOGISTICS' ? '数量:' status === 'CREATE_LOGISTICS' ? '数量:'
: '已生产数量:' : '已生产数量:'
}}</span> }}</span>
...@@ -1114,11 +1114,11 @@ ...@@ -1114,11 +1114,11 @@
</span> </span>
</div> </div>
<div class="grid-item"> <!-- <div class="grid-item">
<span title="Variant SKU" class="grid-item-value"> <span title="Variant SKU" class="grid-item-value">
{{ cardItem?.variantSku }} {{ cardItem?.variantSku }}
</span> </span>
</div> </div> -->
<div class="grid-item" title="工艺"> <div class="grid-item" title="工艺">
<span class="grid-item-label">工艺：</span> <span class="grid-item-label">工艺：</span>
<span class="grid-item-value"> <span class="grid-item-value">
...@@ -1148,14 +1148,14 @@ ...@@ -1148,14 +1148,14 @@
{{ cardItem?.shopNumber }} {{ cardItem?.shopNumber }}
</span> </span>
</div> </div>
<div class="grid-item" title="订单号"> <!-- <div class="grid-item" title="订单号">
<span <span
class="grid-item-value" class="grid-item-value"
@click="copy(cardItem?.factoryOrderNumber || '')" @click="copy(cardItem?.factoryOrderNumber || '')"
> >
{{ cardItem?.factoryOrderNumber }} {{ cardItem?.factoryOrderNumber }}
</span> </span>
</div> </div> -->
<div class="grid-item"> <div class="grid-item">
<span <span
...@@ -1169,9 +1169,9 @@ ...@@ -1169,9 +1169,9 @@
</span> </span>
</div> </div>
<div <div
v-if="cardItem.batchArrangeNumber"
class="grid-item" class="grid-item"
title="批次号" title="批次号"
v-if="cardItem.batchArrangeNumber"
> >
<span <span
class="grid-item-value" class="grid-item-value"
...@@ -1192,10 +1192,17 @@ ...@@ -1192,10 +1192,17 @@
</div> </div>
<div v-else class="empty">暂无数据</div> <div v-else class="empty">暂无数据</div>
</div> </div>
<div class="pagination">
<div class="total">
<span
>已选择
<span style="color: red">{{ selection.length || cardSelection.length }}</span> 条数据</span
>
</div>
<ElPagination <ElPagination
v-model:current-page="currentPage" v-model:current-page="currentPage"
v-model:page-size="pageSize" v-model:page-size="pageSize"
:page-sizes="[100, 200, 300, 400, 500]" :page-sizes="[50,100, 200, 300, 400, 500]"
background background
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
...@@ -1203,6 +1210,18 @@ ...@@ -1203,6 +1210,18 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
></ElPagination> ></ElPagination>
<div class="pageSize">
<span
>自定义条数
<span><el-input
v-model="pageSize"
type="number"
style="width: 100px;" clearable
@blur="inputBlur"></el-input></span> 条/页</span
>
</div>
</div>
</div> </div>
</div> </div>
<RightClickMenu <RightClickMenu
...@@ -1530,8 +1549,8 @@ ...@@ -1530,8 +1549,8 @@
<div v-if="logisticsForm.expressSheet" class="file"> <div v-if="logisticsForm.expressSheet" class="file">
<span>{{ logisticsForm.expressSheet.name }}</span> <span>{{ logisticsForm.expressSheet.name }}</span>
<el-icon <el-icon
@click="logisticsForm.expressSheet = null"
class="expressSheetClose" class="expressSheetClose"
@click="logisticsForm.expressSheet = null"
> >
<Close></Close> <Close></Close>
</el-icon> </el-icon>
...@@ -1664,6 +1683,7 @@ const currentRow = ref<AddressInfo>({ ...@@ -1664,6 +1683,7 @@ const currentRow = ref<AddressInfo>({
}) })
const updateAddVisible = ref(false) const updateAddVisible = ref(false)
const initPageSize = ref(50)
const logisticsVisible = ref(false) const logisticsVisible = ref(false)
const logisticsFormRef = ref() const logisticsFormRef = ref()
const logistics = { const logistics = {
...@@ -1963,6 +1983,7 @@ const { ...@@ -1963,6 +1983,7 @@ const {
onCurrentPageChange: handleCurrentChange, onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange, onPageSizeChange: handleSizeChange,
} = usePageList({ } = usePageList({
initPageSize: initPageSize.value,
query: (page, pageSize) => { query: (page, pageSize) => {
if ( if (
status.value !== 'IN_PRODUCTION' && status.value !== 'IN_PRODUCTION' &&
...@@ -2440,7 +2461,12 @@ const changeExceptionOrder = async () => { ...@@ -2440,7 +2461,12 @@ const changeExceptionOrder = async () => {
currentOrderIds.value = selection.value.map((item) => item.id) currentOrderIds.value = selection.value.map((item) => item.id)
exceptionDialogVisible.value = true exceptionDialogVisible.value = true
} }
const inputBlur = () => {
if (!pageSize.value || Number(pageSize.value) <= 0) {
pageSize.value = initPageSize.value
}
search()
}
const handleExceptionConfirm = async () => { const handleExceptionConfirm = async () => {
try { try {
await exceptionFormRef.value.validate() await exceptionFormRef.value.validate()
...@@ -3669,6 +3695,29 @@ const replenishmentSuccess = async () => { ...@@ -3669,6 +3695,29 @@ const replenishmentSuccess = async () => {
} }
} }
} }
.pagination {
display: flex;
justify-content: center;
align-items: center;
gap: 15px;
margin: 10px 0;
:deep(.el-pagination) {
margin: 0 !important;
}
.total {
color: #606266;
font-size: 15px;
}
.pageSize {
line-height: 39px;
color: #606266;
font-size: 15px;
}
}
</style> </style>
<style lang="scss"> <style lang="scss">
.customize-select-style { .customize-select-style {
......
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