马远东 7 months ago
parent
commit
484973cf20
  1. 11
      src/api/distribution/addTripartiteTransfer.js
  2. 16
      src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue
  3. 16
      src/views/aftersales/aftersalesWorkOrderInfoTemp.vue
  4. 16
      src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
  5. 16
      src/views/aftersales/customerService.vue
  6. 16
      src/views/basic/pda/basicPdatt.vue
  7. 1766
      src/views/basicdata/vehicle/basicdataVehicle.vue
  8. 1274
      src/views/basicdata/vehicle/basicdataVehicle1.vue
  9. 572
      src/views/basicdata/vehicle/basicdataVehicle2.vue
  10. 22
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  11. 16
      src/views/datadetail/ToolUpdate.vue
  12. 3
      src/views/distribution/artery/TripartiteTransferDetails.vue
  13. 6
      src/views/distribution/artery/addTripartiteTransfer.vue
  14. 16
      src/views/distribution/artery/directGoMarketDetails.vue
  15. 4
      src/views/distribution/artery/truckLoadingDetails.vue

11
src/api/distribution/addTripartiteTransfer.js

@ -87,3 +87,14 @@ export const postFindCarrierByName = data => {
data,
});
};
/**
* 通过名称查司机
*/
export const postFindDriverListByNameAndWarehouseId = data => {
return request({
url: '/api/logpm-trunkline/billlading/findDriverListByNameAndWarehouseId',
method: 'post',
data,
});
};

16
src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue

