Commit 57f7f0f1 by linjinhong

fix:修改问题

parent ecb13036
...@@ -301,10 +301,7 @@ ...@@ -301,10 +301,7 @@
确认生产 确认生产
</ElButton> </ElButton>
</span> </span>
<span <span v-if="status === 'CREATE_LOGISTICS'" class="item">
v-if="status === 'CREATE_LOGISTICS'"
class="item"
>
<ElButton type="warning" @click="asyncOrderAddress"> <ElButton type="warning" @click="asyncOrderAddress">
同步收货地址 同步收货地址
</ElButton> </ElButton>
...@@ -336,10 +333,7 @@ ...@@ -336,10 +333,7 @@
<ElButton type="success" @click="toOutOfStock"> 转至缺货 </ElButton> <ElButton type="success" @click="toOutOfStock"> 转至缺货 </ElButton>
</span> </span>
<span <span v-if="status === 'TO_BE_CONFIRMED'" class="item">
v-if="status === 'TO_BE_CONFIRMED'"
class="item"
>
<ElButton type="danger" @click="cancelOrder">取消</ElButton> <ElButton type="danger" @click="cancelOrder">取消</ElButton>
</span> </span>
<span v-if="status === 'IN_PRODUCTION'" class="item"> <span v-if="status === 'IN_PRODUCTION'" class="item">
...@@ -375,7 +369,7 @@ ...@@ -375,7 +369,7 @@
<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>
</el-button> </el-button>
<template #dropdown v-if="shipmentArea === 0"> <!-- <template #dropdown v-if="shipmentArea === 0">
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem <ElDropdownItem
:disabled=" :disabled="
...@@ -386,7 +380,7 @@ ...@@ -386,7 +380,7 @@
>待定</ElDropdownItem >待定</ElDropdownItem
> >
</ElDropdownMenu> </ElDropdownMenu>
</template> </template> -->
<template #dropdown v-if="shipmentArea === 1"> <template #dropdown v-if="shipmentArea === 1">
<ElDropdownMenu> <ElDropdownMenu>
...@@ -480,7 +474,7 @@ ...@@ -480,7 +474,7 @@
<span <span
class="tabs-node_count" class="tabs-node_count"
:class="{ :class="{
blue: true blue: true,
}" }"
>{{ item.quantity && item.quantity > 0 ? item.quantity : 0 }}</span >{{ item.quantity && item.quantity > 0 ? item.quantity : 0 }}</span
> >
...@@ -918,9 +912,7 @@ ...@@ -918,9 +912,7 @@
</div> </div>
<div <div
v-if=" v-if="row.status !== 'TO_BE_CONFIRMED'"
row.status !== 'TO_BE_CONFIRMED'
"
class="order-price-item" class="order-price-item"
> >
<span class="order-price-item-label">物流运费:</span> <span class="order-price-item-label">物流运费:</span>
...@@ -1631,7 +1623,7 @@ import { getUserMarkList } from '@/api/common' ...@@ -1631,7 +1623,7 @@ import { getUserMarkList } from '@/api/common'
import { import {
CaretBottom, CaretBottom,
CaretTop, CaretTop,
// Edit, ArrowDown,
WarningFilled, WarningFilled,
} from '@element-plus/icons-vue' } from '@element-plus/icons-vue'
import { import {
...@@ -2838,7 +2830,6 @@ const printPodOrder = async () => { ...@@ -2838,7 +2830,6 @@ const printPodOrder = async () => {
podOrderVisible.value = true podOrderVisible.value = true
} }
/** /**
* @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单 * @description: 创建物流、获取跟踪号、获取打印面单、更改物流、取消物流订单
*/ */
...@@ -3376,7 +3367,6 @@ onMounted(() => { ...@@ -3376,7 +3367,6 @@ onMounted(() => {
loadCraftList() loadCraftList()
}) })
const handleShipmentAreaCommand = (command: number) => { const handleShipmentAreaCommand = (command: number) => {
shipmentArea.value = command shipmentArea.value = command
search() search()
...@@ -3606,7 +3596,6 @@ useRouter().beforeEach((to, from, next) => { ...@@ -3606,7 +3596,6 @@ useRouter().beforeEach((to, from, next) => {
} }
} }
.goods-item { .goods-item {
display: grid; display: grid;
grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px; grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px;
......
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