Browse Source

修复部分bug

dev-xx
qb 6 months ago
parent
commit
f5b2a194ad
  1. 2
      src/views/distribution/artery/AddVehicleStowage.vue
  2. 5
      src/views/distribution/artery/VehicleStowage.vue
  3. 3
      src/views/distribution/artery/truckLoadingDetails.vue
  4. 13
      src/views/distribution/artery/zeroAdditionalRecording.vue
  5. 12
      src/views/waybill/CreateZeroOrder.vue
  6. 8
      src/views/waybill/TemporaryStorageList.vue

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

@ -1754,7 +1754,7 @@ const handleRemoveWaybill = async (index: number) => {
const remoteMethodDriver = async val => { const remoteMethodDriver = async val => {
// if (!val) return; // if (!val) return;
const res = await postFindDriverListByName({ driverName: val, driverType: 1 }); const res = await postFindDriverListByName({ driverName: val, jobType: 1 });
const { code, data } = res.data; const { code, data } = res.data;
if (code !== 200) return; if (code !== 200) return;
details.driverListByName = data; details.driverListByName = data;

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

@ -874,6 +874,11 @@ const inputsc = (index, row) => {
details.query.loadCarsNo = index; details.query.loadCarsNo = index;
if (!index && index !== 0) delete details.query[row.prop]; if (!index && index !== 0) delete details.query[row.prop];
} }
if (row.prop === 'carsLineName') {
details.query.warehouseName = index;
if (!index && index !== 0) delete details.query[row.prop];
}
initOnload(); initOnload();
}; };

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

@ -1299,7 +1299,8 @@ const printTemplate = () => {
/** 批量移除 */ /** 批量移除 */
const handleBatchRemove = async () => { const handleBatchRemove = async () => {
const WarehouseName = localStorage.getItem('WarehouseName'); const WarehouseName = localStorage.getItem('WarehouseName');
if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('多仓权限无法操作,请选择仓库');
if (details.selectionList.length === 0) return ElMessage.warning('请选择需要删除的数据'); if (details.selectionList.length === 0) return ElMessage.warning('请选择需要删除的数据');

13
src/views/distribution/artery/zeroAdditionalRecording.vue

@ -106,7 +106,7 @@
<div style="width: 49%"> <div style="width: 49%">
<el-divider content-position="left">调度池</el-divider> <el-divider content-position="left">调度池</el-divider>
<div v-if="!search"> <div v-h5uShow="!search">
<el-form <el-form
:inline="true" :inline="true"
label-width="80px" label-width="80px"
@ -419,8 +419,9 @@ const onLoad = debounce(async (params = {}) => {
const submitData = { const submitData = {
...details.oldPage, ...details.oldPage,
...details.oldQuery, ...details.oldQuery,
orderCodes: details.orderCodeList,
...params, ...params,
orderCodes: details.orderCodeList,
loadId: details.loadId,
}; };
const res = await postloadZeroSuppleList(submitData); const res = await postloadZeroSuppleList(submitData);
@ -474,7 +475,9 @@ const showdrawer = (_flag?: boolean, _type?: number) => {
const searchHide = () => { const searchHide = () => {
details.search = !details.search; details.search = !details.search;
setNodeHeight(details.listNodeList, ''); const listNodeList = document.querySelectorAll('.maboxhi') || [];
setNodeHeight(listNodeList, '', true);
}; };
/** 表格表头输入框搜索 */ /** 表格表头输入框搜索 */
@ -919,5 +922,9 @@ watch(
.header_search > div { .header_search > div {
width: 50%; width: 50%;
:deep(.el-textarea__inner) {
height: 2rem;
}
} }
</style> </style>

12
src/views/waybill/CreateZeroOrder.vue

@ -578,7 +578,7 @@
:min="0" :min="0"
:precision="2" :precision="2"
:step="0.1" :step="0.1"
@change="handleComputed(item)" @change="handleComputed(item, true)"
/> />
</el-form-item> </el-form-item>
@ -1985,7 +1985,7 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => {
* row -- 行数据 * row -- 行数据
* onlyComputedTrunline -- 是否只计算干线的价格 * onlyComputedTrunline -- 是否只计算干线的价格
*/ */
const handleComputed = (row: any) => { const handleComputed = (row: any, onlyComputedTrunline = false) => {
const { template, trunkLine } = details.priceTemplate; const { template, trunkLine } = details.priceTemplate;
if (Boolean(isDisabled.value && template && trunkLine)) if (Boolean(isDisabled.value && template && trunkLine))
@ -2290,7 +2290,8 @@ const handleTrunkLinePrice = (trunkLine, template) => {
for (let i = 0; i < details.goodsList.length; i++) { for (let i = 0; i < details.goodsList.length; i++) {
const value = details.goodsList[i]; const value = details.goodsList[i];
if (value.subtotalFreight) _total = computeNumber(_total, '+', value.subtotalFreight).result; if (value.subtotalFreight)
_total = computeNumber(_total, '+', value.subtotalFreight || 0).result;
} }
console.log('trunkLine :>> ', trunkLine); console.log('trunkLine :>> ', trunkLine);
@ -2346,7 +2347,8 @@ const handleDispatchPrice = (dispatch, template) => {
for (let i = 0; i < details.goodsList.length; i++) { for (let i = 0; i < details.goodsList.length; i++) {
const value = details.goodsList[i]; const value = details.goodsList[i];
if (value.subtotalDispatch) _total += computeNumber(_total, '+', value.subtotalDispatch).result; if (value.subtotalDispatch)
_total += computeNumber(_total, '+', value.subtotalDispatch || 0).result;
} }
// //
@ -2398,7 +2400,7 @@ const handleWarehouseManagement = () => {
for (let i = 0; i < details.goodsList.length; i++) { for (let i = 0; i < details.goodsList.length; i++) {
const value = details.goodsList[i]; const value = details.goodsList[i];
_total = computeNumber(_total, '+', value.subtotalWarehouseManagement).result; _total = computeNumber(_total, '+', value.subtotalWarehouseManagement || 0).result;
} }
details.query.warehouseManagementFee = _total; details.query.warehouseManagementFee = _total;

8
src/views/waybill/TemporaryStorageList.vue

@ -90,7 +90,7 @@
@click=" @click="
() => { () => {
if (!ChecksWhetherTheWarehouseIsSelected()) if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('请选择仓库'); return ElMessage.warning('多仓权限无法操作,请选择仓库');
details.popUpShow.UploadBatch = true; details.popUpShow.UploadBatch = true;
details.ouPaiChooseType = 0; details.ouPaiChooseType = 0;
} }
@ -1084,7 +1084,8 @@ const handleShowPackageOrderList = ({ row }) => {
/** 订单转运单 */ /** 订单转运单 */
const handleCreateOrder = () => { const handleCreateOrder = () => {
if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('多仓权限无法操作,请选择仓库');
if (details.selectionList.length === 0) { if (details.selectionList.length === 0) {
return ElMessage({ return ElMessage({
@ -1344,7 +1345,8 @@ const handleRefreshAddTag = (formEl: FormInstance | undefined) => {
/** 开启开标签弹窗 */ /** 开启开标签弹窗 */
const handleOpenAddTagDlog = async () => { const handleOpenAddTagDlog = async () => {
if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); if (!ChecksWhetherTheWarehouseIsSelected())
return ElMessage.warning('多仓权限无法操作,请选择仓库');
details.popUpShow.addTagVisited = true; details.popUpShow.addTagVisited = true;

Loading…
Cancel
Save