Browse Source

签收明细页面重构,修复已知bug

pre-production
马远东 19 hours ago
parent
commit
03f071cf30
  1. 7
      src/api/distribution/distributionSignfor.js
  2. 53
      src/axios.js
  3. 215
      src/views/distribution/signdetail/distributionSigndetail.vue
  4. 4
      src/views/distribution/turndelivery/deliveryMarket.vue

7
src/api/distribution/distributionSignfor.js

@ -325,14 +325,11 @@ export const $_updateSignAddValuePackage = data => {
* 查询配送节点
* @returns {AxiosPromise}
*/
export const searchNode = (searchType, searchCode) => {
export const searchNode = (params) => {
return request({
url: '/api/logpm-distribution/signfor/searchNode',
method: 'get',
params: {
searchType,
searchCode,
},
params
});
};

53
src/axios.js

@ -10,16 +10,16 @@ import router from '@/router/'; // Vue路由
import { serialize } from 'utils/util'; // 序列化工具函数,通常用于处理请求参数
import { getToken } from 'utils/auth'; // 用于获取存储的Token
import { isURL } from 'utils/validate'; // 验证字符串是否为URL的函数
import { ElMessage,ElMessageBox } 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'; // 进度条样式
import { Base64 } from 'js-base64'; // Base64编码工具
import { baseUrl } from '@/config/env'; // API基础URL
import crypto from '@/utils/crypto'; // 加密工具,可能用于加密Token等
import {ref} from 'vue';
import { ref } from 'vue';
let msg = ref(''); // 错误信息
let isAlertShowing = false; // 新增的标志变量
let isAlertShowing = false; // 新增的标志变量
// 存储待取消的HTTP请求的键值对,用于取消重复的请求
const pendingRequests = new Map();
@ -40,11 +40,13 @@ function generateReqKey(config) {
// 添加请求到pendingRequests对象,并创建取消令牌
function addPendingRequest(config) {
const requestKey = generateReqKey(config);
config.cancelToken = config.cancelToken || new axios.CancelToken((cancel) => {
if (!pendingRequests.has(requestKey)) {
pendingRequests.set(requestKey, cancel);
}
});
config.cancelToken =
config.cancelToken ||
new axios.CancelToken(cancel => {
if (!pendingRequests.has(requestKey)) {
pendingRequests.set(requestKey, cancel);
}
});
}
// 从pendingRequests对象中移除请求,并调用取消操作
@ -60,7 +62,7 @@ function removePendingRequest(config) {
//axios请求拦截器
axios.interceptors.request.use(
config => {
// 检查 config.url 是否以 http 开头
// 检查 config.url 是否以 http 开头
// console.log(config,'config');
// 在请求开始前,对之前的请求做检查取消操作
removePendingRequest(config);
@ -68,12 +70,12 @@ axios.interceptors.request.use(
addPendingRequest(config);
// 显示进度条
NProgress.start();
// // 检查URL是否完整,如果不完整或不是URL,则添加baseUrl前缀
if (!isURL(config.url) && !config.url.startsWith(baseUrl)) {
config.url = baseUrl + config.url;
}
// 检查URL是否完整,如果不完整或不是URL,并且不以 /imgapi 开头,则添加 baseUrl 前缀
// 检查URL是否完整,如果不完整或不是URL,并且不以 /imgapi 开头,则添加 baseUrl 前缀
// if (!isURL(config.url) && !config.url.startsWith(baseUrl) && !config.url.startsWith('/imgapi')) {
// config.url = baseUrl + config.url;
// }
@ -84,7 +86,7 @@ axios.interceptors.request.use(
`${website.clientId}:${website.clientSecret}`
)}`;
}
// 如果请求需要token,则在请求头中添加token(除非明确声明不需token)
const meta = config.meta || {};
const isToken = meta.isToken === false;
@ -101,12 +103,11 @@ axios.interceptors.request.use(
if (config.text === true) {
config.headers['Content-Type'] = 'text/plain';
}
// 序列化POST请求的数据(如果请求配置了isSerialize)
if (config.method === 'post' && meta.isSerialize === true) {
config.data = serialize(config.data);
}
return config;
},
@ -124,35 +125,35 @@ axios.interceptors.response.use(
NProgress.done();
// 移除仍在pendingRequests中的请求
removePendingRequest(res.config);
// 获取response中的状态码,优先获取自定义的code,若无则获取HTTP状态码
const status = res.data.code || res.status;
// 获取状态码白名单内的状态,这些状态不会被默认处理,而是将控制权交给具体请求
const statusWhiteList = website.statusWhiteList || [];
// 取错误消息
const message = res.data.msg || res.data.error_description || '未知错误';
// 如果状态码在白名单中,则直接返回Promise的reject状态
if (statusWhiteList.includes(status)) return Promise.reject(res);
// 如果状态码为401,则表示用户未认证,需跳转到登录页
if (status === 401 && !isAlertShowing){
if (status === 401 && !isAlertShowing) {
isAlertShowing = true; // 设置为 true 表示弹窗正在显示
ElMessageBox.alert('长时间未操作,登录已过期,请重新登录', '提示', {
confirmButtonText: '确定',
showClose: false, // 不显示关闭按钮
closeOnPressEscape: false, // 禁止通过 ESC 键关闭
closeOnClickModal: false, // 禁止点击遮罩关闭
callback: (action) => {
callback: action => {
isAlertShowing = false; // 恢复为 false 表示弹窗已经关闭
store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
},
});
}
}
// 如果response的状态码不是200,则显示消息提示,并返回Promise的reject状态
if (status !== 200 && status !== '0' && status !== '1') {
if(!msg.value){
if (!msg.value) {
ElMessage({
message: message,
type: 'error',
@ -160,9 +161,9 @@ axios.interceptors.response.use(
}
setTimeout(() => {
msg.value = '';
}, 50);
msg.value=message
return Promise.reject(new Error(message));
}, 1000);
msg.value = message;
return Promise.reject(new Error(message));
}
// 正常状态返回responseData
return res;
@ -188,4 +189,4 @@ axios.interceptors.response.use(
);
// 导出axios实例
export default axios;
export default axios;

215
src/views/distribution/signdetail/distributionSigndetail.vue

@ -1,66 +1,28 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search" class="el_row_top">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="fr-fm el_from_top" >
<div class="fr-fo">
<el-form-item label="类型:">
<el-select v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof" style="width:200px">
<el-option
v-for="item in searchTypeDate"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="title+':'">
<el-input v-model="query.searchCode" :placeholder="'请输入'+title"></el-input>
</el-form-item>
</div>
<!-- 查询按钮 -->
<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>
</el-row>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<!-- <div class="avue-crud__left">-->
<!-- <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain-->
<!-- >导出-->
<!-- </el-button>-->
<!-- &lt;!&ndash; v-loading.fullscreen.lock="fullscreenLoading"&ndash;&gt;-->
<!-- <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain-->
<!-- >导出图片-->
<!-- </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="el-icon-search" @click="searchHide" circle></el-button>
</div>
<div class="avue-crud" v-loading="loading" element-loading-text="正在查询中...">
<div class="content-search">
<h3>请输入任务编号进行签收明细查询</h3>
<div class="content">
<el-input v-model="query.searchCode" placeholder="请输入任务编号" />
<el-button type="primary" @click="searchChange">查询</el-button>
</div>
</el-row>
</div>
<el-row> </el-row>
<div class="block">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp">
{{activity.content}}
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
>
<el-card>
<p>操作人:{{activity.nodeUserName}}</p>
<p>描述:{{activity.nodeInfo}}</p>
<p>操作人:{{ activity.operator }}</p>
<p>描述:{{ activity.content }}</p>
<p>操作时间:{{ activity.createTime }}</p>
</el-card>
</el-timeline-item>
</el-timeline>
@ -70,90 +32,103 @@
</template>
<script>
import {
searchNode
} from '@/api/distribution/distributionSignfor';
export default {
import { searchNode } from '@/api/distribution/distributionSignfor';
import { ElMessage } from 'element-plus'
export default {
data() {
return {
search:false,
search: false,
reverse: true,
query:{},
title:'请选择类型',
searchType:'',
searchTypeDate:[
{
value: '1',
label: '配送单号'
},
{
value: '2',
label: '预约单号'
},
{
value: '3',
label: '自提单号'
},
{
value: '4',
label: '备货单号'
},
],
activities: []
query: {},
searchType: '',
activities: [],
loading: false,
};
},
mounted() {},
computed: {},
methods: {
searchHide() {
this.search = !this.search;
},
changetypesof(val){
changetypesof(val) {
console.log(val);
this.title= this.searchTypeDate.find(res=>res.value==val).label
this.title = this.searchTypeDate.find(res => res.value == val).label;
},
searchChange() {
if (this.searchType == '' || this.searchType === undefined){
this.$message.warning("请选择搜索类型");
return;
async searchChange() {
try {
if (!this.query.searchCode) {
ElMessage({
message: '请输入查询条件',
type: 'warning',
});
return;
}
this.loading = true;
await searchNode({
searchCode: this.query.searchCode,
}).then(res => {
const data = res.data.data;
this.activities = data.map(item => {
return {
content: item.content,
operator: item.operator,
color: '#0bbd87',
createTime: item.createTime,
nodeUserName: item.nodeUserName,
nodeInfo: item.nodeInfo,
};
});
this.activities = data;
console.log(' this.activities-------->', this.activities);
});
} catch (e) {
console.log(e, 'error');
} finally {
this.loading = false;
}
searchNode(this.searchType,this.query.searchCode).then(res=>{
const data = res.data.data;
let bbb = data.map(item=>{
return {
content : item.nodeName,
content : item.nodeName,
color: '#0bbd87',
timestamp : item.time,
nodeUserName : item.nodeUserName,
nodeInfo : item.nodeInfo,
}
})
console.log("bbb-------->",bbb);
this.activities = bbb;
console.log("res=>",res);
})
},
searchReset() {
this.query = {};
this.searchType = '';
},
},
};
</script>
<style scoped lang="scss">
.el_row_top{
.el-form{
width: 100%;
display: flex;
justify-content: space-between;
<style scoped lang="scss">
.content-search {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding-bottom: 37px;
}
.content {
margin: auto;
display: flex;
height: 46px;
.el-input {
width: 400px;
height: 100%;
}
.el-btn{
margin-right: 0;
.el-button {
width: 100px;
height: 100%;
border: none;
}
}
.el_row_top {
margin-bottom: 29px;
padding: 19px 0;
}
.block {
.el-card {
padding: 0 10px;
:deep(.el-card__body) {
color: #d38729;
font-size: 16px;
}
}
}
:deep(.el-loading-parent--relative) {
height: 100%;
}
</style>

4
src/views/distribution/turndelivery/deliveryMarket.vue

@ -106,10 +106,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车辆车牌:" prop="goodsShelfId">
<el-form-item label="车辆车牌:" prop="goodsShelfId" >
<el-input
v-model="waixieForm.vehicleNum"
placeholdeonSubmitOrderr="请输入本次费用"
placeholder="请输入车辆车牌"
></el-input>
</el-form-item>
</el-col>

Loading…
Cancel
Save