Skip to content

F
factory_front
Commit 61969d95 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !133
parents 14c50f4e c887e038
Showing with 55 additions and 42 deletions
src/views/order/index.vue
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
style="width: 125px" style="width: 125px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="desc" label="按创建时间从新到旧"></el-option>
<el-option value="desc" label="倒序"></el-option> <el-option value="asc" label="按创建时间从旧到新"></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
...@@ -1053,7 +1053,7 @@ const [searchForm] = useValue<SearchForm>({ ...@@ -1053,7 +1053,7 @@ const [searchForm] = useValue<SearchForm>({
orderNumber: '', orderNumber: '',
internalMemo: '', internalMemo: '',
subOrderNumber: '', subOrderNumber: '',
order: 'desc', order: 'asc',
}) })
const tabsNav = ref<Tab[]>([]) const tabsNav = ref<Tab[]>([])
const splitRef = ref<InstanceType<typeof SplitDiv>>() const splitRef = ref<InstanceType<typeof SplitDiv>>()
......
src/views/order/pod/index.vue
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
style="width: 150px" style="width: 150px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="desc" label="按创建时间从新到旧"></el-option>
<el-option value="desc" label="倒序"></el-option> <el-option value="asc" label="按创建时间从旧到新"></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="定制类型"> <ElFormItem label="定制类型">
...@@ -1881,7 +1881,7 @@ const [searchForm] = useValue<SearchForm>({ ...@@ -1881,7 +1881,7 @@ const [searchForm] = useValue<SearchForm>({
shopNumber: '', shopNumber: '',
userMark: '', userMark: '',
customizedQuantity: '', customizedQuantity: '',
order: 'desc', order: 'asc',
platform: '', platform: '',
}) })
const tableColumns = computed<CustomColumn<CardOrderData[]>>(() => { const tableColumns = computed<CustomColumn<CardOrderData[]>>(() => {
......
src/views/order/podCN/index.vue
...@@ -225,8 +225,8 @@ ...@@ -225,8 +225,8 @@
style="width: 150px" style="width: 150px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="desc" label="按创建时间从新到旧"></el-option>
<el-option value="desc" label="倒序"></el-option> <el-option value="asc" label="按创建时间从旧到新"></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="印刷" v-if="status !== 'BATCH_DOWNLOAD'"> <ElFormItem label="印刷" v-if="status !== 'BATCH_DOWNLOAD'">
...@@ -1616,7 +1616,7 @@ ...@@ -1616,7 +1616,7 @@
</span> </span>
</div> </div>
<div <div
v-if="['TO_BE_CONFIRMED', 'STOCK_OUT'].includes(status)" v-if="['TO_BE_CONFIRMED','EXCEPTION_ORDER', 'STOCK_OUT', 'CREATE_LOGISTICS', 'TO_BE_ARRANGE', 'WAIT_SHIPMENT', 'WAIT_WEIGHING'].includes(status)"
class="order-detail-item" class="order-detail-item"
> >
<span class="order-detail-item-label">订单延期时间:</span> <span class="order-detail-item-label">订单延期时间:</span>
...@@ -2145,6 +2145,9 @@ ...@@ -2145,6 +2145,9 @@
? cardItem.num || 0 ? cardItem.num || 0
: cardItem?.notPassNum || 0 : cardItem?.notPassNum || 0
}} }}
<span title="订单延期时间" class="delayTime red-time">
{{ calculateDelayTime(cardItem) }}
</span>
</span> </span>
</div> </div>
<div class="grid-item"> <div class="grid-item">
...@@ -2160,6 +2163,9 @@ ...@@ -2160,6 +2163,9 @@
<span class="grid-item-label">补胚数量：</span> <span class="grid-item-label">补胚数量：</span>
<span class="grid-item-value"> <span class="grid-item-value">
{{ cardItem?.replenishmentNum || 0 }} {{ cardItem?.replenishmentNum || 0 }}
<span v-if="!['IN_PRODUCTION','PICKING','TO_BE_ARRANGE'].includes(status)" title="订单延期时间" class="delayTime red-time">
{{ calculateDelayTime(cardItem) }}
</span>
</span> </span>
</div> </div>
...@@ -3046,6 +3052,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({ ...@@ -3046,6 +3052,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
shipmentArea: undefined, shipmentArea: undefined,
platform: '', platform: '',
productionClient: '', productionClient: '',
order: 'asc',
warehouseId: '', warehouseId: '',
thirdSkuCode: '', thirdSkuCode: '',
supplierProductNo: '', supplierProductNo: '',
...@@ -5550,7 +5557,7 @@ const calculateHoursDifference = (startDateString?: string): string => { ...@@ -5550,7 +5557,7 @@ const calculateHoursDifference = (startDateString?: string): string => {
const diffInMs = currentTime.value.getTime() - startTime.getTime() const diffInMs = currentTime.value.getTime() - startTime.getTime()
// 转换为小时并取整:ceil向上或者round:四舍五入 // 转换为小时并取整:ceil向上或者round:四舍五入
const hours = Math.round(diffInMs / (1000 * 60 * 60)) const hours = Math.round(diffInMs / (1000 * 60 * 60))
return `${hours}小时` return `${hours}h`
} catch (error) { } catch (error) {
console.error('日期解析错误:', error) console.error('日期解析错误:', error)
return '--' return '--'
...@@ -5558,16 +5565,7 @@ const calculateHoursDifference = (startDateString?: string): string => { ...@@ -5558,16 +5565,7 @@ const calculateHoursDifference = (startDateString?: string): string => {
} }
// 根据订单状态计算延期时间 // 根据订单状态计算延期时间
const calculateDelayTime = computed(() => (row: ProductList) => { const calculateDelayTime = computed(() => (row: ProductList) => {
switch (status.value) { return row.createTime ? calculateHoursDifference(row.createTime) : '--'
case 'TO_BE_CONFIRMED':
return row.createTime ? calculateHoursDifference(row.createTime) : '--'
case 'STOCK_OUT':
return row.startStockingTime
? calculateHoursDifference(row.startStockingTime)
: '--'
default:
return '--'
}
}) })
onBeforeUnmount(() => { onBeforeUnmount(() => {
// 组件卸载时清除定时器 // 组件卸载时清除定时器
...@@ -5959,12 +5957,21 @@ useEnterKeyTrigger({ ...@@ -5959,12 +5957,21 @@ useEnterKeyTrigger({
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.red-time {
color: red;
font-weight: bold;
}
}
}
.grid-item-value{
position: relative;
}
.delayTime{
position: absolute;
right: 0;
font-size: 14px;
top: -2px;
}
.red-time {
color: red;
font-weight: bold;
}
.card-list { .card-list {
display: grid; display: grid;
grid-template-columns: repeat(6, 1fr); grid-template-columns: repeat(6, 1fr);
......
src/views/order/podUs/index.vue
...@@ -1810,7 +1810,7 @@ ...@@ -1810,7 +1810,7 @@
</span> </span>
</div> --> </div> -->
<div <div
v-if="['TO_BE_CONFIRMED', 'STOCK_OUT'].includes(status)" v-if="['TO_BE_CONFIRMED','EXCEPTION_ORDER', 'STOCK_OUT', 'CREATE_LOGISTICS', 'TO_BE_ARRANGE', 'WAIT_SHIPMENT'].includes(status)"
class="order-detail-item" class="order-detail-item"
> >
<span class="order-detail-item-label">订单延期时间:</span> <span class="order-detail-item-label">订单延期时间:</span>
...@@ -2371,6 +2371,9 @@ ...@@ -2371,6 +2371,9 @@
? cardItem.num || 0 ? cardItem.num || 0
: cardItem?.notPassNum || 0 : cardItem?.notPassNum || 0
}} }}
<span title="订单延期时间" class="delayTime red-time">
{{ calculateDelayTime(cardItem) }}
</span>
</span> </span>
</div> </div>
<div <div
...@@ -2388,6 +2391,9 @@ ...@@ -2388,6 +2391,9 @@
<span class="grid-item-label">补胚数量：</span> <span class="grid-item-label">补胚数量：</span>
<span class="grid-item-value"> <span class="grid-item-value">
{{ cardItem?.replenishmentNum || 0 }} {{ cardItem?.replenishmentNum || 0 }}
<span v-if="!['IN_PRODUCTION','PICKING','TO_BE_ARRANGE'].includes(status)" title="订单延期时间" class="delayTime red-time">
{{ calculateDelayTime(cardItem) }}
</span>
</span> </span>
</div> </div>
<div <div
...@@ -6316,7 +6322,7 @@ const calculateHoursDifference = (startDateString?: string): string => { ...@@ -6316,7 +6322,7 @@ const calculateHoursDifference = (startDateString?: string): string => {
const diffInMs = currentTime.value.getTime() - startTime.getTime() const diffInMs = currentTime.value.getTime() - startTime.getTime()
// 转换为小时并取整:ceil向上或者round:四舍五入 // 转换为小时并取整:ceil向上或者round:四舍五入
const hours = Math.round(diffInMs / (1000 * 60 * 60)) const hours = Math.round(diffInMs / (1000 * 60 * 60))
return `${hours}小时` return `${hours}h`
} catch (error) { } catch (error) {
console.error('日期解析错误:', error) console.error('日期解析错误:', error)
return '--' return '--'
...@@ -6324,16 +6330,7 @@ const calculateHoursDifference = (startDateString?: string): string => { ...@@ -6324,16 +6330,7 @@ const calculateHoursDifference = (startDateString?: string): string => {
} }
// 根据订单状态计算延期时间 // 根据订单状态计算延期时间
const calculateDelayTime = computed(() => (row: ProductList) => { const calculateDelayTime = computed(() => (row: ProductList) => {
switch (status.value) { return row.createTime ? calculateHoursDifference(row.createTime) : '--'
case 'TO_BE_CONFIRMED':
return row.createTime ? calculateHoursDifference(row.createTime) : '--'
case 'STOCK_OUT':
return row.startStockingTime
? calculateHoursDifference(row.startStockingTime)
: '--'
default:
return '--'
}
}) })
onBeforeUnmount(() => { onBeforeUnmount(() => {
// 组件卸载时清除定时器 // 组件卸载时清除定时器
...@@ -6958,12 +6955,21 @@ const printNormal = async () => { ...@@ -6958,12 +6955,21 @@ const printNormal = async () => {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.red-time {
color: red;
font-weight: bold;
}
}
}
.grid-item-value{
position: relative;
}
.delayTime{
position: absolute;
right: 0;
font-size: 14px;
top: -2px;
}
.red-time {
color: red;
font-weight: bold;
}
.card-list { .card-list {
display: grid; display: grid;
grid-template-columns: repeat(6, 1fr); grid-template-columns: repeat(6, 1fr);
......
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