java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复部分bug

dev-xx
qb 7 months ago
parent
649734255f
commit
681a3e6126
3 changed files with 95 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 138
      src/views/basicdata/vehicle/basicdataVehicle.vue
  2. 8
      src/views/distribution/artery/directGoMarketDetails.vue
  3. 23
      src/views/distribution/artery/truckLoadingDetails.vue

138
src/views/basicdata/vehicle/basicdataVehicle.vue
Unescape View File

@ -283,13 +283,12 @@ onMounted(() => {
});
/** 请求页面数据 */
const onLoad = debounce(async (page?: any, params = {}) => {
const onLoad = debounce(async () => {
try {
details.loadingObj.list = true;
let _page = details.page;
if (page) _page = page;
// 获取暂存单列表
const res = await getPage({ ..._page, ...details.query, ...params });
const res = await getPage({ ..._page, ...details.query });
console.log('res :>> ', res);
const { code, data } = res.data;
if (code !== 200) return;
@ -299,6 +298,7 @@ const onLoad = debounce(async (page?: any, params = {}) => {
details.page.total = data.total;
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.list = false;
}
@ -324,58 +324,66 @@ const handleData = (key, res) => {
// 获取字典数据
const initData = async () => {
await Promise.all([
// 车辆来源
getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
// 是否车头
getDictionaryBiz('yes_no').then(res => handleData('是否车头', res)),
// 挂车类型
getDictionaryBiz('basic_trailer_type').then(res => handleData('挂车类型', res)),
// 车辆类型
getDictionaryBiz('basic_vehicle_model').then(res => handleData('车辆类型', res)),
// 车厢类型
getDictionaryBiz('basic_car_type').then(res => handleData('车厢类型', res)),
// 付款方式
getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => handleData('付款方式', res)),
// 车牌颜色
getDictionaryBiz('basic_plate_color').then(res => handleData('车牌颜色', res)),
// 车身颜色
getDictionaryBiz('basic_vehicle_color').then(res => handleData('车身颜色', res)),
// 能源类型
getDictionaryBiz('basic_energy_type').then(res => handleData('能源类型', res)),
// 车牌类型
getDictionaryBiz('basic_plate_type').then(res => handleData('车牌类型', res)),
// 承运商
getDictionary().then(res => {
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < details.columnList.length; i++) {
const value = details.columnList[i];
if (value.label === '承运商')
return (value.checkarr =
getObjType(data) === 'array'
? data.map(val => {
val.label = val.carrierName;
val.value = val.id;
return val;
})
: []);
}
}),
onLoad(),
]);
await nextTick();
handleTranslationDataSeclect(details.data, details.columnList);
console.log('details.columnList :>> ', details.columnList);
try {
details.loadingObj.pageLoading = true;
await Promise.all([
// 车辆来源
getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
// 是否车头
getDictionaryBiz('yes_no').then(res => handleData('是否车头', res)),
// 挂车类型
getDictionaryBiz('basic_trailer_type').then(res => handleData('挂车类型', res)),
// 车辆类型
getDictionaryBiz('basic_vehicle_model').then(res => handleData('车辆类型', res)),
// 车厢类型
getDictionaryBiz('basic_car_type').then(res => handleData('车厢类型', res)),
// 付款方式
getDictionaryBiz('basicdata_vehicle_paymentmethod').then(res => handleData('付款方式', res)),
// 车牌颜色
getDictionaryBiz('basic_plate_color').then(res => handleData('车牌颜色', res)),
// 车身颜色
getDictionaryBiz('basic_vehicle_color').then(res => handleData('车身颜色', res)),
// 能源类型
getDictionaryBiz('basic_energy_type').then(res => handleData('能源类型', res)),
// 车牌类型
getDictionaryBiz('basic_plate_type').then(res => handleData('车牌类型', res)),
// 承运商
getDictionary().then(res => {
const { code, data } = res.data;
if (code !== 200) return;
for (let i = 0; i < details.columnList.length; i++) {
const value = details.columnList[i];
if (value.label === '承运商')
return (value.checkarr =
getObjType(data) === 'array'
? data.map(val => {
val.label = val.carrierName;
val.value = val.id;
return val;
})
: []);
}
}),
onLoad(false),
]);
await nextTick();
handleTranslationDataSeclect(details.data, details.columnList);
console.log('details.columnList :>> ', details.columnList);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
};
initData();
/** 搜索 */
const searchChange = () => {
onLoad(details.page);
onLoad();
};
/** 清空表单 */
@ -384,7 +392,7 @@ const searchReset = () => {
details.stockupDate = [];
details.page.current = 1;
handleClearTableQuery(details.columnList);
onLoad(details.page);
onLoad();
};
/** 展开列表控件 */
@ -402,7 +410,7 @@ const searchHide = () => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
handleInputQuery(index, row, details.query);
onLoad(details.page);
onLoad();
};
/** 表格表头时间选择 */
@ -415,14 +423,14 @@ const timesc = (index, row) => {
if (!index) {
delete details.query[row.prop];
}
onLoad(details.page);
onLoad();
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
handleSelectQuery(index, row, details.query);
onLoad(details.page);
onLoad();
};
/** 表格表头复选框选择 */
@ -433,7 +441,7 @@ const selectionChange = (list: any) => {
/** 每页数量改变执行的回调 */
const sizeChange = (size: number) => {
details.page.size = size;
onLoad(details.page);
onLoad();
};
/** 页码改变执行的回调 */
@ -502,7 +510,7 @@ const handleDelete = (isBatch, row: any = {}) => {
const { code, msg } = res.data;
if (code !== 200) return ElMessage.error(msg);
ElMessage.success('删除成功');
onLoad(details.page);
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
@ -516,19 +524,19 @@ const handleDelete = (isBatch, row: any = {}) => {
const handleExport = () => {
console.log('instance :>> ', instance);
if (!details.selectionList.length) {
ElMessage({
message: '请勾选要导出的数据',
type: 'warning',
});
return;
}
// if (!details.selectionList.length) {
// ElMessage({
// message: '请勾选要导出的数据',
// type: 'warning',
// });
// return;
// }
let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?Blade-Auth=${getToken()}`;
let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle`;
let submitData = {
ids: '',
};
submitData.ids = details.selectionList.map(item => item.id).join(',');
submitData.ids = details.selectionList.map(item => item.id).join(',') || '';
ElMessageBox.confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -539,7 +547,7 @@ const handleExport = () => {
const res = await exportBlob(downloadUrl, submitData);
const { status, data } = res;
if (status !== 200) retrun;
if (status !== 200) return;
downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
} catch (error) {

8
src/views/distribution/artery/directGoMarketDetails.vue
Unescape View File

@ -266,7 +266,12 @@
<div class="flex-c-sb mt20">
<div></div>
<div>
<el-button icon="CircleClose"> 关 闭 </el-button>
<!-- 关闭 -->
<el-button icon="CircleClose" @click="details.popUpShow.directGoMarketVisited = false">
关 闭
</el-button>
<!-- 提交 -->
<el-button type="primary" icon="Position" @click="handleZeroSubmit"> 提 交 </el-button>
</div>
</div>
@ -567,6 +572,7 @@ const details = reactive<any>({
{ label: '未签收', value: 0 },
{ label: '部分签收', value: 10 },
{ label: '已签收', value: 20 },
{ label: '已复核', value: 30 },
],
// 字典结束

23
src/views/distribution/artery/truckLoadingDetails.vue
Unescape View File

@ -827,14 +827,17 @@ const handleBatchUnLoad = async () => {
// 包件
if (Number(iterator.type) === 1) {
if (Number(iterator.scanStatus) === 1) {
_orderArr.push({ orderPackageCode: iterator.scanCode, carsLoadScanId: iterator.id });
_orderArr.push({
orderPackageCode: iterator.scanCode,
carsLoadScanId: iterator.carsLoadScanId,
});
}
} else {
_zeroArr.push({
waybillNo: iterator.waybillNo,
enterNum: iterator.num,
orderCode: iterator.orderCode,
carsLoadScanId: iterator.id,
carsLoadScanId: iterator.carsLoadScanId,
});
}
@ -952,14 +955,14 @@ const handleBatchUnLoad = async () => {
if (Number(iterator.type) === 1) {
_orderArr.push({
orderPackageCode: iterator.scanCode,
carsLoadScanId: iterator.id,
carsLoadScanId: iterator.carsLoadScanId,
});
} else {
_zeroArr.push({
waybillNo: iterator.waybillNo,
enterNum: iterator.num,
orderCode: iterator.orderCode,
carsLoadScanId: iterator.id,
carsLoadScanId: iterator.carsLoadScanId,
});
}
}
@ -1041,7 +1044,9 @@ const handleOrderUnLoad = async ({ row }) => {
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode, carsLoadScanId: row.id }],
unloadPackageList: [
{ orderPackageCode: row.scanCode, carsLoadScanId: row.carsLoadScanId },
],
unloadZeroList: [],
incomingType: '7',
};
@ -1072,7 +1077,9 @@ const handleOrderUnLoad = async ({ row }) => {
const submitData = {
loadId: details.pageInfo.loadId,
unloadPackageList: [{ orderPackageCode: row.scanCode, carsLoadScanId: row.id }],
unloadPackageList: [
{ orderPackageCode: row.scanCode, carsLoadScanId: row.carsLoadScanId },
],
unloadZeroList: [],
incomingType: '7',
};
@ -1159,7 +1166,7 @@ const handleZeroUnLoadSubmit = async () => {
waybillNo: details.zeroItem.waybillNo,
enterNum: details.zeroItem.enterNum,
orderCode: details.zeroItem.orderCode,
carsLoadScanId: details.zeroItem.id,
carsLoadScanId: details.zeroItem.carsLoadScanId,
},
],
incomingType: '7',
@ -1173,7 +1180,7 @@ const handleZeroUnLoadSubmit = async () => {
enterNum: details.zeroItem.num,
orderCode: details.zeroItem.orderCode,
incomingType: '7',
carsLoadScanId: details.zeroItem.id,
carsLoadScanId: details.zeroItem.carsLoadScanId,
};
res = await postTransferUnloadZero(submitData);

Write Preview
Loading…
Cancel
Save