Skip to content

F
factory_front
Commit 3056680e by zhuzhequan
Options

Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front 

# Conflicts:
#	src/views/order/pod/index.vue
parents 04886f0f 438a7e84
Showing with 67 additions and 159 deletions
src/api/podOrder.ts
...@@ -73,7 +73,8 @@ export function getCardOrderList( ...@@ -73,7 +73,8 @@ export function getCardOrderList(
} }
export function getOrderBySubOrderNumber(orderNumber: string) { export function getOrderBySubOrderNumber(orderNumber: string) {
return axios.get<never, BaseRespData<OrderData>>( return axios.get<never, BaseRespData<OrderData>>(
'factory/podJomallOrder/getOrderBySubOrderNumber', // 'factory/podJomallOrder/getOrderBySubOrderNumber',
'factory/podJomallOrder/getOrderProductBySubOrderNumber',
{ {
params: { params: {
factorySubOrderNumber: orderNumber, factorySubOrderNumber: orderNumber,
...@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) { ...@@ -81,7 +82,16 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
}, },
) )
} }
export function applyForReplenishmentApi(productIds: string) {
return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderProduct/applyForReplenishment',
{
params: {
productIds,
},
},
)
}
// 发货保存 // 发货保存
export function saveOrder( export function saveOrder(
sumbitSendOutList: ShipmentOrderRes[], sumbitSendOutList: ShipmentOrderRes[],
......
src/views/order/ProductInfo.vue
...@@ -167,16 +167,16 @@ ...@@ -167,16 +167,16 @@
(item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0)) (item.num || 0) - ((item.shipmentNum || 0) - (item.notPassNum || 0))
}}</span> }}</span>
<span v-else class="order-list-expand_item_value">{{ <span v-else class="order-list-expand_item_value">{{
(item.num || 0) - (item.shipmentNum || 0) (item.num || 0) - (item.shipmentNum || 0)
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div v-if="isPod" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">工艺:</span> <span class="order-list-expand_item_label">工艺:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
!isPod ? item?.processName || '--' : item?.process || '--' item?.processName || '--'
}}</span> }}</span>
</div> </div>
<div v-if="!isPod" class="order-list-expand_item_info_title"> <div v-if="isPod" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">工艺简称:</span> <span class="order-list-expand_item_label">工艺简称:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item?.process || '--' item?.process || '--'
......
src/views/order/fastProduction.vue
...@@ -324,7 +324,7 @@ const props = defineProps({ ...@@ -324,7 +324,7 @@ const props = defineProps({
type: String, type: String,
}, },
}) })
const emit = defineEmits(['update:detailVisible', 'close']) const emit = defineEmits(['update:detailVisible', 'close','onSuccess'])
watch( watch(
() => props.detailVisible, () => props.detailVisible,
...@@ -461,9 +461,8 @@ const changeStatus = async () => { ...@@ -461,9 +461,8 @@ const changeStatus = async () => {
setData(TrackingNumber.value) setData(TrackingNumber.value)
}) })
} }
const setData = async (orderNumber: string) => { const setData = async (orderNumber: string) => {
if (detail.value && detail.value?.id) { if (detail.value && detail.value?.id!=-1) {
try { try {
const id = detail.value?.id const id = detail.value?.id
await productionQueryApi(id) await productionQueryApi(id)
...@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => { ...@@ -481,7 +480,7 @@ const setData = async (orderNumber: string) => {
localStorage.setItem('historyData', JSON.stringify(historyData.value)) localStorage.setItem('historyData', JSON.stringify(historyData.value))
} }
} }
emit('onSuccess')
playAudio('weight_success') playAudio('weight_success')
detail.value = { id: -1, podOrderId: -1, imgList: [] } detail.value = { id: -1, podOrderId: -1, imgList: [] }
} catch (e) { } catch (e) {
......
src/views/order/hook/podUseShipMent.ts
...@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) { ...@@ -73,6 +73,8 @@ export default function useShipment(callback?: () => void) {
isLock.value = false isLock.value = false
await nextTick() await nextTick()
if (shipmentOrderRef.value) { if (shipmentOrderRef.value) {
console.log("shipmentOrderRef.value",shipmentOrderRef.value);
const rowEl = shipmentOrderRef.value.listRef?.querySelector( const rowEl = shipmentOrderRef.value.listRef?.querySelector(
`div[data-id="${rowData.id}"]`, `div[data-id="${rowData.id}"]`,
) )
......
src/views/order/pod/index.vue
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</span> </span>
<span v-if="status === 'IN_PRODUCTION'" class="item"> <span v-if="status === 'IN_PRODUCTION'" class="item">
<ElButton type="success" dark @click="fastToProduction('快捷生产', 1)" <ElButton type="success" dark @click="fastToProduction('快捷生产', 1)"
>快捷生产</ElButton >快捷生产</ElButton
> >
</span> </span>
<span <span
...@@ -128,17 +128,17 @@ ...@@ -128,17 +128,17 @@
class="item" class="item"
> >
<ElButton type="primary" dark @click="printManuscript" <ElButton type="primary" dark @click="printManuscript"
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </span>
<span v-if="status === 'TO_BE_CONFIRMED'" class="item"> <span v-if="status === 'TO_BE_CONFIRMED'" class="item">
<ElButton type="success" dark @click="exportManuscript" <ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton >导出生产单</ElButton
> >
</span> </span>
<span class="item"> <span class="item">
<ElButton type="warning" @click="addInternalTag" <ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton >添加内部标签</ElButton
> >
</span> </span>
<span <span
...@@ -169,7 +169,6 @@ ...@@ -169,7 +169,6 @@
v-if="status === 'WAIT_SHIPMENT' || status === 'PART_SHIPPING'" v-if="status === 'WAIT_SHIPMENT' || status === 'PART_SHIPPING'"
class="item" class="item"
> >
<ElButton type="success" @click="confirmDelivery">发货</ElButton> <ElButton type="success" @click="confirmDelivery">发货</ElButton>
</span> </span>
<!-- <span v-if="status === 'IN_PRODUCTION'" class="item"> <!-- <span v-if="status === 'IN_PRODUCTION'" class="item">
...@@ -190,7 +189,6 @@ ...@@ -190,7 +189,6 @@
<CardWrapper <CardWrapper
:card-item="cardItem" :card-item="cardItem"
:class="{ active: isSelectStatused(cardItem) }" :class="{ active: isSelectStatused(cardItem) }"
@contextmenu.prevent="(v)=>rightClick(v,cardItem)"
> >
<!-- <template #top_right> 工厂类型 </template> --> <!-- <template #top_right> 工厂类型 </template> -->
<template #bottom_left> <template #bottom_left>
...@@ -305,7 +303,7 @@ ...@@ -305,7 +303,7 @@
placement="bottom" placement="bottom"
> >
<span <span
>数量：{{ >数量：{{
status === 'IN_PRODUCTION' status === 'IN_PRODUCTION'
? cardItem?.notPassNum ? cardItem?.notPassNum
: cardItem?.passNum : cardItem?.passNum
...@@ -405,12 +403,10 @@ ...@@ -405,12 +403,10 @@
class="order-list flex-1 overflow-hidden" class="order-list flex-1 overflow-hidden"
> >
<TableView <TableView
ref="tableRef"
:paginated-data="tableData" :paginated-data="tableData"
:columns="tableColumns" :columns="tableColumns"
:span-method="arraySpanMethod"
default-expand-all default-expand-all
@right-click="rightClick" :span-method="arraySpanMethod"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #expand="{ row }"> <template #expand="{ row }">
...@@ -430,14 +426,14 @@ ...@@ -430,14 +426,14 @@
<span @click="openAll(row)"> <span @click="openAll(row)">
<template v-if="!row.moreable"> <template v-if="!row.moreable">
展开全部<strong style="color: red" 展开全部<strong style="color: red"
>({{ row.productList.length }})</strong >({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle" >条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon ><ArrowDown /></el-icon
></template> ></template>
<template v-else> <template v-else>
收起商品信息<el-icon style="vertical-align: middle" 收起商品信息<el-icon style="vertical-align: middle"
><ArrowUp ><ArrowUp
/></el-icon> /></el-icon>
</template> </template>
</span> </span>
</div> </div>
...@@ -448,22 +444,22 @@ ...@@ -448,22 +444,22 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">商品价:</span> <span class="order-list-expand_item_label">商品价:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.thirdProductAmount row.thirdProductAmount
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">小计:</span> <span class="order-list-expand_item_label">小计:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.totalAmount || '--' row.totalAmount || '--'
}}</span> }}</span>
</div> </div>
<div <div
v-if="row.totolBuyNumber" v-if="row.totolBuyNumber"
class="order-list-expand_item_info_title" class="order-list-expand_item_info_title"
> >
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>共{{ row.totolBuyNumber }}件</span >共{{ row.totolBuyNumber }}件</span
> >
</div> </div>
</div> </div>
...@@ -503,28 +499,28 @@ ...@@ -503,28 +499,28 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">创建时间:</span> <span class="order-list-expand_item_label">创建时间:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.createTime || '--' row.createTime || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label" <span class="order-list-expand_item_label"
>期望交货时间:</span >期望交货时间:</span
> >
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.expectDeliveryTime || '--' row.expectDeliveryTime || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">确认时间:</span> <span class="order-list-expand_item_label">确认时间:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.startStockingTime || '--' row.startStockingTime || '--'
}}</span> }}</span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">完成时间:</span> <span class="order-list-expand_item_label">完成时间:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
row.finishTime || '--' row.finishTime || '--'
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -535,12 +531,12 @@ ...@@ -535,12 +531,12 @@
class="order-list-expand_item_info_title" class="order-list-expand_item_info_title"
> >
<ElButton text type="danger" @click="cancelOrder(row.id)" <ElButton text type="danger" @click="cancelOrder(row.id)"
>取消 >取消
</ElButton> </ElButton>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.id)" <ElButton text type="primary" @click="openLog(row.id)"
>操作日志 >操作日志
</ElButton> </ElButton>
</div> </div>
</div> </div>
...@@ -562,8 +558,8 @@ ...@@ -562,8 +558,8 @@
> >
<span class="label">第三方订单号:</span> <span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.thirdOrderNumber">{{ <span class="value" :title="scope.row.thirdOrderNumber">{{
scope.row.thirdOrderNumber || '--' scope.row.thirdOrderNumber || '--'
}}</span> }}</span>
</div> </div>
<!-- <div <!-- <div
:title="scope.row.manuscriptStatusStr" :title="scope.row.manuscriptStatusStr"
...@@ -586,8 +582,8 @@ ...@@ -586,8 +582,8 @@
<div :title="scope.row.lanshouAddress" class="order-detail_item"> <div :title="scope.row.lanshouAddress" class="order-detail_item">
<span class="label">收货地址:</span> <span class="label">收货地址:</span>
<span class="value" :title="scope.row.lanshouAddress">{{ <span class="value" :title="scope.row.lanshouAddress">{{
scope.row.lanshouRegion + scope.row.lanshouAddress scope.row.lanshouRegion + scope.row.lanshouAddress
}}</span> }}</span>
</div> </div>
<div <div
v-if="scope.row.shipmentUid" v-if="scope.row.shipmentUid"
...@@ -596,8 +592,8 @@ ...@@ -596,8 +592,8 @@
> >
<span class="label">提货码:</span> <span class="label">提货码:</span>
<span class="value" :title="scope.row.shipmentUid">{{ <span class="value" :title="scope.row.shipmentUid">{{
scope.row.shipmentUid scope.row.shipmentUid
}}</span> }}</span>
</div> </div>
<div :title="scope.row.lanshouPost" class="order-detail_item"> <div :title="scope.row.lanshouPost" class="order-detail_item">
<span class="label">邮编:</span> <span class="label">邮编:</span>
...@@ -607,7 +603,6 @@ ...@@ -607,7 +603,6 @@
</template> </template>
</TableView> </TableView>
</div> </div>
<right-menu :show_copy_shop_number="['IN_PRODUCTION','WAIT_SHIPMENT'].includes(status)" ref="rightMenuRef" @change="rightChange" />
<el-pagination <el-pagination
v-model:current-page="currentPage" v-model:current-page="currentPage"
v-model:page-size="pageSize" v-model:page-size="pageSize"
...@@ -642,7 +637,7 @@ ...@@ -642,7 +637,7 @@
type="primary" type="primary"
size="large" size="large"
@click="searchShipmentByOrderNumber" @click="searchShipmentByOrderNumber"
>查询 >查询
</el-button> </el-button>
</div> </div>
<Shipment <Shipment
...@@ -712,10 +707,10 @@ ...@@ -712,10 +707,10 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button size="large" @click="shipmentVisible = false" <el-button size="large" @click="shipmentVisible = false"
>取消 >取消
</el-button> </el-button>
<el-button size="large" type="primary" @click="saveShipment" <el-button size="large" type="primary" @click="saveShipment"
>发货 >发货
</el-button> </el-button>
</div> </div>
</template> </template>
...@@ -728,14 +723,6 @@ ...@@ -728,14 +723,6 @@
> >
<LogList :log-list="logList" /> <LogList :log-list="logList" />
</el-dialog> </el-dialog>
<el-dialog
v-model="countVisible"
title="数据统计"
width="400px"
:close-on-click-modal="false"
>
<p>基版 <b>{{cardItem?.baseSku}}</b> 的统计数量为：<b> {{count}}</b></p>
</el-dialog>
<fastProduction <fastProduction
v-model:detailVisible="detailVisible" v-model:detailVisible="detailVisible"
:title="fastTitle" :title="fastTitle"
...@@ -748,8 +735,6 @@ ...@@ -748,8 +735,6 @@
</template> </template>
<script setup lang="tsx"> <script setup lang="tsx">
// refreshJMProductInfo,reasonInvalidationApi, // refreshJMProductInfo,reasonInvalidationApi,
import RightMenu from './rightMenu.vue'
import { import {
getOrderTabData, getOrderTabData,
getOrderList, getOrderList,
...@@ -763,6 +748,9 @@ import { ...@@ -763,6 +748,9 @@ import {
updateRemarkApi, updateRemarkApi,
getCardOrderList, getCardOrderList,
getOrderDetail, getOrderDetail,
refreshJMProductInfo,
reasonInvalidationApi,
applyForReplenishmentApi,
getInProductionCount, getInProductionCount,
getWaitShipmentCount, getWaitShipmentCount,
} from '@/api/podOrder' } from '@/api/podOrder'
...@@ -799,62 +787,13 @@ import { ElButton, type FormRules } from 'element-plus' ...@@ -799,62 +787,13 @@ import { ElButton, type FormRules } from 'element-plus'
import { showConfirm } from '@/utils/ui' import { showConfirm } from '@/utils/ui'
import { filePath } from '@/api/axios' import { filePath } from '@/api/axios'
import LogList from '@/components/LogList.vue' import LogList from '@/components/LogList.vue'
const tableRef = ref();
const keyCode = ref('');
const cardItem = ref<PodProductList | CardOrderData>();
const rightMenuRef = ref()
const count = ref<number>(0)
const rightClick = (e:MouseEvent,item:PodProductList | CardOrderData) => {
cardItem.value = item
rightMenuRef.value.setPosition({
x: e.clientX,
y: e.clientY,
cardItem: e.clientY,
el: e
})
}
const rightChange =async (code:string) => {
const flag = ['IN_PRODUCTION','WAIT_SHIPMENT'].includes(status.value)
if (code === 'check_all') {
if(flag){
selection.value = JSON.parse(JSON.stringify(CardOrderList.value))
} else{
if( tableRef.value && tableRef.value?.tableRef){
tableRef.value?.tableRef.toggleAllSelection()
}
// selection.value = JSON.parse(JSON.stringify(tableData.value))
}
} else if (code === 'clear_check') {
selection.value = []
tableRef.value?.tableRef.toggleAllSelection()
} else if (code === 'copy_code') {
const str = selection.value.map(item=>item.factorySubOrderNumber || item.factoryOrderNumber).join()
navigator.clipboard.writeText(str)
ElMessage.success('复制成功')
} else if (code === 'copy_shopNumber') {
const str = selection.value.map(item=>item.shopNumber).join()
navigator.clipboard.writeText(str)
ElMessage.success('复制成功')
} else if (code === 'count') {
countVisible.value = true
let res
if(status.value==='WAIT_SHIPMENT'){
res = await getWaitShipmentCount(cardItem.value?.productionFileId,cardItem.value?.baseSku)
}else if(status.value==='IN_PRODUCTION'){
res = await getInProductionCount(cardItem.value?.productionFileId,cardItem.value?.baseSku)
}
count.value = (res?.data || 0) as number
}
}
// 日期工具函数 // 日期工具函数
const const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
getDateRange = (days = 0, type: 'past' | 'future' = 'past') => { const end = dayjs()
const end = dayjs() const start =
const start = type === 'past' ? end.subtract(days, 'day') : end.add(days, 'day')
type === 'past' ? end.subtract(days, 'day') : end.add(days, 'day') return [start.startOf('day').toDate(), end.endOf('day').toDate()]
return [start.startOf('day').toDate(), end.endOf('day').toDate()] }
}
const getMonthRange = (months = 0, type: 'past' | 'future' = 'past') => { const getMonthRange = (months = 0, type: 'past' | 'future' = 'past') => {
const now = dayjs() const now = dayjs()
...@@ -920,7 +859,6 @@ const pickerOptions = { ...@@ -920,7 +859,6 @@ const pickerOptions = {
const timeRange = ref<string[]>([]) const timeRange = ref<string[]>([])
const tabsNav = ref<Tab[]>() const tabsNav = ref<Tab[]>()
const status = ref('TO_BE_CONFIRMED') const status = ref('TO_BE_CONFIRMED')
const [tableWrapperRef, thOrderDetailWidth, updateColumnWidth] = const [tableWrapperRef, thOrderDetailWidth, updateColumnWidth] =
useElTableColumnWidth('table th.th-order-detail') useElTableColumnWidth('table th.th-order-detail')
const loadTabData = async () => { const loadTabData = async () => {
...@@ -1032,7 +970,6 @@ const handleChangeImages = ( ...@@ -1032,7 +970,6 @@ const handleChangeImages = (
const fastTitle = ref('') const fastTitle = ref('')
const detailData = ref({}) const detailData = ref({})
const detailVisible = ref(false) const detailVisible = ref(false)
const countVisible = ref(false)
const fastType = ref<number>(-1) const fastType = ref<number>(-1)
const fastToProduction = (title: string, type: number) => { const fastToProduction = (title: string, type: number) => {
detailData.value = {} detailData.value = {}
...@@ -1042,18 +979,6 @@ const fastToProduction = (title: string, type: number) => { ...@@ -1042,18 +979,6 @@ const fastToProduction = (title: string, type: number) => {
} }
const cardClick = (data: PodProductList | CardOrderData) => { const cardClick = (data: PodProductList | CardOrderData) => {
const status = isSelectStatused(data) const status = isSelectStatused(data)
if(keyCode.value==='Shift'){
if(selection.value.length){
const startIndex=CardOrderList.value.findIndex(el=>el.id===selection.value[0].id)
const endIndex = CardOrderList.value.findIndex(el=>el.id===data.id)
selection.value =[]
for(let k =startIndex;k<=endIndex;k++ ){
selection.value.push(JSON.parse(JSON.stringify(CardOrderList.value[k])))
}
}
}
if (status) { if (status) {
selection.value = selection.value.filter( selection.value = selection.value.filter(
(item: CardOrderData | PodProductList) => item.id !== data.id, (item: CardOrderData | PodProductList) => item.id !== data.id,
...@@ -1555,12 +1480,7 @@ const getSafeImages = (item: PodProductList | CardOrderData): cardImages[] => { ...@@ -1555,12 +1480,7 @@ const getSafeImages = (item: PodProductList | CardOrderData): cardImages[] => {
if (!item.images) return [] if (!item.images) return []
return item.images as cardImages[] return item.images as cardImages[]
} }
const listenerKeydown= (e:KeyboardEvent) => {
console.log(e)
keyCode.value = e?.key
}
onMounted(() => { onMounted(() => {
document.addEventListener('keydown', listenerKeydown)
getLogisticsList() getLogisticsList()
loadTabData() loadTabData()
}) })
...@@ -1572,25 +1492,21 @@ onMounted(() => { ...@@ -1572,25 +1492,21 @@ onMounted(() => {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.card-mode { .card-mode {
padding-top: 10px; padding-top: 10px;
overflow: auto; overflow: auto;
.card-list { .card-list {
flex: 1; flex: 1;
display: grid; display: grid;
grid-template-columns: repeat(6, 1fr); grid-template-columns: repeat(6, 1fr);
grid-template-rows: max-content; grid-template-rows: max-content;
gap: 10px; gap: 10px;
.card-list_item { .card-list_item {
border: 1px solid #eee; border: 1px solid #eee;
border-top-left-radius: 10px; border-top-left-radius: 10px;
background-color: #eee; background-color: #eee;
overflow: hidden; overflow: hidden;
cursor: pointer; cursor: pointer;
.base_sku { .base_sku {
background: rgba(255, 255, 255, 0.699); background: rgba(255, 255, 255, 0.699);
font-size: 12px; font-size: 12px;
...@@ -1603,24 +1519,20 @@ onMounted(() => { ...@@ -1603,24 +1519,20 @@ onMounted(() => {
padding: 3px 5px; padding: 3px 5px;
border-radius: 2px; border-radius: 2px;
} }
.flex-between { .flex-between {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.images-position { .images-position {
display: flex; display: flex;
height: 30px; height: 30px;
gap: 10px; gap: 10px;
padding: 10px 6px 0; padding: 10px 6px 0;
.item-image { .item-image {
width: 30px; width: 30px;
height: 30px; height: 30px;
border: 1px solid #909399; border: 1px solid #909399;
cursor: pointer; cursor: pointer;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -1628,7 +1540,6 @@ onMounted(() => { ...@@ -1628,7 +1540,6 @@ onMounted(() => {
} }
} }
} }
b { b {
margin-right: 5px; margin-right: 5px;
font-size: 15px; font-size: 15px;
...@@ -1681,7 +1592,6 @@ onMounted(() => { ...@@ -1681,7 +1592,6 @@ onMounted(() => {
} }
} }
} }
.order-list-expand { .order-list-expand {
border-right: 1px solid #eee; border-right: 1px solid #eee;
font-size: 14px; font-size: 14px;
...@@ -1689,7 +1599,6 @@ onMounted(() => { ...@@ -1689,7 +1599,6 @@ onMounted(() => {
overflow: auto; overflow: auto;
max-height: 600px; max-height: 600px;
} }
.table-expand { .table-expand {
display: flex; display: flex;
} }
...@@ -1702,7 +1611,6 @@ onMounted(() => { ...@@ -1702,7 +1611,6 @@ onMounted(() => {
cursor: pointer; cursor: pointer;
} }
} }
.order-list { .order-list {
margin-top: 10px; margin-top: 10px;
flex: 1; flex: 1;
...@@ -1719,12 +1627,10 @@ onMounted(() => { ...@@ -1719,12 +1627,10 @@ onMounted(() => {
padding: 0; padding: 0;
} }
} }
.order-detail { .order-detail {
display: flex; display: flex;
font-size: 14px; font-size: 14px;
} }
.order-detail_item { .order-detail_item {
flex: 1; flex: 1;
display: flex; display: flex;
...@@ -1743,12 +1649,10 @@ onMounted(() => { ...@@ -1743,12 +1649,10 @@ onMounted(() => {
white-space: nowrap; white-space: nowrap;
} }
} }
.order-actual-payment { .order-actual-payment {
width: 280px; width: 280px;
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
.order-memo { .order-memo {
width: 300px; width: 300px;
border-right: 1px solid #eee; border-right: 1px solid #eee;
...@@ -1758,7 +1662,6 @@ onMounted(() => { ...@@ -1758,7 +1662,6 @@ onMounted(() => {
padding: 20px; padding: 20px;
font-size: 14px; font-size: 14px;
} }
.order-memo-item__content, .order-memo-item__content,
.order-memo-item__time { .order-memo-item__time {
white-space: nowrap; white-space: nowrap;
...@@ -1780,12 +1683,10 @@ onMounted(() => { ...@@ -1780,12 +1683,10 @@ onMounted(() => {
.order-memo-item div:not(:last-child) { .order-memo-item div:not(:last-child) {
margin-right: 6px; margin-right: 6px;
} }
.order-time { .order-time {
width: 300px; width: 300px;
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
.order-operate { .order-operate {
width: 100px; width: 100px;
} }
...@@ -1812,16 +1713,13 @@ onMounted(() => { ...@@ -1812,16 +1713,13 @@ onMounted(() => {
.dialog-footer { .dialog-footer {
text-align: center; text-align: center;
} }
.order-detail_goods-info--content { .order-detail_goods-info--content {
padding: 10px 0; padding: 10px 0;
font-size: 14px; font-size: 14px;
:deep(.order-list-expand_item) { :deep(.order-list-expand_item) {
padding: 10px 0; padding: 10px 0;
} }
} }
.order-list-expand_item_info_title { .order-list-expand_item_info_title {
line-height: 26px; line-height: 26px;
display: flex; display: flex;
...@@ -1831,7 +1729,6 @@ onMounted(() => { ...@@ -1831,7 +1729,6 @@ onMounted(() => {
.order-list-expand_item_label { .order-list-expand_item_label {
margin-right: 6px; margin-right: 6px;
} }
.order-operate_info { .order-operate_info {
padding: 20px; padding: 20px;
......
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