diff --git a/src/axios.js b/src/axios.js index 5d69e5b7..1180783e 100644 --- a/src/axios.js +++ b/src/axios.js @@ -137,8 +137,17 @@ axios.interceptors.response.use( // 如果状态码在白名单中，则直接返回Promise的reject状态 if (statusWhiteList.includes(status)) return Promise.reject(res); + console.log(router.currentRoute._value.path, 'router'); // 如果状态码为401，则表示用户未认证，需跳转到登录页 if (status === 401 && !isAlertShowing) { + // 如果在登录页面,则表示账号或密码错误 + if (router.currentRoute._value.path === '/login') { + ElMessage({ + message: '账号或密码错误', + type: 'warning', + }); + return; + } isAlertShowing = true; // 设置为 true 表示弹窗正在显示 ElMessageBox.alert('长时间未操作,登录已过期，或账号已在别处登录，请重新登录', '提示', { confirmButtonText: '确定', diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index bd6188b1..a845170a 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -280,7 +280,7 @@ export const columnList = [ }, { prop: 'totalFee', - label: '实际费用', + label: '实际总费用', type: 1, values: '', width: '130', @@ -1053,7 +1053,7 @@ export const columnListB = [ }, { prop: 'totalFee', - label: '实际费用', + label: '实际总费用', type: 1, values: '', width: '130', diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js index a1770baf..e7f45e6e 100644 --- a/src/option/finance/WaybillAudit.js +++ b/src/option/finance/WaybillAudit.js @@ -183,6 +183,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'totalCount', @@ -194,6 +195,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'totalWeight', @@ -205,6 +207,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'totalVolume', @@ -216,6 +219,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'totalFee', @@ -227,6 +231,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'systemTotalFee', @@ -238,6 +243,7 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, }, { prop: 'goodsTypePrice', @@ -282,6 +288,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'freightFee', @@ -293,6 +301,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, // { // prop: 'templateType', @@ -326,6 +336,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'warehouseFee', @@ -337,6 +349,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'warehouseManagementFee', @@ -348,6 +362,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'warehouseSortingFee', @@ -359,6 +375,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'warehouseOprationFee', @@ -370,6 +388,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryServiceFee', @@ -381,6 +401,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryFee', @@ -392,6 +414,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryHandlingFee', @@ -403,6 +427,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliverySortingFee', @@ -414,6 +440,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryUpfloorFee', @@ -425,6 +453,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryMoveFee', @@ -436,6 +466,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, // { // prop: 'deliveryLine', @@ -458,6 +490,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryLineFee', @@ -469,6 +503,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'installFee', @@ -480,6 +516,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'insuranceFee', @@ -491,6 +529,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'claimingValue', @@ -502,6 +542,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'otherFee', @@ -513,6 +555,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'rebate', @@ -524,6 +568,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'thirdOperationFee', @@ -535,6 +581,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'shipperName', @@ -739,6 +787,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'dpay', @@ -750,6 +800,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'hpay', @@ -761,6 +813,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'ypay', @@ -772,6 +826,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { @@ -784,6 +840,8 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, + }, { prop: 'deliveryTime', diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 5bcbbba7..fb05b0a8 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -657,7 +657,7 @@
: -

{{ item.username }}【{{ item.name }}】

+

{{ item.username }} 【{{ item.name }}】

{{ item.time }}

@@ -1187,12 +1187,12 @@ const Completionpermissions = computed(() => { return false; }); -const processedText=(inputtxt)=>{ +const processedText = inputtxt => { if (inputtxt.endsWith('\n') && !inputtxt.endsWith('\n ')) { return inputtxt.slice(0, -1); } return inputtxt; -} +}; const onLoad = async () => { pageState.value = true; //开启页面加载 if (await localStorage.getItem('my_data')) { @@ -1278,7 +1278,7 @@ const onLoad = async () => { // res.data.data.personResponsibleVOS.forEach(item => { // sum = Number(item.responsibilityRatio) + sum; // }); - FangAddList.value = res.data.data.personResponsibleVOS.map(res => { + FangAddList.value = res.data.data.personResponsibleVOS.map(res => { return { businessName: res.businessId, //责任人ID personResponsibleName: res.personResponsibleName, //责任人名称 @@ -2501,10 +2501,11 @@ const ResultDetermination = () => { display: flex; justify-content: space-between; align-items: center; - height: 32px; + height: auto; .el-tag { width: 70px; } + } } @@ -2952,7 +2953,7 @@ const ResultDetermination = () => { width: 100%; } } -:deep(.el-upload-list__item-thumbnail){ +:deep(.el-upload-list__item-thumbnail) { object-fit: inherit; } diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index c52789ee..69a06e06 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -3381,7 +3381,7 @@ const AppealEstablished = () => { display: flex; align-items: center; justify-content: space-between; - height: 23px; + height: auto; :deep(.el-tag) { width: 70px; } diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index ae1163e4..c4221419 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -186,12 +186,12 @@ 查看 修改客户信息 日志 - 拆单 - + --> 批量查看二维码 - 补充物料信息 + 批量补充物料信息
diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue index c506e771..ce726560 100644 --- a/src/views/finance/ReconciliationDepositSlip.vue +++ b/src/views/finance/ReconciliationDepositSlip.vue @@ -15,7 +15,7 @@ - + import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; -import functions from '@/utils/functions.js'; import dayjs from 'dayjs'; import { mapGetters, useStore } from 'vuex'; /** 获取字典 */ diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue index 397c9af0..7d255a27 100644 --- a/src/views/finance/WaybillAudit.vue +++ b/src/views/finance/WaybillAudit.vue @@ -28,7 +28,25 @@ /> - + - + 搜 索 @@ -233,11 +270,11 @@ import { useStore } from 'vuex'; import { deepClone } from '@/utils/util'; import { getToken } from '@/utils/auth'; import { ElMessage, ElMessageBox, type UploadProps } from 'element-plus'; - +import { $_getMyWarehouseList } from '@/api/reportforms/index.js'; // 获取路由实例 const $router = useRouter(); const $store = useStore(); - +const warehouseList = ref([]); const details = reactive({ /** 是否开启搜索 */ search: true, @@ -309,6 +346,12 @@ const details = reactive({ { label: '已结算', value: '30' }, ], }, + { + type: 'selectall', + label: '仓库', + prop: 'destinationWarehouseIds', + checkarr: warehouseList, + }, { type: 'time', label: '开单时间', prop: 'createTimeArr' }, { type: 'time', label: '审核时间', prop: 'checkTimeArr' }, ], @@ -441,7 +484,17 @@ const initData = async () => { getDictionaryBiz('open_order_pay_way').then(res => handleData('付款方式', res)), initOnLoad(), ]); - + $_getMyWarehouseList().then(res => { + console.log(res, '仓库列表'); + if (res.data.code === 200) { + warehouseList.value = res.data.data.map(item => { + return { + label: item.name, + value: item.id, + }; + }); + } + }); await nextTick(); handleTranslationDataSeclect(details.data, details.columnList); };