Browse Source

修复签收详情和新增配载详情字段

dev-xx
qb 4 months ago
parent
commit
6e7bef1170
  1. 38
      src/option/distribution/addVehicleStowage.js
  2. 1
      src/views/distribution/artery/VehicleArrivalManagement.vue
  3. 1
      src/views/distribution/artery/VehicleStowage.vue
  4. 2
      src/views/distribution/artery/VehicleStowageDetails.vue
  5. 2
      src/views/distribution/signfor/distributionSignfor.vue
  6. 3
      src/views/distribution/signfor/distributionSignforedt.vue
  7. 2
      src/views/distribution/signfor/distributionSignfortreat.vue
  8. 2
      src/views/mail/signfor/list.vue

38
src/option/distribution/addVehicleStowage.js

@ -667,17 +667,6 @@ export const detailsColumnList = [
fixed: true,
isshowSummary: true,
},
// {
// prop: 'carsNo',
// label: '配载车次号',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: true,
// sortable: true,
// isshowSummary: false,
// },
{
prop: 'waybillNo',
label: '运单号',
@ -701,15 +690,15 @@ export const detailsColumnList = [
sortable: true,
},
{
prop: 'createTime',
label: '开单日期',
prop: 'carsNo',
label: '配载车次号',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
isshowSummary: false,
},
{
prop: 'destination',
@ -961,16 +950,6 @@ export const detailsColumnList = [
// isshowSummary: true,
sortable: true,
},
{
prop: 'createTime',
label: '开单时间',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'weight',
label: '重量(KG)',
@ -1112,6 +1091,17 @@ export const detailsColumnList = [
isColumnMerge: true,
sortable: true,
},
{
prop: 'createTime',
label: '开单日期',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'checkStatusName',
label: '审核状态',

1
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -1164,6 +1164,7 @@ const handleGoWaybill = ({ row }) => {
path: '/distribution/artery/VehicleStowageDetails',
query: {
loadId: row.id,
carsNo: row.carsNo,
name: `${row.carsNo} - 配载详情`,
},
});

1
src/views/distribution/artery/VehicleStowage.vue

@ -1136,6 +1136,7 @@ const handleGoWaybill = ({ row }) => {
path: '/distribution/artery/VehicleStowageDetails',
query: {
loadId: row.id,
carsNo: row.carsNo,
name: `${row.carsNo} - 配载详情`,
},
});

2
src/views/distribution/artery/VehicleStowageDetails.vue

@ -715,6 +715,7 @@ const initOriginWarehouseOrder = async () => {
details.oldData.push(
...val.carsLoadOrderInfoList.map((item, index) => {
item = { ...val, ...item };
item.carsNo = $route.query.carsNo;
delete item.carsLoadOrderInfoList;
delete item.carsLoadOrderInfoListPlan;
return item;
@ -724,6 +725,7 @@ const initOriginWarehouseOrder = async () => {
details.planData.push(
...val.carsLoadOrderInfoListPlan.map((item, index) => {
item = { ...val, ...item };
item.carsNo = $route.query.carsNo;
delete item.carsLoadOrderInfoList;
delete item.carsLoadOrderInfoListPlan;
return item;

2
src/views/distribution/signfor/distributionSignfor.vue

@ -845,7 +845,7 @@ export default {
query: {
id: row.id,
reservationId: row.reservationId,
row: JSON.stringify(row),
// row: JSON.stringify(row),
name: '签收查看',
},
});

3
src/views/distribution/signfor/distributionSignforedt.vue

@ -1863,7 +1863,7 @@ const pageRow = ref({}); //页面参数
const onLoad = () => {
menuData.value = menuData1.value; //
data.value = InitializeTable.value; //
pageRow.value = JSON.parse(route.query.row);
// pageRow.value = JSON.parse(route.query.row);
};
console.log(route.query, 'route.query');
@ -2188,6 +2188,7 @@ getDetail(RouterId.value).then(res => {
// InitializeTable.value = res.data.data.orderInfo; //()
Tabs.value[0].data = res.data.data.orderInfo || []; //()
Tabs.value[0].renderData = res.data.data.orderInfo || [];
pageRow.value = res.data.data;
onLoad();
//
DoorstepPhoto.value = [];

2
src/views/distribution/signfor/distributionSignfortreat.vue

@ -2336,7 +2336,7 @@ export default {
id: row.id,
reservationId: row.reservationId,
name: '待签收查看',
row: JSON.stringify(row),
// row: JSON.stringify(row),
},
});
},

2
src/views/mail/signfor/list.vue

@ -782,7 +782,7 @@ export default {
query: {
id: row.id,
reservationId: row.reservationId,
row:JSON.stringify(row),
// row:JSON.stringify(row),
name: '签收查看',
},
});

Loading…
Cancel
Save