@ -917,13 +917,19 @@ const ImgSuccess = (response, uploadFile) => {
//
const beforeAvatarUpload = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

16
src/views/aftersales/aftersalesWorkOrderInfoTemp.vue

@ -892,13 +892,19 @@ const ButtonPermissions = computed(() => {
//
const beforeAvatarUpload = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

16
src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue

@ -1012,13 +1012,19 @@ const ImgSuccess = (response, uploadFile) => {
//
const beforeAvatarUpload = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

16
src/views/aftersales/customerService.vue

@ -216,13 +216,19 @@ const messagesendFn = () => {
console.log(Mydata.value, '参数');
};
const beforeAvatarUpload = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

16
src/views/basic/pda/basicPdatt.vue

@ -789,13 +789,19 @@ const ImgSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
};
//
const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

1766
src/views/basicdata/vehicle/basicdataVehicle.vue

File diff suppressed because it is too large Load Diff

1274
src/views/basicdata/vehicle/basicdataVehicle1.vue

File diff suppressed because it is too large Load Diff

572
src/views/basicdata/vehicle/basicdataVehicle2.vue

@ -1,572 +0,0 @@
<template>
<basic-container v-loading="details.loadingObj.pageLoading">
<div class="avue-crud">
<!-- 搜索模块 -->
<div v-h5uShow="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="header_search">
<template v-for="item in details.columnList" :key="item.prop">
<el-form-item v-if="item.isTitleSearch" :label="item.label">
<!-- 普通输入框 -->
<template v-if="item.type === 2">
<el-input
class="w100"
:placeholder="`请输入${item.label}`"
v-model="details.query[item.prop]"
clearable
></el-input>
</template>
<!-- 下拉框 -->
<template v-else-if="item.type === 3">
<el-select
v-model="details.query[item.prop.replace('Name', '')]"
:placeholder="`请选择${item.label}`"
class="w100"
clearable
filterable
:multiple="item.multiple || false"
@change="
val => {
!val && delete details.query[item.prop.replace('Name', '')];
}
"
>
<el-option
v-for="val in item.checkarr"
:key="val.value"
:label="val.label"
:value="val.value"
/>
</el-select>
</template>
</el-form-item>
</template>
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset"> </el-button>
</el-form-item>
</el-form>
</div>
<!-- 控件模块 -->
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<!-- 新增 -->
<el-button type="primary" icon="Plus" @click="handleAdd"> </el-button>
<!-- 删除 -->
<el-button type="primary" icon="Delete" @click="() => handleDelete(true)">
</el-button>
<!-- 导出 -->
<el-button type="primary" icon="Download" @click="handleExport"> </el-button>
<!-- 导入 -->
<el-button
type="primary"
icon="Upload"
@click="() => (details.popUpShow.UploadPackageDelivery = true)"
>
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<el-text @click="handleDelete(false, slotProps.scope.row)"> 删除 </el-text>
<el-text @click="handleEdit(slotProps.scope)"> 编辑 </el-text>
<el-text @click="handleView(slotProps.scope)"> 查看 </el-text>
</template>
</template>
</tablecmt>
<!-- 分页模块 -->
<div class="flex-c-sb mt20">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.current"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.size"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</div>
</basic-container>
<!-- 上传 -->
<MyUpload
ref="myUpload"
v-model="details.popUpShow.UploadPackageDelivery"
templateSrc=""
uploadAddress="/api/logpm-basicdata/vehicle/import-basicdataVehicle"
isDefined
:success="
() => {
details.popUpShow.UploadPackageDelivery = false;
onLoad();
}
"
>
<!-- <el-button type="danger" icon="Download" @click="handleDownloadTemplate"> 下载模板 </el-button> -->
</MyUpload>
<!-- 列表配置显示 -->
<edittablehead
@closce="showdrawer"
:drawerShow="drawerShow"
v-model="details.columnList"
></edittablehead>
</template>
<script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick, getCurrentInstance } from 'vue';
import functions from '@/utils/functions.js';
import dayjs from 'dayjs';
import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import {
downloadXls,
setNodeHeight,
getHtmls,
deepClone,
handleClearTableQuery,
debounce,
handleSelectQuery,
handleInputQuery,
handleTranslationDataSeclect,
getObjType,
} from '@/utils/util';
import columnList from '@/option/basicdata/basicdataVehicle2.js';
import { useStore } from 'vuex';
import { useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import { dateNow } from '@/utils/date';
import {
getList,
getDetail,
add,
update,
remove,
getPage,
getVehicle,
$_Exportvehicle,
getDictionary,
getVehicleExport,
} from '@/api/basicdata/basicdataVehicle';
import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
//
const $router = useRouter();
const $store = useStore();
const details = reactive<any>({
/** 是否开启搜索 */
search: true,
/** 表格搜索条件 */
query: {},
/** 时间快捷选择设置 */
shortcuts: [
{
text: '最近一周',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
},
},
{
text: '最近一个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
},
},
{
text: '最近三个月',
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
},
},
],
/** 列表 */
columnList: deepClone(columnList),
/** 列表数据 */
data: [{}],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
/** 页面loading */
pageLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
/** 是否显示设置表格 */
drawerShow: false,
/** 分页参数 */
page: {
current: 1,
size: 30,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 图片预览 */
abnormalVisited: false,
/** 上传 */
UploadPackageDelivery: false,
},
/** 列表Dom节点 */
listNode: '',
form: {},
/** 全屏 */
fullscreenObj: {
/** 查看 */
view: false,
},
});
const { search, query, shortcuts, stockupDate, data, loadingObj, selectionList, drawerShow, page } =
toRefs(details);
const instance = getCurrentInstance();
/** vuex */
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
onMounted(() => {
const timer = setTimeout(() => {
details.listNode = document.querySelector('.maboxhi');
details.listNode.style.transition = 'all .5s ease-out';
clearTimeout(timer);
}, 100);
});
/** 请求页面数据 */
const onLoad = debounce(async (page?: any, params = {}) => {
try {
details.loadingObj.list = true;
let _page = details.page;
if (page) _page = page;
//
const res = await getPage({ ..._page, ...details.query, ...params });
console.log('res :>> ', res);
const { code, data } = res.data;
if (code !== 200) return;
details.data = data.records;
handleTranslationDataSeclect(details.data, details.columnList);
details.page.total = data.total;
} catch (error) {
} finally {
details.loadingObj.list = false;
}
}, 10);
const handleData = (key, 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 === key)
return (value.checkarr =
getObjType(data) === 'array'
? data.map(val => {
val.label = val.dictValue;
val.value = val.dictKey;
return val;
})
: []);
}
};
//
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);
};
initData();
/** 搜索 */
const searchChange = () => {
onLoad(details.page);
};
/** 清空表单 */
const searchReset = () => {
details.query = {};
details.stockupDate = [];
details.page.current = 1;
handleClearTableQuery(details.columnList);
onLoad(details.page);
};
/** 展开列表控件 */
const showdrawer = (_flag?: boolean) => {
details.drawerShow = _flag;
};
/** 是否开启搜索区 */
const searchHide = () => {
details.search = !details.search;
setNodeHeight(details.listNode, '', true);
};
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
handleInputQuery(index, row, details.query);
onLoad(details.page);
};
/** 表格表头时间选择 */
const timesc = (index, row) => {
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
details.query[row.prop] = index;
if (!index) {
delete details.query[row.prop];
}
onLoad(details.page);
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
handleSelectQuery(index, row, details.query);
onLoad(details.page);
};
/** 表格表头复选框选择 */
const selectionChange = (list: any) => {
details.selectionList = list;
};
/** 每页数量改变执行的回调 */
const sizeChange = (size: number) => {
details.page.size = size;
onLoad(details.page);
};
/** 页码改变执行的回调 */
const currentChange = current => {
details.page.current = current;
onLoad();
};
/** 新增 */
const handleAdd = () => {
$store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
$router.push({
path: '/basicdata/vehicle/basicdataVehicleAddForm',
query: { type: 'add' },
});
};
/** 编辑 */
const handleEdit = ({ row }) => {
$store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
$router.push({
path: '/basicdata/vehicle/basicdataVehicleAddForm',
query: { type: 'edit', name: `${row.vehicleNub} -- 编辑`, id: row.id },
});
};
/** 查看 */
const handleView = ({ row }) => {
$store.commit('DEL_ONCE_TAG', '/basicdata/vehicle/basicdataVehicleAddForm');
$router.push({
path: '/basicdata/vehicle/basicdataVehicleAddForm',
query: { type: 'view', name: `${row.vehicleNub} -- 查看`, id: row.id },
});
};
/**
* isBatch 是否批量删除
* row 单个删除时当前行的数据
*/
const handleDelete = (isBatch, row: any = {}) => {
let ids = '';
if (isBatch) {
if (!details.selectionList.length) {
ElMessage.warning('请选择要删除的数据');
return;
}
ids = details.selectionList.map(v => v.id).join(',');
} else {
ids = row.id;
}
ElMessageBox.confirm('确定删除该数据吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const res = await remove(ids);
const { code, msg } = res.data;
if (code !== 200) return ElMessage.error(msg);
ElMessage.success('删除成功');
onLoad(details.page);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
.catch(() => {});
};
/** 导出 */
const handleExport = () => {
console.log('instance :>> ', instance);
if (!details.selectionList.length) {
ElMessage({
message: '请勾选要导出的数据',
type: 'warning',
});
return;
}
let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle?Blade-Auth=${getToken()}`;
let submitData = {
ids: '',
};
submitData.ids = details.selectionList.map(item => item.id).join(',');
ElMessageBox.confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
try {
details.loadingObj.pageLoading = true;
const res = await exportBlob(downloadUrl, submitData);
const { status, data } = res;
if (status !== 200) retrun;
downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
});
};
</script>
<style scoped lang="scss">
//
:deep(.el-date-editor.el-input) {
height: 100% !important;
width: 100% !important;
}
:deep(.el-range-editor.el-input__wrapper) {
height: 100% !important;
}
.mt20 {
margin-top: 20px;
}
.fwb {
font-weight: bold;
}
</style>

22
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -91,7 +91,7 @@
<el-input v-model.trim="Addform.linkman" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="联系电话" prop="contactNumber">
<el-form-item label="联系电话" prop="contactNumber">
<el-input v-model.trim="Addform.contactNumber" placeholder="请输入联系电话" />
</el-form-item>
@ -459,7 +459,6 @@ const rules = reactive({
addressInfo: [{ required: true, message: '请选择仓库地区', trigger: 'change' }],
department: [{ required: true, message: '请选择所属部门', trigger: 'change' }],
warehouseAddress: [{ required: true, message: '请选择仓库地址', trigger: 'change' }],
});
const Topquery = ref({}); //
const newlyaddload = ref(false); //
@ -468,8 +467,7 @@ const department = ref();
const Addform = ref({}); //
const WarehouseType = ref([]); //
const FireProtection = ref([]); //
const Isprotection = ref([
]); //
const Isprotection = ref([]); //
const WarehouseStructureList = ref([]); //
const Iselevated = ref([
{
@ -928,13 +926,19 @@ const view = value => {
GetDetails(value); //
};
const beforeAvatarUpload = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

16
src/views/datadetail/ToolUpdate.vue

@ -301,13 +301,19 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) =>
};
//
const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

3
src/views/distribution/artery/TripartiteTransferDetails.vue

@ -333,6 +333,7 @@ import {
postFindDriverListByName,
postFindUseOrderList,
} from '@/api/distribution/AddVehicleStowage';
import { postFindDriverListByNameAndWarehouseId } from '@/api/distribution/addTripartiteTransfer';
import { postCarsLoadDetailInfo } from '@/api/distribution/VehicleStowageDetails.js';
import { postFindCarsLoadLogs } from '@/api/distribution/VehicleStowageDetails.js';
import { useRouter, useRoute } from 'vue-router';
@ -675,7 +676,7 @@ const searchHide = async () => {
/** 查询司机信息 */
const remoteMethodDriver = async val => {
const res = await postFindDriverListByName({ driverName: val });
const res = await postFindDriverListByNameAndWarehouseId({ driverName: val });
console.log('res :>> ', res);
const { code, data } = res.data;
if (code !== 200) return;

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

@ -514,7 +514,7 @@
<script lang="ts">
export default {
name: 'addTripartiteTransfer',
name: '/distribution/artery/addTripartiteTransfer',
};
</script>
@ -537,7 +537,6 @@ import { columnList, newColumnList } from '@/option/distribution/addVehicleStowa
import {
postloadFindLoadInitData,
postFindAllOrderList,
postFindDriverListByName,
postFindCarrierByName,
postFindUseOrderList,
postSelectEditDetailByLoadId,
@ -546,6 +545,7 @@ import {
import {
postSaveNewTripartiteTransfer,
postUpdateTripartiteTransfer,
postFindDriverListByNameAndWarehouseId,
} from '@/api/distribution/addTripartiteTransfer.js';
import type { FormInstance, FormRules } from 'element-plus';
import { ElMessage } from 'element-plus';
@ -992,7 +992,7 @@ remoteMethod('');
/** 查询司机信息 */
const remoteMethodDriver = async val => {
const res = await postFindDriverListByName({ driverName: val });
const res = await postFindDriverListByNameAndWarehouseId({ driverName: val });
console.log('res :>> ', res);
const { code, data } = res.data;
if (code !== 200) return;

16
src/views/distribution/artery/directGoMarketDetails.vue

@ -984,13 +984,19 @@ const handleZeroSubmit = async () => {
//
const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
if (rawFile.type !== 'image/png') {
ElMessage.error('图片格式只能为image/png!');
return false;
} else if (rawFile.size / 1024 / 1024 > 2) {
ElMessage.error('图片大小不能大于2MB!');
const _nameArr = rawFile.name.split('.');
if (_nameArr.length === 0) {
ElMessage.warning('异常类型文件');
return false;
}
const _name = _nameArr[_nameArr.length - 1];
const _whiteArr = ['png', 'jpg', 'jpeg'];
if (!_whiteArr.includes(_name.toLocaleLowerCase()))
return ElMessage.warning('请上传png、jpg、jpeg的类型图片');
const res = await compressImageBlob(rawFile);
return res;
};

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

@ -834,6 +834,7 @@ const handleBatchUnLoad = async () => {
waybillNo: iterator.waybillNo,
enterNum: iterator.num,
orderCode: iterator.orderCode,
carsLoadScanId: iterator.id,
});
}
@ -958,6 +959,7 @@ const handleBatchUnLoad = async () => {
waybillNo: iterator.waybillNo,
enterNum: iterator.num,
orderCode: iterator.orderCode,
carsLoadScanId: iterator.id,
});
}
}
@ -1157,6 +1159,7 @@ const handleZeroUnLoadSubmit = async () => {
waybillNo: details.zeroItem.waybillNo,
enterNum: details.zeroItem.enterNum,
orderCode: details.zeroItem.orderCode,
carsLoadScanId: details.zeroItem.id,
},
],
incomingType: '7',
@ -1170,6 +1173,7 @@ const handleZeroUnLoadSubmit = async () => {
enterNum: details.zeroItem.num,
orderCode: details.zeroItem.orderCode,
incomingType: '7',
carsLoadScanId: details.zeroItem.id,
};
res = await postTransferUnloadZero(submitData);

Loading…
Cancel
Save