Browse Source

修复部分bug

dev-xx
qb 9 months ago
parent
commit
a67d06616c
  1. 13
      src/api/distribution/AddVehicleStowage.js
  2. 2
      src/components/tablecmt/tablecmt.vue
  3. 2
      src/option/waybill/orderPackageListDetails.js
  4. 6
      src/views/distribution/artery/AddVehicleStowage.vue
  5. 4
      src/views/distribution/artery/VehicleStowage.vue
  6. 12
      src/views/distribution/artery/truckLoadingDetails.vue
  7. 18
      src/views/waybill/orderPackageList.vue

13
src/api/distribution/AddVehicleStowage.js

@ -88,6 +88,17 @@ export const postSelectEditDetailByLoadId = data => {
});
};
/**
* 查询编辑配载计划详情 -- 节点费用
*/
export const postEditNodeInfo = data => {
return request({
url: '/api/logpm-trunkline/carsLoad/editNodeInfo',
method: 'post',
data,
});
};
/**
* 查询已添加在调度池的订单
*/
@ -153,4 +164,4 @@ export const postUpdateLoadFeeByNodeId = data => {
data,
});
};
//
//

2
src/components/tablecmt/tablecmt.vue

@ -26,6 +26,7 @@
:sortable="column.sortable"
:selectable="isselectfun"
v-show="column.head"
resizable
>
<!-- <template #header>
<el-text class="mx-1">{{ column.label }}</el-text>
@ -38,6 +39,7 @@
v-if="column.type != 0"
flexible
show-overflow-tooltip
:resizable="false"
>
<template #header>
<el-text

2
src/option/waybill/orderPackageListDetails.js

@ -460,7 +460,7 @@ export const flowNodeColumnList = [
label: '描述',
type: 1,
values: '',
width: '250',
width: '600',
checkarr: [],
fixed: false,
sortable: true,

6
src/views/distribution/artery/AddVehicleStowage.vue

@ -670,6 +670,7 @@ import {
postFindDriverListByName,
postSaveNew,
postSelectEditDetailByLoadId,
postEditNodeInfo,
postFindUseOrderList,
postRemoveCarsOrderByCarsOrderId,
postUpdatePlanNumByCarsOrderId,
@ -1041,7 +1042,10 @@ const onLoad = async () => {
}
//
else {
const res = await postSelectEditDetailByLoadId({ loadId: details.loadId });
const res =
details.pageType === 3
? await postEditNodeInfo({ loadId: details.loadId })
: await postSelectEditDetailByLoadId({ loadId: details.loadId });
const { code, data } = res.data;
if (code !== 200) return;

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

@ -233,9 +233,7 @@
<el-text
v-if="
permissionObj.VehicleStowage_zeroAdditionalRecording &&
Mydata.id === slotProps.scope.row.nowWarehouseId &&
Number(slotProps.scope.row.loadStatus) === 0 &&
Number(slotProps.scope.row.loadingType) === 1
Number(slotProps.scope.row.loadStatus) !== 80
"
@click="handleShowzeroAdditionalRecording(slotProps.scope)"
>

12
src/views/distribution/artery/truckLoadingDetails.vue

@ -1261,16 +1261,14 @@ const handleBatchBarcode = async () => {
try {
details.loadingObj.pageLoading = true;
let qr = {
orderPackageCodes: _arr.map(val => val.scanCode).join(','),
};
details.html = '';
const _promiseArr = [];
_arr.length > 0 &&
_promiseArr.push(
getShowAdvancePackgeCode(qr).then(res => {
getShowAdvancePackgeCode({
orderPackageCodes: _arr.map(val => val.scanCode).join(','),
}).then(res => {
const { code, data } = res.data;
if (code !== 200) return;
@ -1279,7 +1277,9 @@ const handleBatchBarcode = async () => {
);
_zeroArr.length > 0 &&
_promiseArr.push(
postShowOrderCode(qr).then(res => {
postShowOrderCode({
orderCodes: _zeroArr.map(val => val.orderCode).join(','),
}).then(res => {
const { code, data } = res.data;
if (code !== 200) return;

18
src/views/waybill/orderPackageList.vue

@ -361,15 +361,15 @@ const details = reactive<any>({
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
// {
// text: '',
// value: () => {
// const end = new Date();
// const start = new Date();
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
// return [start, end];
// },
// },
],
/** 时间选择器数据 */
stockupDate: [],

Loading…
Cancel
Save