From eecb97c32ffe11249b0876d12286836838e1feb8 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 11 Oct 2024 11:31:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 2 +- src/views/aftersales/aftersalesWorkOrderend.vue | 16 ++++++++-------- .../deliverylist/distributionDeliveryListedt.vue | 7 +++++++ .../stockup/distributionStockupDiscuss.vue | 6 +++--- .../stockup/distributionStockupSelf.vue | 4 ++-- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 2a551e29..223787cf 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -4911,7 +4911,7 @@ const AssignSubmission = () => { :deep(.el_tabs) { width: 100%; display: flex; - flex-direction: column; + flex-direction: column-reverse; justify-content: space-between; .el-tabs__content { padding: 0; diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index c38b7fcc..3bd09256 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -10,7 +10,7 @@
- + - + @@ -371,7 +371,7 @@ v-model="item.paymentUnit" placeholder="请输入支付单位" clearable - :disabled="$route.query.RouterState == 'end'" + :disabled="!PermissionButton.Submission_results" /> @@ -382,7 +382,7 @@ value-format="YYYY-MM-DD HH:mm:ss" placeholder="理赔支付时间" size="default" - :disabled="$route.query.RouterState == 'end'" + :disabled="!PermissionButton.Submission_results" /> @@ -391,7 +391,7 @@ placeholder="请选择支付方式" style="width: 100%" clearable - :disabled="$route.query.RouterState == 'end'" + :disabled="!PermissionButton.Submission_results" > diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 66af09bb..e077e04b 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -5393,6 +5393,13 @@ export default { this.loading = true; //开启加载 this.deliveryId = this.$route.query.id; + if(!this.deliveryId){ + ElMessage({ + message: '遇到异常，请刷新页面重试', + type: 'warning', + }) + return + } const res = await getDetail(this.deliveryId); const { code, data } = res.data; diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index adf79fb3..e7550a97 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -738,7 +738,7 @@ export default { this.forkliftData = fo; }); await this.getStorageArea(); - await this.getTeam(); + // await this.getTeam(); }, //查询班组 async getTeam() { @@ -800,7 +800,7 @@ export default { this.num = '3'; this.dialogFormCustomer = true; this.getFork(); - this.getTeam(); + // this.getTeam(); } else { this.$message.warning('已指派，请勿重复指派！！！'); } @@ -943,7 +943,7 @@ export default { this.num = '2'; this.formOne.id = row.row.id; this.getFork(); - this.getTeam(); + // this.getTeam(); }, handleView(row) { // this.title = '查看' diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 3605fe0c..ca6a6ed6 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -734,7 +734,7 @@ export default { this.forkliftData = fo; }); await this.getStorageArea(); - await this.getTeam(); + // await this.getTeam(); }, //查询班组 async getTeam() { @@ -962,7 +962,7 @@ export default { this.num = '2'; this.formOne.id = row.row.id; this.getFork(); - this.getTeam(); + // this.getTeam(); }, handleView(row) { this.$router.push({ From 62a6585027cd455482723fd21590f789ba8bb2b3 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 11 Oct 2024 15:28:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9Etoken=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/axios.js | 15 +++++++++++++-- .../deliverylist/distributionDeliveryList.vue | 10 +++++++++- .../deliverylist/distributionDeliveryListmar.vue | 11 ++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/axios.js b/src/axios.js index 2adf1480..f7012173 100644 --- a/src/axios.js +++ b/src/axios.js @@ -10,7 +10,7 @@ import router from '@/router/'; // Vue路由 import { serialize } from 'utils/util'; // 序列化工具函数，通常用于处理请求参数 import { getToken } from 'utils/auth'; // 用于获取存储的Token import { isURL } from 'utils/validate'; // 验证字符串是否为URL的函数 -import { ElMessage } from 'element-plus'; // Element-Plus中的消息提示组件 +import { ElMessage,ElMessageBox } from 'element-plus'; // Element-Plus中的消息提示组件 import website from '@/config/website'; // 站点配置文件，可以配置一些通用信息如clientId、clientSecret import NProgress from 'nprogress'; // 页面顶部进度条 import 'nprogress/nprogress.css'; // 进度条样式 @@ -19,6 +19,7 @@ import { baseUrl } from '@/config/env'; // API基础URL import crypto from '@/utils/crypto'; // 加密工具，可能用于加密Token等 import {ref} from 'vue'; let msg = ref(''); // 错误信息 +let isAlertShowing = false; // 新增的标志变量 // 存储待取消的HTTP请求的键值对，用于取消重复的请求 const pendingRequests = new Map(); @@ -135,7 +136,17 @@ axios.interceptors.response.use( if (statusWhiteList.includes(status)) return Promise.reject(res); // 如果状态码为401，则表示用户未认证，需跳转到登录页 - if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); + + if (status === 401 && !isAlertShowing){ + isAlertShowing = true; // 设置为 true 表示弹窗正在显示 + ElMessageBox.alert('长时间未操作,登录已过期，请重新登录', '提示', { + confirmButtonText: '确定', + callback: (action) => { + isAlertShowing = false; // 恢复为 false 表示弹窗已经关闭 + store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); + }, + }); + } // 如果response的状态码不是200，则显示消息提示，并返回Promise的reject状态 if (status !== 200 && status !== '0' && status !== '1') { diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 84b386db..faba5ed0 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -1009,9 +1009,17 @@ export default { this.title = '查看'; this.view = true; this.box = true; - getDetail(row.id).then(res => { + if(row.id){ + getDetail(row.id).then(res => { this.form = res.data.data; }); + }else{ + ElMessage({ + message: '数据错误，刷新页面重新尝试', + type: 'warning', + }) + } + }, handleViewBlank(row) { this.$router.push({ diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index de33d978..6cb18a1f 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -697,9 +697,18 @@ export default { this.title = '查看'; this.view = true; this.box = true; - getDetail(row.id).then(res => { + if(row.id){ + getDetail(row.id).then(res => { this.form = res.data.data; }); + }else{ + ElMessage({ + message: '数据错误，刷新页面重新尝试', + type: 'warning', + }) + + } + }, // handleViewBlank (row) { // this.$router.push({ From 81a9588b6a2b805502bc15ed3727380823d7a0ba Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 11 Oct 2024 15:31:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/axios.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/axios.js b/src/axios.js index f7012173..0304be4a 100644 --- a/src/axios.js +++ b/src/axios.js @@ -136,11 +136,13 @@ axios.interceptors.response.use( if (statusWhiteList.includes(status)) return Promise.reject(res); // 如果状态码为401，则表示用户未认证，需跳转到登录页 - if (status === 401 && !isAlertShowing){ isAlertShowing = true; // 设置为 true 表示弹窗正在显示 ElMessageBox.alert('长时间未操作,登录已过期，请重新登录', '提示', { confirmButtonText: '确定', + showClose: false, // 不显示关闭按钮 + closeOnPressEscape: false, // 禁止通过 ESC 键关闭 + closeOnClickModal: false, // 禁止点击遮罩关闭 callback: (action) => { isAlertShowing = false; // 恢复为 false 表示弹窗已经关闭 store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); From 9372dad8356f691921802eb510426468d3ab88f3 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Sat, 12 Oct 2024 11:06:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 2 +- .../distributionDeliveryListdis.vue | 12 ++-- .../distributionDeliveryListmar.vue | 10 ++- src/views/waybill/orderPackageListDetails.vue | 52 +++++++++++----- .../orderPackageListDetailsByMarket.vue | 62 ++++++++++++------- 5 files changed, 91 insertions(+), 47 deletions(-) diff --git a/src/router/views/index.js b/src/router/views/index.js index 2397f02b..aec5fed6 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -461,7 +461,7 @@ export default [ // 包明细 -- 商家 { path: 'orderPackageListDetailsByMarket', - name: '包明细', + name: '商家包明细', meta: { data: 'data', keepAlive: true, diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 3f6f95d0..c767307f 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -95,7 +95,7 @@
- + @@ -1000,12 +1000,16 @@ export default { onLoad(page, params = {}) { this.loading = true; this.query.type = '1'; + const submitData = { ...params, ...this.query }; + if (getObjType(this.query.taskTimeArr) === 'array') { - params.taskTimeStart = this.query.taskTimeArr[0]; - params.taskTimeEnd = this.query.taskTimeArr[1]; + submitData.taskTimeStart = this.query.taskTimeArr[0]; + submitData.taskTimeEnd = this.query.taskTimeArr[1]; } - getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + delete submitData.taskTimeArr; + + getPage(page.currentPage, page.pageSize, submitData).then(res => { const data = res.data.data; // eslint-disable-next-line no-empty for (let i = 0; i < data.records.length; i++) { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index de33d978..0874202e 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -772,12 +772,16 @@ export default { onLoad(page, params = {}) { this.loading = true; this.query.type = '2'; + const submitData = { ...params, ...this.query }; + if (getObjType(this.query.taskTimeArr) === 'array') { - params.taskTimeStart = this.query.taskTimeArr[0]; - params.taskTimeEnd = this.query.taskTimeArr[1]; + submitData.taskTimeStart = this.query.taskTimeArr[0]; + submitData.taskTimeEnd = this.query.taskTimeArr[1]; } - getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + delete submitData.taskTimeArr; + + getPage(page.currentPage, page.pageSize, submitData).then(res => { const data = res.data.data; // eslint-disable-next-line no-empty // for (let i = 0; i < data.records.length; i++) { diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue index 000c3cdd..e4594914 100644 --- a/src/views/waybill/orderPackageListDetails.vue +++ b/src/views/waybill/orderPackageListDetails.vue @@ -75,7 +75,12 @@
- + 批量打印 @@ -143,7 +148,12 @@ > 直接入库 - 查看二维码 + + 查看二维码 + @@ -437,26 +447,34 @@ console.log('permission :>> ', permission); /** 权限按钮 */ const permissionObj = reactive({ + /** 批量打印 */ + orderPackageListDetails_batchPrint: computed( + () => $store.getters.permission.orderPackageListDetails_batchPrint + ), /** 批量删除 */ - orderPackageListDetails_batchDelete: computed(() => { - return $store.getters.permission.orderPackageListDetails_batchDelete; - }), + orderPackageListDetails_batchDelete: computed( + () => $store.getters.permission.orderPackageListDetails_batchDelete + ), /** 批量入库 */ - orderPackageListDetails_batchIncoming: computed(() => { - return $store.getters.permission.orderPackageListDetails_batchIncoming; - }), + orderPackageListDetails_batchIncoming: computed( + () => $store.getters.permission.orderPackageListDetails_batchIncoming + ), /** 入库 */ - orderPackageListDetails_incoming: computed(() => { - return $store.getters.permission.orderPackageListDetails_Incoming; - }), + orderPackageListDetails_incoming: computed( + () => $store.getters.permission.orderPackageListDetails_Incoming + ), /** 流转节点 */ - orderPackageListDetails_flowNode: computed(() => { - return $store.getters.permission.orderPackageListDetails_flowNode; - }), + orderPackageListDetails_flowNode: computed( + () => $store.getters.permission.orderPackageListDetails_flowNode + ), /** 包内产品 */ - orderPackageListDetails_InPackageProduct: computed(() => { - return $store.getters.permission.orderPackageListDetails_InPackageProduct; - }), + orderPackageListDetails_InPackageProduct: computed( + () => $store.getters.permission.orderPackageListDetails_InPackageProduct + ), + /** 查看二维码 */ + orderPackageListDetails_viewQrCode: computed( + () => $store.getters.permission.orderPackageListDetails_viewQrCode + ), }); onMounted(() => { diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue index 67be36f2..b6d27bad 100644 --- a/src/views/waybill/orderPackageListDetailsByMarket.vue +++ b/src/views/waybill/orderPackageListDetailsByMarket.vue @@ -75,14 +75,19 @@
- + 批量打印 @@ -92,7 +97,7 @@ 批量删除 @@ -437,26 +447,34 @@ console.log('permission :>> ', permission); /** 权限按钮 */ const permissionObj = reactive({ + /** 批量打印 */ + orderPackageListDetailsByMarket_batchPrint: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_batchPrint + ), /** 批量删除 */ - orderPackageListDetails_batchDelete: computed(() => { - return $store.getters.permission.orderPackageListDetails_batchDelete; - }), + orderPackageListDetailsByMarket_batchDelete: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_batchDelete + ), /** 批量入库 */ - orderPackageListDetails_batchIncoming: computed(() => { - return $store.getters.permission.orderPackageListDetails_batchIncoming; - }), + orderPackageListDetailsByMarket_batchIncoming: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_batchIncoming + ), /** 入库 */ - orderPackageListDetails_incoming: computed(() => { - return $store.getters.permission.orderPackageListDetails_Incoming; - }), + orderPackageListDetailsByMarket_incoming: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_incoming + ), /** 流转节点 */ - orderPackageListDetails_flowNode: computed(() => { - return $store.getters.permission.orderPackageListDetails_flowNode; - }), + orderPackageListDetailsByMarket_flowNode: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_flowNode + ), /** 包内产品 */ - orderPackageListDetails_InPackageProduct: computed(() => { - return $store.getters.permission.orderPackageListDetails_InPackageProduct; - }), + orderPackageListDetailsByMarket_InPackageProduct: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_InPackageProduct + ), + /** 查看二维码 */ + orderPackageListDetailsByMarket_viewQrCode: computed( + () => $store.getters.permission.orderPackageListDetailsByMarket_viewQrCode + ), }); onMounted(() => {