|
|
|
|
@ -272,7 +272,7 @@
|
|
|
|
|
v-model="multifunctional" |
|
|
|
|
placeholder="请输入要搜索的值,多条件用英文逗号拼接" |
|
|
|
|
clearable |
|
|
|
|
@clear='soclear' |
|
|
|
|
@clear="soclear" |
|
|
|
|
/> |
|
|
|
|
<el-button type="primary" @click="SearchFu" |
|
|
|
|
><el-icon><Plus /></el-icon>搜索</el-button |
|
|
|
|
@ -320,9 +320,15 @@
|
|
|
|
|
align="center" |
|
|
|
|
> |
|
|
|
|
<template #default="props"> |
|
|
|
|
<span :id="props.row[item.prop]" :class="(props.row[item.prop] == multifunctional && props.row[item.prop]) ? 'static-class' : ''">{{ |
|
|
|
|
props.row[item.prop] ? props.row[item.prop] : '/' |
|
|
|
|
}}</span> |
|
|
|
|
<span |
|
|
|
|
:id="props.row[item.prop]" |
|
|
|
|
:class=" |
|
|
|
|
props.row[item.prop] == multifunctional && props.row[item.prop] |
|
|
|
|
? 'static-class' |
|
|
|
|
: '' |
|
|
|
|
" |
|
|
|
|
>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
@ -799,6 +805,7 @@ import {
|
|
|
|
|
getDeliveryList, |
|
|
|
|
$_getPackageListByDeliveryIdAndOrderId, |
|
|
|
|
updateDeliveryList, |
|
|
|
|
$_judgmentOrderRemove, |
|
|
|
|
} from '@/api/distribution/distributionDeliveryList'; //数据回显 |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; //外协来源 |
|
|
|
|
import type { FormProps } from 'element-plus'; |
|
|
|
|
@ -1140,7 +1147,7 @@ const menuData = ref([
|
|
|
|
|
label: '服务号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1151,7 +1158,7 @@ const menuData = ref([
|
|
|
|
|
label: '运单号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '265', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1162,18 +1169,65 @@ const menuData = ref([
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'mallName', |
|
|
|
|
label: '商场名称', |
|
|
|
|
prop: 'consigneeUnit', |
|
|
|
|
label: '运单收货单位', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '280', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'totalNumber', |
|
|
|
|
label: '订单总件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '80', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
statistics: true, //开启统计 |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '在库件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '80', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
statistics: true, //开启统计 |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'consigneePerson', |
|
|
|
|
label: '运单收货人', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeMobile', |
|
|
|
|
label: '运单收货人电话', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1195,7 +1249,7 @@ const menuData = ref([
|
|
|
|
|
label: '商场编号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1206,7 +1260,7 @@ const menuData = ref([
|
|
|
|
|
label: '经销商编码', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1239,7 +1293,7 @@ const menuData = ref([
|
|
|
|
|
label: '订单状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1250,7 +1304,7 @@ const menuData = ref([
|
|
|
|
|
label: '冻结状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1261,7 +1315,7 @@ const menuData = ref([
|
|
|
|
|
label: '预约状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1272,7 +1326,7 @@ const menuData = ref([
|
|
|
|
|
label: '货物名称', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '80', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1283,7 +1337,7 @@ const menuData = ref([
|
|
|
|
|
label: '仓库', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1294,7 +1348,7 @@ const menuData = ref([
|
|
|
|
|
label: '入库时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1305,42 +1359,19 @@ const menuData = ref([
|
|
|
|
|
label: '在库时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'totalNumber', |
|
|
|
|
label: '订单总件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
statistics: true, //开启统计 |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '在库件数', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '80', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
statistics: true, //开启统计 |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'completeSetName', |
|
|
|
|
label: '是否齐套', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '60', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1351,7 +1382,7 @@ const menuData = ref([
|
|
|
|
|
label: '品牌', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '60', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1362,40 +1393,19 @@ const menuData = ref([
|
|
|
|
|
label: '服务类型', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'consigneePerson', |
|
|
|
|
label: '运单收货人', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeMobile', |
|
|
|
|
label: '运单收货人电话', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '60', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeUnit', |
|
|
|
|
label: '运单收货单位', |
|
|
|
|
prop: 'mallName', |
|
|
|
|
label: '商场名称', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '260', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1406,7 +1416,7 @@ const menuData = ref([
|
|
|
|
|
label: '顾客名字', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '60', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1417,7 +1427,7 @@ const menuData = ref([
|
|
|
|
|
label: '顾客电话', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1439,7 +1449,7 @@ const menuData = ref([
|
|
|
|
|
label: '库位信息', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '160', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1450,7 +1460,7 @@ const menuData = ref([
|
|
|
|
|
label: '托盘信息', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '280', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -1475,59 +1485,59 @@ const wrap = ref([
|
|
|
|
|
label: '运单号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'warehouse', |
|
|
|
|
label: '仓库', |
|
|
|
|
prop: 'orderPackageCode', |
|
|
|
|
label: '包条码', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '车次号', |
|
|
|
|
prop: 'orderPackageStockupStatusName', |
|
|
|
|
label: '备货状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'firsts', |
|
|
|
|
label: '一级品', |
|
|
|
|
prop: 'orderPackageReservationStatusName', |
|
|
|
|
label: '预约状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'second', |
|
|
|
|
label: '二级品', |
|
|
|
|
prop: 'goodsAllocation', |
|
|
|
|
label: '货位信息', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'thirdProduct', |
|
|
|
|
label: '三级品', |
|
|
|
|
prop: 'pallet', |
|
|
|
|
label: '所在托盘', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
@ -1537,85 +1547,89 @@ const wrap = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'materialName', |
|
|
|
|
label: '物料', |
|
|
|
|
prop: 'warehouse', |
|
|
|
|
label: '仓库', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'orderPackageFreezeStatusName', |
|
|
|
|
label: '冻结状态', |
|
|
|
|
prop: 'firsts', |
|
|
|
|
label: '一级品', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderPackageStockupStatusName', |
|
|
|
|
label: '备货状态', |
|
|
|
|
prop: 'second', |
|
|
|
|
label: '二级品', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderPackageReservationStatusName', |
|
|
|
|
label: '预约状态', |
|
|
|
|
prop: 'thirdProduct', |
|
|
|
|
label: '三级品', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'orderPackageCode', |
|
|
|
|
label: '包条码', |
|
|
|
|
prop: 'materialName', |
|
|
|
|
label: '物料', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'goodsAllocation', |
|
|
|
|
label: '货位信息', |
|
|
|
|
prop: 'orderPackageFreezeStatusName', |
|
|
|
|
label: '冻结状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '100', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'pallet', |
|
|
|
|
label: '所在托盘', |
|
|
|
|
prop: 'quantity', |
|
|
|
|
label: '数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '40', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'quantity', |
|
|
|
|
label: '数量', |
|
|
|
|
prop: 'trainNumber', |
|
|
|
|
label: '客户车次号', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
@ -1882,10 +1896,9 @@ function removeDuplicates(arr) {
|
|
|
|
|
const ids = arr.map(obj => obj.id); |
|
|
|
|
return arr.filter((item, index) => ids.indexOf(item.id) === index); |
|
|
|
|
} |
|
|
|
|
const soclear=()=>{ |
|
|
|
|
|
|
|
|
|
SearchFu() |
|
|
|
|
} |
|
|
|
|
const soclear = () => { |
|
|
|
|
SearchFu(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// function scrollToElementWithPartialId(partialId) { |
|
|
|
|
// // 首先清空之前所有元素的颜色样式 |
|
|
|
|
@ -1909,9 +1922,9 @@ const soclear=()=>{
|
|
|
|
|
function scrollToElementWithinTableRow(partialIdString) { |
|
|
|
|
// 首先清空之前所有元素的颜色样式 |
|
|
|
|
const tableRows = document.querySelectorAll('tr'); |
|
|
|
|
tableRows.forEach(function(row) { |
|
|
|
|
tableRows.forEach(function (row) { |
|
|
|
|
const cells = row.querySelectorAll('[id]'); |
|
|
|
|
cells.forEach(function(cell) { |
|
|
|
|
cells.forEach(function (cell) { |
|
|
|
|
cell.style.backgroundColor = ''; // 移除背景颜色 |
|
|
|
|
cell.style.color = ''; // 移除文字颜色 |
|
|
|
|
}); |
|
|
|
|
@ -1926,7 +1939,7 @@ function scrollToElementWithinTableRow(partialIdString) {
|
|
|
|
|
if (partialIds.every(partialId => row.querySelector(`[id*="${partialId}"]`))) { |
|
|
|
|
// 如果匹配，设置背景颜色和文字颜色 |
|
|
|
|
const cells = row.querySelectorAll('[id]'); |
|
|
|
|
cells.forEach(function(cell) { |
|
|
|
|
cells.forEach(function (cell) { |
|
|
|
|
cell.style.backgroundColor = '#ff0000'; // 设置背景颜色为红色 |
|
|
|
|
cell.style.color = '#fff'; // 设置文字颜色为白色 |
|
|
|
|
}); |
|
|
|
|
@ -1939,20 +1952,20 @@ function scrollToElementWithinTableRow(partialIdString) {
|
|
|
|
|
} |
|
|
|
|
// 编辑多功能搜索 |
|
|
|
|
const SearchFu = () => { |
|
|
|
|
if(multifunctional.value){ |
|
|
|
|
scrollToElementWithinTableRow(multifunctional.value) |
|
|
|
|
}else{ |
|
|
|
|
document.querySelectorAll('[id]').forEach(function(el) { |
|
|
|
|
if (multifunctional.value) { |
|
|
|
|
scrollToElementWithinTableRow(multifunctional.value); |
|
|
|
|
} else { |
|
|
|
|
document.querySelectorAll('[id]').forEach(function (el) { |
|
|
|
|
el.style.backgroundColor = ''; // 移除背景颜色 |
|
|
|
|
el.style.color =''; // 移除文字颜色 |
|
|
|
|
el.style.color = ''; // 移除文字颜色 |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return |
|
|
|
|
if(multifunctional.value){ |
|
|
|
|
document.getElementById(multifunctional.value).scrollIntoView() |
|
|
|
|
return; |
|
|
|
|
if (multifunctional.value) { |
|
|
|
|
document.getElementById(multifunctional.value).scrollIntoView(); |
|
|
|
|
} |
|
|
|
|
return |
|
|
|
|
return; |
|
|
|
|
console.log(soInpuState.value, '当前搜索状态'); |
|
|
|
|
if (!multifunctional.value && !dataInfoTemp.value.length) { |
|
|
|
|
soInpuState.value = false; //重置搜索状态 |
|
|
|
|
@ -1991,10 +2004,9 @@ return
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
console.log(temp, '搜索结果'); |
|
|
|
|
console.log(dataInfoTemp.value,'临时存储的值'); |
|
|
|
|
console.log(dataInfoTemp.value, '临时存储的值'); |
|
|
|
|
dataInfo.value = temp; //如果搜索到了值才赋值 |
|
|
|
|
soInpuState.value = false; //表示当前已经搜索过了 |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// console.log(dataInfo.value, '搜索结果'); |
|
|
|
|
@ -2002,6 +2014,44 @@ return
|
|
|
|
|
|
|
|
|
|
// 删除触发事件 |
|
|
|
|
const DeleteEvent = val => { |
|
|
|
|
if (route.query.id) { |
|
|
|
|
// 判断是否为编辑 |
|
|
|
|
let data = { |
|
|
|
|
deliveryId: route.query.id, |
|
|
|
|
orderId: val.id, |
|
|
|
|
}; |
|
|
|
|
console.log(data, '删除处理值'); |
|
|
|
|
$_judgmentOrderRemove(data).then(res => { |
|
|
|
|
console.log(res, '删除返回值'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
if (!res.data.data) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '不能移除当前订单,存在装车数据,联系司机滞留', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
dataInfoID.value = val; //存储一份临时数据 |
|
|
|
|
if (dataInfoTemp.value.length) { |
|
|
|
|
//删除拷贝的数据里面如果执行这个表示当前已经是搜索过了，在执行搜索里面的值 |
|
|
|
|
const index = dataInfoTemp.value.findIndex(item => item.id === val.id); |
|
|
|
|
if (index !== -1) { |
|
|
|
|
dataInfoTemp.value.splice(index, 1); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
console.log(dataInfoID.value, '当前删除的数据'); |
|
|
|
|
// 接收点击删除当前行数据 |
|
|
|
|
const index = dataInfo.value.findIndex(item => item.id === val.id); |
|
|
|
|
if (index !== -1) { |
|
|
|
|
dataInfo.value.splice(index, 1); |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '移除成功', |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
dataInfoID.value = val; //存储一份临时数据 |
|
|
|
|
if (dataInfoTemp.value.length) { |
|
|
|
|
//删除拷贝的数据里面如果执行这个表示当前已经是搜索过了，在执行搜索里面的值 |
|
|
|
|
@ -2016,6 +2066,11 @@ const DeleteEvent = val => {
|
|
|
|
|
const index = dataInfo.value.findIndex(item => item.id === val.id); |
|
|
|
|
if (index !== -1) { |
|
|
|
|
dataInfo.value.splice(index, 1); |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '移除成功', |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
// 编辑触发事件 |
|
|
|
|
@ -3117,5 +3172,4 @@ const SubmitCommercial = () => {
|
|
|
|
|
background-color: #ff0000; |
|
|
|
|
color: #fff; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
</style> |
|
|
|
|
|
