|
|
|
@ -84,6 +84,12 @@
|
|
|
|
|
<!-- </el-col> --> |
|
|
|
|
<!-- </el-row> --> |
|
|
|
|
<!-- 商配总车次 --> |
|
|
|
|
|
|
|
|
|
<div style=" |
|
|
|
|
height: 95%; |
|
|
|
|
"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="order-info"> |
|
|
|
|
<ul> |
|
|
|
|
<li> |
|
|
|
@ -100,7 +106,7 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row > |
|
|
|
|
<el-row class="el_tabBK"> |
|
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick"> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
@ -123,119 +129,119 @@
|
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<el-tab-pane label="全部列表" name="first"> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text> |
|
|
|
|
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> |
|
|
|
|
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.deliveryStatusName !== '已完成' || |
|
|
|
|
slotProps.scope.row.deliveryStatus !== '3' |
|
|
|
|
" |
|
|
|
|
@click="handleEdit(slotProps.scope)" |
|
|
|
|
>编 辑</el-text |
|
|
|
|
> |
|
|
|
|
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
<!-- <tablecmt--> |
|
|
|
|
<!-- :columnList="columnList"--> |
|
|
|
|
<!-- :tableData="data"--> |
|
|
|
|
<!-- :loading="loading"--> |
|
|
|
|
<!-- @inputTxt="inputsc"--> |
|
|
|
|
<!-- @timeCheck="timesc"--> |
|
|
|
|
<!-- @btnCheck="btnsc"--> |
|
|
|
|
<!-- @selectCheck="selectsc"--> |
|
|
|
|
<!-- @selection="selectionsc"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <template #default="slotProps">--> |
|
|
|
|
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>--> |
|
|
|
|
<!-- <el-text--> |
|
|
|
|
<!-- size="small"--> |
|
|
|
|
<!-- v-if="--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatus !== '3'--> |
|
|
|
|
<!-- "--> |
|
|
|
|
<!-- @click="handleEdit(slotProps.scope)"--> |
|
|
|
|
<!-- >编 辑</el-text--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <!– <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>–>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </tablecmt>--> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="待配送" name="second"> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text> |
|
|
|
|
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> |
|
|
|
|
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.deliveryStatusName !== '已完成' || |
|
|
|
|
slotProps.scope.row.deliveryStatus !== '3' |
|
|
|
|
" |
|
|
|
|
@click="handleEdit(slotProps.scope)" |
|
|
|
|
>编 辑</el-text |
|
|
|
|
> |
|
|
|
|
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
<!-- <tablecmt--> |
|
|
|
|
<!-- :columnList="columnList"--> |
|
|
|
|
<!-- :tableData="data"--> |
|
|
|
|
<!-- :loading="loading"--> |
|
|
|
|
<!-- @inputTxt="inputsc"--> |
|
|
|
|
<!-- @timeCheck="timesc"--> |
|
|
|
|
<!-- @btnCheck="btnsc"--> |
|
|
|
|
<!-- @selectCheck="selectsc"--> |
|
|
|
|
<!-- @selection="selectionsc"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <template #default="slotProps">--> |
|
|
|
|
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>--> |
|
|
|
|
<!-- <el-text--> |
|
|
|
|
<!-- size="small"--> |
|
|
|
|
<!-- v-if="--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatus !== '3'--> |
|
|
|
|
<!-- "--> |
|
|
|
|
<!-- @click="handleEdit(slotProps.scope)"--> |
|
|
|
|
<!-- >编 辑</el-text--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <!– <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>–>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </tablecmt>--> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="配送中" name="third"> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text> |
|
|
|
|
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> |
|
|
|
|
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.deliveryStatusName !== '已完成' || |
|
|
|
|
slotProps.scope.row.deliveryStatus !== '3' |
|
|
|
|
" |
|
|
|
|
@click="handleEdit(slotProps.scope)" |
|
|
|
|
>编 辑</el-text |
|
|
|
|
> |
|
|
|
|
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
<!-- <tablecmt--> |
|
|
|
|
<!-- :columnList="columnList"--> |
|
|
|
|
<!-- :tableData="data"--> |
|
|
|
|
<!-- :loading="loading"--> |
|
|
|
|
<!-- @inputTxt="inputsc"--> |
|
|
|
|
<!-- @timeCheck="timesc"--> |
|
|
|
|
<!-- @btnCheck="btnsc"--> |
|
|
|
|
<!-- @selectCheck="selectsc"--> |
|
|
|
|
<!-- @selection="selectionsc"--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <template #default="slotProps">--> |
|
|
|
|
<!-- <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>--> |
|
|
|
|
<!-- <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>--> |
|
|
|
|
<!-- <el-text--> |
|
|
|
|
<!-- size="small"--> |
|
|
|
|
<!-- v-if="--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatusName !== '已完成' ||--> |
|
|
|
|
<!-- slotProps.scope.row.deliveryStatus !== '3'--> |
|
|
|
|
<!-- "--> |
|
|
|
|
<!-- @click="handleEdit(slotProps.scope)"--> |
|
|
|
|
<!-- >编 辑</el-text--> |
|
|
|
|
<!-- >--> |
|
|
|
|
<!-- <!– <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>–>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </tablecmt>--> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="已完成" name="fourth"> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text> |
|
|
|
|
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> |
|
|
|
|
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if=" |
|
|
|
|
|
|
|
|
|
</el-tab-pane> |
|
|
|
|
</el-tabs> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
|
:tableData="data" |
|
|
|
|
:loading="loading" |
|
|
|
|
@inputTxt="inputsc" |
|
|
|
|
@timeCheck="timesc" |
|
|
|
|
@btnCheck="btnsc" |
|
|
|
|
@selectCheck="selectsc" |
|
|
|
|
@selection="selectionsc" |
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text> |
|
|
|
|
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> |
|
|
|
|
<el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text> |
|
|
|
|
<el-text |
|
|
|
|
size="small" |
|
|
|
|
v-if=" |
|
|
|
|
slotProps.scope.row.deliveryStatusName !== '已完成' || |
|
|
|
|
slotProps.scope.row.deliveryStatus !== '3' |
|
|
|
|
" |
|
|
|
|
@click="handleEdit(slotProps.scope)" |
|
|
|
|
>编 辑</el-text |
|
|
|
|
> |
|
|
|
|
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
@click="handleEdit(slotProps.scope)" |
|
|
|
|
>编 辑</el-text |
|
|
|
|
> |
|
|
|
|
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>--> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 列表模块 --> |
|
|
|
@ -269,6 +275,7 @@
|
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
<!-- </el-table>--> |
|
|
|
|
</el-row> |
|
|
|
|
</div> |
|
|
|
|
<el-row class='el-fy'> |
|
|
|
|
<div class="avue-crud__pagination flex-c-sb" style="width: 100%"> |
|
|
|
|
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div> |
|
|
|
@ -1335,6 +1342,7 @@ export default {
|
|
|
|
|
} |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.data = data.records; |
|
|
|
|
// data.records |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
@ -1361,6 +1369,7 @@ export default {
|
|
|
|
|
.avue-crud { |
|
|
|
|
:deep(.el-dialog) { |
|
|
|
|
width: fit-content; |
|
|
|
|
justify-content: space-between; |
|
|
|
|
} |
|
|
|
|
:deep(.el-row){ |
|
|
|
|
flex-direction: column; |
|
|
|
@ -1455,9 +1464,15 @@ export default {
|
|
|
|
|
flex-direction: column; |
|
|
|
|
} |
|
|
|
|
.el-fy { |
|
|
|
|
flex: 1; |
|
|
|
|
height: 30px; |
|
|
|
|
display: flex; |
|
|
|
|
align-items: flex-end; |
|
|
|
|
justify-content: flex-end; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
:deep(.maboxhi){ |
|
|
|
|
height:100%!important; |
|
|
|
|
} |
|
|
|
|
.el_tabBK{ |
|
|
|
|
height:70%; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|