zhangjinbo/delivery_manage_front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
zhangjinbo
2026-02-06 10:57:56 +08:00
parent 08a04a2636
commit c70512cd04
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/order/historyDelivery/index.vue
View File

@@ -49,7 +49,7 @@
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="配送单号" align="center" prop="orderNo" width="200" /> <el-table-column label="配送单号" align="center" prop="orderNo" width="200" />
<el-table-column label="出库单据号" align="center" prop="billNoCk" width="150" > <el-table-column label="出库单据号" align="center" prop="billNoCk" width="200" >
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span> <span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span>
<el-tag type="danger" v-else>手动创建</el-tag> <el-tag type="danger" v-else>手动创建</el-tag>

7
src/views/order/outWarehouse/index.vue
View File

@@ -26,7 +26,7 @@
</el-form> </el-form>
<el-table v-loading="loading" highlight-current-row :data="billList" @row-dblclick="billClick" > <el-table v-loading="loading" highlight-current-row :data="billList" @row-dblclick="billClick" >
<el-table-column label="单据号" align="center" prop="billNo" width="150" /> <el-table-column label="单据号" align="center" prop="billNo" width="200" />
<el-table-column label="库存状态" align="center" > <el-table-column label="库存状态" align="center" >
<template #default="scope"> <template #default="scope">
<span>{{ isChukuFun(scope.row.isDelivery) }}</span> <span>{{ isChukuFun(scope.row.isDelivery) }}</span>
@@ -395,8 +395,8 @@
for(let i=0;i<selection.length;i++){ for(let i=0;i<selection.length;i++){
delieryData.value.deliveryTon += Number(selection[i].weightKg) delieryData.value.deliveryTon += Number(selection[i].weightKg)
delieryData.value.goodsSize += Number(selection[i].volumeM3) delieryData.value.goodsSize += Number(selection[i].volumeM3)
selection[i].rkInfoId = selection[i].id // selection[i].rkInfoId = selection[i].id
selection[i].rkRecordId = selection[i].id
} }
delieryData.value.items = selection delieryData.value.items = selection
// selection.forEach(element => { // selection.forEach(element => {
@@ -496,6 +496,7 @@ function reset() {
addDelivery(delieryData.value).then(response => { addDelivery(delieryData.value).then(response => {
proxy.$modal.msgSuccess("操作成功") proxy.$modal.msgSuccess("操作成功")
dialogPicDetailVisible.value = false dialogPicDetailVisible.value = false
stockList.value = []
getList() getList()
}) })
} }

6
src/views/order/waitDelivery/index.vue
View File

@@ -87,9 +87,9 @@
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="配送单号" align="center" prop="orderNo" width="200"/> <el-table-column label="配送单号" align="center" prop="orderNo" width="200"/>
<el-table-column label="出库单据号" align="center" prop="billNoCk" width="150"> <el-table-column label="出库单据号" align="center" prop="billNoCk" width="200">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.billNo">{{ scope.row.billNo }}</span> <span v-if="scope.row.billNoCk">{{ scope.row.billNoCk }}</span>
<el-tag type="danger" v-else>手动创建</el-tag> <el-tag type="danger" v-else>手动创建</el-tag>
</template> </template>
<!-- <template #default="scope"> <!-- <template #default="scope">
@@ -656,7 +656,7 @@ function handleDetail(row) {
} }
function statusFun(status){ function statusFun(status){
if(status==1){ if(status==0 || status==1){
return "待配送" return "待配送"
}else if(status==2){ }else if(status==2){
return "配送中" return "配送中"