Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 months ago
parent
commit
c5bc1439fa
  1. 17
      src/axios.js
  2. 2
      src/router/views/index.js
  3. 2
      src/views/aftersales/aftersalesWorkOrder.vue
  4. 16
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 10
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  6. 12
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  7. 7
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  8. 21
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  9. 6
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  10. 4
      src/views/distribution/stockup/distributionStockupSelf.vue
  11. 52
      src/views/waybill/orderPackageListDetails.vue
  12. 62
      src/views/waybill/orderPackageListDetailsByMarket.vue

17
src/axios.js

@ -10,7 +10,7 @@ import router from '@/router/'; // Vue路由
import { serialize } from 'utils/util'; // 序列化工具函数,通常用于处理请求参数 import { serialize } from 'utils/util'; // 序列化工具函数,通常用于处理请求参数
import { getToken } from 'utils/auth'; // 用于获取存储的Token import { getToken } from 'utils/auth'; // 用于获取存储的Token
import { isURL } from 'utils/validate'; // 验证字符串是否为URL的函数 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 website from '@/config/website'; // 站点配置文件,可以配置一些通用信息如clientId、clientSecret
import NProgress from 'nprogress'; // 页面顶部进度条 import NProgress from 'nprogress'; // 页面顶部进度条
import 'nprogress/nprogress.css'; // 进度条样式 import 'nprogress/nprogress.css'; // 进度条样式
@ -19,6 +19,7 @@ import { baseUrl } from '@/config/env'; // API基础URL
import crypto from '@/utils/crypto'; // 加密工具,可能用于加密Token等 import crypto from '@/utils/crypto'; // 加密工具,可能用于加密Token等
import {ref} from 'vue'; import {ref} from 'vue';
let msg = ref(''); // 错误信息 let msg = ref(''); // 错误信息
let isAlertShowing = false; // 新增的标志变量
// 存储待取消的HTTP请求的键值对,用于取消重复的请求 // 存储待取消的HTTP请求的键值对,用于取消重复的请求
const pendingRequests = new Map(); const pendingRequests = new Map();
@ -135,7 +136,19 @@ axios.interceptors.response.use(
if (statusWhiteList.includes(status)) return Promise.reject(res); if (statusWhiteList.includes(status)) return Promise.reject(res);
// 如果状态码为401,则表示用户未认证,需跳转到登录页 // 如果状态码为401,则表示用户未认证,需跳转到登录页
if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' })); 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' }));
},
});
}
// 如果response的状态码不是200,则显示消息提示,并返回Promise的reject状态 // 如果response的状态码不是200,则显示消息提示,并返回Promise的reject状态
if (status !== 200 && status !== '0' && status !== '1') { if (status !== 200 && status !== '0' && status !== '1') {

2
src/router/views/index.js

@ -461,7 +461,7 @@ export default [
// 包明细 -- 商家 // 包明细 -- 商家
{ {
path: 'orderPackageListDetailsByMarket', path: 'orderPackageListDetailsByMarket',
name: '包明细', name: '商家包明细',
meta: { meta: {
data: 'data', data: 'data',
keepAlive: true, keepAlive: true,

2
src/views/aftersales/aftersalesWorkOrder.vue

@ -4911,7 +4911,7 @@ const AssignSubmission = () => {
:deep(.el_tabs) { :deep(.el_tabs) {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column-reverse;
justify-content: space-between; justify-content: space-between;
.el-tabs__content { .el-tabs__content {
padding: 0; padding: 0;

16
src/views/aftersales/aftersalesWorkOrderend.vue

@ -10,7 +10,7 @@
<el-form :model="endFrom"> <el-form :model="endFrom">
<div class="el_top"> <div class="el_top">
<el-form-item label="异常类型" class="el_inputTop"> <el-form-item label="异常类型" class="el_inputTop">
<el-select v-model="endFrom.workOrderType" disabled style="width: 240px;"> <el-select v-model="endFrom.workOrderType" disabled style="width: 240px">
<el-option <el-option
v-for="item in IndexException" v-for="item in IndexException"
:key="item.value" :key="item.value"
@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="发现节点" class="el_inputTop"> <el-form-item label="发现节点" class="el_inputTop">
<el-select v-model="endFrom.discoveryNode" disabled style="width: 240px;"> <el-select v-model="endFrom.discoveryNode" disabled style="width: 240px">
<el-option <el-option
v-for="item in DiscoveringNodes" v-for="item in DiscoveringNodes"
:key="item.value" :key="item.value"
@ -336,7 +336,7 @@
:reserve-keyword="false" :reserve-keyword="false"
placeholder="请选择处理结果" placeholder="请选择处理结果"
@change="changeProcessingResults" @change="changeProcessingResults"
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
> >
<el-option <el-option
v-for="item in ProcessingResults" v-for="item in ProcessingResults"
@ -362,7 +362,7 @@
:value-on-clear="0" :value-on-clear="0"
:precision="2" :precision="2"
@change="Totalamount" @change="Totalamount"
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
/> />
</el-form-item> </el-form-item>
@ -371,7 +371,7 @@
v-model="item.paymentUnit" v-model="item.paymentUnit"
placeholder="请输入支付单位" placeholder="请输入支付单位"
clearable clearable
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
/> />
</el-form-item> </el-form-item>
<el-form-item label="理赔支付时间"> <el-form-item label="理赔支付时间">
@ -382,7 +382,7 @@
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="理赔支付时间" placeholder="理赔支付时间"
size="default" size="default"
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
/> />
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
@ -391,7 +391,7 @@
placeholder="请选择支付方式" placeholder="请选择支付方式"
style="width: 100%" style="width: 100%"
clearable clearable
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
> >
<el-option <el-option
v-for="items in item.Paymentmethod" v-for="items in item.Paymentmethod"
@ -413,7 +413,7 @@
placeholder="请输入处理结果说明" placeholder="请输入处理结果说明"
clearable clearable
:autosize="{ minRows: 3, maxRows: 4 }" :autosize="{ minRows: 3, maxRows: 4 }"
:disabled="$route.query.RouterState == 'end'" :disabled="!PermissionButton.Submission_results"
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>

10
src/views/distribution/deliverylist/distributionDeliveryList.vue

@ -1009,9 +1009,17 @@ export default {
this.title = '查看'; this.title = '查看';
this.view = true; this.view = true;
this.box = true; this.box = true;
getDetail(row.id).then(res => { if(row.id){
getDetail(row.id).then(res => {
this.form = res.data.data; this.form = res.data.data;
}); });
}else{
ElMessage({
message: '数据错误,刷新页面重新尝试',
type: 'warning',
})
}
}, },
handleViewBlank(row) { handleViewBlank(row) {
this.$router.push({ this.$router.push({

12
src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@ -95,7 +95,7 @@
<div style="height: 100%"> <div style="height: 100%">
<div class="flex-c-sb"> <div class="flex-c-sb">
<div class="flex1"> <div class="flex1">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部列表" name="first"> </el-tab-pane> <el-tab-pane label="全部列表" name="first"> </el-tab-pane>
<el-tab-pane label="待配送" name="second"> </el-tab-pane> <el-tab-pane label="待配送" name="second"> </el-tab-pane>
<el-tab-pane label="配送中" name="third"> </el-tab-pane> <el-tab-pane label="配送中" name="third"> </el-tab-pane>
@ -1000,12 +1000,16 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.query.type = '1'; this.query.type = '1';
const submitData = { ...params, ...this.query };
if (getObjType(this.query.taskTimeArr) === 'array') { if (getObjType(this.query.taskTimeArr) === 'array') {
params.taskTimeStart = this.query.taskTimeArr[0]; submitData.taskTimeStart = this.query.taskTimeArr[0];
params.taskTimeEnd = this.query.taskTimeArr[1]; 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; const data = res.data.data;
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
for (let i = 0; i < data.records.length; i++) { for (let i = 0; i < data.records.length; i++) {

7
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -5393,6 +5393,13 @@ export default {
this.loading = true; // this.loading = true; //
this.deliveryId = this.$route.query.id; this.deliveryId = this.$route.query.id;
if(!this.deliveryId){
ElMessage({
message: '遇到异常,请刷新页面重试',
type: 'warning',
})
return
}
const res = await getDetail(this.deliveryId); const res = await getDetail(this.deliveryId);
const { code, data } = res.data; const { code, data } = res.data;

21
src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@ -697,9 +697,18 @@ export default {
this.title = '查看'; this.title = '查看';
this.view = true; this.view = true;
this.box = true; this.box = true;
getDetail(row.id).then(res => { if(row.id){
getDetail(row.id).then(res => {
this.form = res.data.data; this.form = res.data.data;
}); });
}else{
ElMessage({
message: '数据错误,刷新页面重新尝试',
type: 'warning',
})
}
}, },
// handleViewBlank (row) { // handleViewBlank (row) {
// this.$router.push({ // this.$router.push({
@ -772,12 +781,16 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.query.type = '2'; this.query.type = '2';
const submitData = { ...params, ...this.query };
if (getObjType(this.query.taskTimeArr) === 'array') { if (getObjType(this.query.taskTimeArr) === 'array') {
params.taskTimeStart = this.query.taskTimeArr[0]; submitData.taskTimeStart = this.query.taskTimeArr[0];
params.taskTimeEnd = this.query.taskTimeArr[1]; 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; const data = res.data.data;
// eslint-disable-next-line no-empty // eslint-disable-next-line no-empty
// for (let i = 0; i < data.records.length; i++) { // for (let i = 0; i < data.records.length; i++) {

6
src/views/distribution/stockup/distributionStockupDiscuss.vue

@ -738,7 +738,7 @@ export default {
this.forkliftData = fo; this.forkliftData = fo;
}); });
await this.getStorageArea(); await this.getStorageArea();
await this.getTeam(); // await this.getTeam();
}, },
// //
async getTeam() { async getTeam() {
@ -800,7 +800,7 @@ export default {
this.num = '3'; this.num = '3';
this.dialogFormCustomer = true; this.dialogFormCustomer = true;
this.getFork(); this.getFork();
this.getTeam(); // this.getTeam();
} else { } else {
this.$message.warning('已指派,请勿重复指派!!!'); this.$message.warning('已指派,请勿重复指派!!!');
} }
@ -943,7 +943,7 @@ export default {
this.num = '2'; this.num = '2';
this.formOne.id = row.row.id; this.formOne.id = row.row.id;
this.getFork(); this.getFork();
this.getTeam(); // this.getTeam();
}, },
handleView(row) { handleView(row) {
// this.title = '' // this.title = ''

4
src/views/distribution/stockup/distributionStockupSelf.vue

@ -734,7 +734,7 @@ export default {
this.forkliftData = fo; this.forkliftData = fo;
}); });
await this.getStorageArea(); await this.getStorageArea();
await this.getTeam(); // await this.getTeam();
}, },
// //
async getTeam() { async getTeam() {
@ -962,7 +962,7 @@ export default {
this.num = '2'; this.num = '2';
this.formOne.id = row.row.id; this.formOne.id = row.row.id;
this.getFork(); this.getFork();
this.getTeam(); // this.getTeam();
}, },
handleView(row) { handleView(row) {
this.$router.push({ this.$router.push({

52
src/views/waybill/orderPackageListDetails.vue

@ -75,7 +75,12 @@
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<!-- 批量打印 --> <!-- 批量打印 -->
<el-button type="primary" icon="Printer" @click="handleBatchBarcode"> <el-button
type="primary"
v-if="permissionObj.orderPackageListDetails_batchPrint"
icon="Printer"
@click="handleBatchBarcode"
>
批量打印 批量打印
</el-button> </el-button>
@ -143,7 +148,12 @@
> >
直接入库 直接入库
</el-text> </el-text>
<el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text> <el-text
v-if="permissionObj.orderPackageListDetails_viewQrCode"
@click="printOrder(slotProps.scope)"
>
查看二维码
</el-text>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -437,26 +447,34 @@ console.log('permission :>> ', permission);
/** 权限按钮 */ /** 权限按钮 */
const permissionObj = reactive({ const permissionObj = reactive({
/** 批量打印 */
orderPackageListDetails_batchPrint: computed(
() => $store.getters.permission.orderPackageListDetails_batchPrint
),
/** 批量删除 */ /** 批量删除 */
orderPackageListDetails_batchDelete: computed(() => { orderPackageListDetails_batchDelete: computed(
return $store.getters.permission.orderPackageListDetails_batchDelete; () => $store.getters.permission.orderPackageListDetails_batchDelete
}), ),
/** 批量入库 */ /** 批量入库 */
orderPackageListDetails_batchIncoming: computed(() => { orderPackageListDetails_batchIncoming: computed(
return $store.getters.permission.orderPackageListDetails_batchIncoming; () => $store.getters.permission.orderPackageListDetails_batchIncoming
}), ),
/** 入库 */ /** 入库 */
orderPackageListDetails_incoming: computed(() => { orderPackageListDetails_incoming: computed(
return $store.getters.permission.orderPackageListDetails_Incoming; () => $store.getters.permission.orderPackageListDetails_Incoming
}), ),
/** 流转节点 */ /** 流转节点 */
orderPackageListDetails_flowNode: computed(() => { orderPackageListDetails_flowNode: computed(
return $store.getters.permission.orderPackageListDetails_flowNode; () => $store.getters.permission.orderPackageListDetails_flowNode
}), ),
/** 包内产品 */ /** 包内产品 */
orderPackageListDetails_InPackageProduct: computed(() => { orderPackageListDetails_InPackageProduct: computed(
return $store.getters.permission.orderPackageListDetails_InPackageProduct; () => $store.getters.permission.orderPackageListDetails_InPackageProduct
}), ),
/** 查看二维码 */
orderPackageListDetails_viewQrCode: computed(
() => $store.getters.permission.orderPackageListDetails_viewQrCode
),
}); });
onMounted(() => { onMounted(() => {

62
src/views/waybill/orderPackageListDetailsByMarket.vue

@ -75,14 +75,19 @@
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<!-- 批量打印 --> <!-- 批量打印 -->
<el-button type="primary" icon="Printer" @click="handleBatchBarcode"> <el-button
type="primary"
v-if="permissionObj.orderPackageListDetailsByMarket_batchPrint"
icon="Printer"
@click="handleBatchBarcode"
>
批量打印 批量打印
</el-button> </el-button>
<!-- 直接入库 --> <!-- 直接入库 -->
<el-button <el-button
type="primary" type="primary"
v-if="permissionObj.orderPackageListDetails_batchIncoming" v-if="permissionObj.orderPackageListDetailsByMarket_batchIncoming"
icon="Position" icon="Position"
@click="handleBatchPutInStorage" @click="handleBatchPutInStorage"
> >
@ -92,7 +97,7 @@
<!-- 批量删除 --> <!-- 批量删除 -->
<el-button <el-button
type="primary" type="primary"
v-if="permissionObj.orderPackageListDetails_batchDelete" v-if="permissionObj.orderPackageListDetailsByMarket_batchDelete"
icon="Delete" icon="Delete"
@click="handleBatchDelete" @click="handleBatchDelete"
>批量删除</el-button >批量删除</el-button
@ -123,27 +128,32 @@
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<el-text <el-text
v-if="permissionObj.orderPackageListDetails_InPackageProduct" v-if="permissionObj.orderPackageListDetailsByMarket_InPackageProduct"
@click="handleShowPackageOrderList(slotProps.scope)" @click="handleShowPackageOrderList(slotProps.scope)"
> >
包内产品 包内产品
</el-text> </el-text>
<el-text <el-text
v-if="permissionObj.orderPackageListDetails_flowNode" v-if="permissionObj.orderPackageListDetailsByMarket_flowNode"
@click="handleShowFlowNode(slotProps.scope)" @click="handleShowFlowNode(slotProps.scope)"
> >
流转节点 流转节点
</el-text> </el-text>
<el-text <el-text
v-if=" v-if="
permissionObj.orderPackageListDetails_incoming && permissionObj.orderPackageListDetailsByMarket_incoming &&
Number(slotProps.scope.row.packageStatus) === 0 Number(slotProps.scope.row.packageStatus) === 0
" "
@click="handlePutInStorage(slotProps.scope)" @click="handlePutInStorage(slotProps.scope)"
> >
直接入库 直接入库
</el-text> </el-text>
<el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text> <el-text
v-if="permissionObj.orderPackageListDetailsByMarket_viewQrCode"
@click="printOrder(slotProps.scope)"
>
查看二维码
</el-text>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -437,26 +447,34 @@ console.log('permission :>> ', permission);
/** 权限按钮 */ /** 权限按钮 */
const permissionObj = reactive({ const permissionObj = reactive({
/** 批量打印 */
orderPackageListDetailsByMarket_batchPrint: computed(
() => $store.getters.permission.orderPackageListDetailsByMarket_batchPrint
),
/** 批量删除 */ /** 批量删除 */
orderPackageListDetails_batchDelete: computed(() => { orderPackageListDetailsByMarket_batchDelete: computed(
return $store.getters.permission.orderPackageListDetails_batchDelete; () => $store.getters.permission.orderPackageListDetailsByMarket_batchDelete
}), ),
/** 批量入库 */ /** 批量入库 */
orderPackageListDetails_batchIncoming: computed(() => { orderPackageListDetailsByMarket_batchIncoming: computed(
return $store.getters.permission.orderPackageListDetails_batchIncoming; () => $store.getters.permission.orderPackageListDetailsByMarket_batchIncoming
}), ),
/** 入库 */ /** 入库 */
orderPackageListDetails_incoming: computed(() => { orderPackageListDetailsByMarket_incoming: computed(
return $store.getters.permission.orderPackageListDetails_Incoming; () => $store.getters.permission.orderPackageListDetailsByMarket_incoming
}), ),
/** 流转节点 */ /** 流转节点 */
orderPackageListDetails_flowNode: computed(() => { orderPackageListDetailsByMarket_flowNode: computed(
return $store.getters.permission.orderPackageListDetails_flowNode; () => $store.getters.permission.orderPackageListDetailsByMarket_flowNode
}), ),
/** 包内产品 */ /** 包内产品 */
orderPackageListDetails_InPackageProduct: computed(() => { orderPackageListDetailsByMarket_InPackageProduct: computed(
return $store.getters.permission.orderPackageListDetails_InPackageProduct; () => $store.getters.permission.orderPackageListDetailsByMarket_InPackageProduct
}), ),
/** 查看二维码 */
orderPackageListDetailsByMarket_viewQrCode: computed(
() => $store.getters.permission.orderPackageListDetailsByMarket_viewQrCode
),
}); });
onMounted(() => { onMounted(() => {

Loading…
Cancel
Save