java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复已知bug

dev-xx
马远东 5 months ago
parent
86b5d638ab
commit
58c095d4e9
8 changed files with 967 additions and 649 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/api/aftersales/aftersalesWorkOrder.js
  2. 47
      src/axios.js
  3. 82
      src/components/Tableexportcomponent/Tableexportcomponent.vue
  4. 212
      src/views/aftersales/aftersalesWorkOrder.vue
  5. 90
      src/views/aftersales/aftersalesWorkOrderend.vue
  6. 17
      src/views/financialsector/CustomerBaseprice.vue
  7. 1112
      src/views/reportforms/DeliveryDetailsVtwo.vue
  8. 18
      src/views/waybill/orderPackageList.vue

38
src/api/aftersales/aftersalesWorkOrder.js
Unescape View File

@ -464,7 +464,7 @@ export const $_updateArbitrateStatu = (data) => {
})
}
// 导出报表
// 导出报表全部
export const $_exportAftersalesWorkOrder = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder',
@ -473,6 +473,42 @@ export const $_exportAftersalesWorkOrder = (params) => {
responseType: 'blob',
})
}
export const $_exportWorkOrder0 = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder0',
method: 'get',
params,
responseType: 'blob',
})
}
// 处理中导出
export const $_exportWorkOrder1 = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder1',
method: 'get',
params,
responseType: 'blob',
})
}
// 理赔金额未出导出
export const $_exportWorkOrder2 = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder2',
method: 'get',
params,
responseType: 'blob',
})
}
// 处理完毕
export const $_exportWorkOrder3 = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder3',
method: 'get',
params,
responseType: 'blob',
})
}
// 查询仓库客服指派信息
export const $_aftersalesCustomerMall = (params) => {

47
src/axios.js
Unescape View File

@ -130,8 +130,9 @@ axios.interceptors.response.use(
const status = res.data.code || res.status;
// 获取状态码白名单内的状态，这些状态不会被默认处理，而是将控制权交给具体请求
const statusWhiteList = website.statusWhiteList || [];
// 取错误消息
const message = res.data.msg || res.data.error_description || '未知错误';
let message = res.data.msg || res.data.error_description || '未知错误';
// 如果状态码在白名单中，则直接返回Promise的reject状态
if (statusWhiteList.includes(status)) return Promise.reject(res);
@ -150,7 +151,12 @@ axios.interceptors.response.use(
},
});
}
// 处理Blob类型的响应
if (res.config.responseType === 'blob') {
return handleBlobResponse(res.data)
.then(() => res)
.catch(error => Promise.reject(error));
}
// 如果response的状态码不是200，则显示消息提示，并返回Promise的reject状态
if (status !== 200 && status !== '0' && status !== '1') {
if (!msg.value) {
@ -187,6 +193,43 @@ axios.interceptors.response.use(
return Promise.reject(error);
}
);
// 定义一个处理Blob响应的函数，返回一个Promise
function handleBlobResponse(blob) {
return new Promise((resolve, reject) => {
let reader = new FileReader();
// 读取Blob内容为文本
reader.readAsText(blob);
reader.onload = function (event) {
let text = event.target.result;
// 检查文本是否为空
if (!text || text.trim() === '') {
console.error('响应内容为空');
ElMessage({
message: '文件导出失败，响应内容为空',
type: 'error',
});
return reject(new Error('文件导出失败，响应内容为空'));
}
// 尝试将文本解析为JSON对象
let status = '';
try {
status = JSON.parse(text);
if (status.code !== 200) {
let message = status.msg || status.data.msg;
ElMessage({
message: message,
type: 'error',
});
return reject(new Error(message));
}
} catch (e) {}
// 如果Blob响应处理成功，则返回resolve
resolve();
};
});
}
// 导出axios实例
export default axios;

82
src/components/Tableexportcomponent/Tableexportcomponent.vue
Unescape View File

@ -1,34 +1,36 @@
<template>
<div class="el_TablePage">
<span>表格导出名称</span>
<el-input
v-model="exportFileName"
placeholder="请输入导出的表格名称,不填写则默认导出名称"
style="margin-bottom: 10px"
/>
<el-dialog v-model="props.tcTableexport" title="本地导出" width="40%" :before-close="beforeclose">
<div class="el_TablePage">
<span>表格导出名称</span>
<el-input
v-model="exportFileName"
placeholder="请输入导出的表格名称,不填写则默认导出名称"
style="margin-bottom: 10px"
/>
<el-tabs v-model="radio" class="el_TablePage_radio">
<el-tab-pane label="当前页全部导出" name="1"></el-tab-pane>
<el-tab-pane label="当前页勾选导出" name="2"></el-tab-pane>
</el-tabs>
<el-tabs v-model="radio" class="el_TablePage_radio">
<el-tab-pane label="当前页全部导出" name="1"></el-tab-pane>
<el-tab-pane label="当前页勾选导出" name="2"></el-tab-pane>
</el-tabs>
<el-transfer
v-model="checkedColumns"
:data="transferData"
:titles="['可选字段', '已选字段']"
:filterable="true"
:props="transferProps"
/>
<div class="el_TablePage_btn">
<el-button type="primary" @click="exportToExcel">
<el-icon><Download /></el-icon>导出表格
</el-button>
<el-transfer
v-model="checkedColumns"
:data="transferData"
:titles="['可选字段', '已选字段']"
:filterable="true"
:props="transferProps"
/>
<div class="el_TablePage_btn">
<el-button type="primary" @click="exportToExcel">
<el-icon><Download /></el-icon>导出表格
</el-button>
</div>
</div>
</div>
</el-dialog>
</template>
<script setup>
import { ref, computed } from 'vue';
import { ref, computed, watch } from 'vue';
import { ElMessage } from 'element-plus';
import * as XLSX from 'xlsx';
import { Download } from '@element-plus/icons-vue';
@ -47,10 +49,32 @@ const props = defineProps({
type: Array,
required: true,
},
tcTableexport: {
type: Boolean,
required: true,
default: false,
},
});
watch(
() => props.tcTableexport,
(newPath, oldPath) => {
menuData.value = JSON.parse(JSON.stringify(props.menuData));
const removeColumn = columnLabel => {
const index = menuData.value.findIndex(item => item.label === columnLabel);
if (index !== -1) {
menuData.value.splice(index, 1);
}
};
initializeCheckedColumns();
// 移除 '序号' 列
removeColumn('序号');
removeColumn('操作');
removeColumn('复选框');
},
{ immediate: true, deep: true }
);
// 将 menuData 复制到一个局部变量中，以便在 setup 中操作
const menuData = ref([...props.menuData]);
const menuData = ref(JSON.parse(JSON.stringify(props.menuData)));
// 移除指定列的函数
const removeColumn = columnLabel => {
const index = menuData.value.findIndex(item => item.label === columnLabel);
@ -126,6 +150,12 @@ const exportToExcel = () => {
// 生成并下载文件
XLSX.writeFile(workbook, `${exportFileName.value}.xlsx`);
};
// 定义一个事件发射器来通知父组件
const emit = defineEmits(['update:tcTableexport']);
const beforeclose = done => {
emit('update:tcTableexport', false);
done();
};
</script>
<style lang="scss" scoped>

212
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -410,13 +410,13 @@
</div>
</div>
<el-dialog v-model="ExportObjects.tcTableexport" title="本地导出" width="40%">
<Tableexportcomponent
:menuData="details.columnListPublic"
:data="data"
:checkedData="details.selectionList"
></Tableexportcomponent>
</el-dialog>
<Tableexportcomponent
:menuData="details.columnListPublic"
:data="data"
:checkedData="details.selectionList"
:tcTableexport="ExportObjects.tcTableexport"
@update:tcTableexport="updateTcTableexport"
></Tableexportcomponent>
<el-dialog
v-model="ExportObjects.ExportSelection"
@ -473,6 +473,7 @@ import {
import { ElMessageBox, ElMessage } from 'element-plus';
import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import { setStore, getStore } from 'utils/store'; // 从 'utils/store' 导入 setStore 和 getStore 方法
import dayjs from 'dayjs';
import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
import {
@ -511,6 +512,10 @@ import {
$_basicdataTripartiteMall,
$_aftersalesCustomerMallgetByClientId,
$_exportaftersalesOvertimeFine,
$_exportWorkOrder0,
$_exportWorkOrder1,
$_exportWorkOrder2,
$_exportWorkOrder3,
} from '@/api/aftersales/aftersalesWorkOrder';
import {
columnList,
@ -572,7 +577,7 @@ const warehouseData = ref([]); //仓库信息
const UserInfo = ref({}); //登陆人信息
const assignFromForm = ref(null); //指派客服表单实例
const dialogSearch = ref(false); //弹窗搜索
const dialogSearchTitle=ref('');//弹出搜索记录
const dialogSearchTitle = ref(''); //弹出搜索记录
const ExportObjects = ref({
tcTableexport: false, //本地导出
ExportSelection: false, //导出选择弹窗
@ -2076,38 +2081,49 @@ const ViewDetails10 = row => {
};
// 全部异常工单号点击查看
const ViewDetailsRow = row => {
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderInfo');
let tagList = getStore({ name: 'tagList' });
console.log(row, '异常工单号点击查看详情当前行数据');
switch (TabPermissions.value) {
case 0:
ViewDetails0(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderInfo');
break;
case 1:
ViewDetails1(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 2:
ViewDetails2(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 3:
ViewDetails3(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 4:
ViewDetails4(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 5:
ViewDetails5(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 6:
ViewDetails6(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 8:
ViewDetails8(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 9:
ViewDetails9(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 10:
ViewDetails10(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
default:
break;
@ -2124,33 +2140,43 @@ const ViewDetails = row => {
switch (TabPermissions.value) {
case 0:
ViewDetails0(row); //全部
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderInfo');
break;
case 1:
ViewDetails1(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 2:
ViewDetails2(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 3:
ViewDetails3(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 4:
ViewDetails4(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 5:
ViewDetails5(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 6:
ViewDetails6(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 8:
ViewDetails8(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 9:
ViewDetails9(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
case 10:
ViewDetails10(row);
$useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
break;
default:
break;
@ -2349,9 +2375,9 @@ const Assignbutton = async () => {
* 5.最终将选择的客服信息,分配给对应的工单
*/
const MultilineSearch = (title, input) => {
dialogSearchTitle.value = title
console.log(dialogSearchTitle.value,'dialogSearchTitle.value');
dialogSearchTitle.value = title;
console.log(dialogSearchTitle.value, 'dialogSearchTitle.value');
if (input) {
const formattedInput = input.split(',').join('\n');
TopQuery.value.inputAll = formattedInput; // 赋值给 inputAll
@ -2390,11 +2416,10 @@ const dialogSearchSubmit = () => {
// 5.将连接起来的数据重新赋值给workOrderNumber
if(dialogSearchTitle.value == '工单号搜索'){
if (dialogSearchTitle.value == '工单号搜索') {
TopQuery.value.workOrderNumbers = joinedLines;
}else if(dialogSearchTitle.value == '订单自编号搜索'){
} else if (dialogSearchTitle.value == '订单自编号搜索') {
TopQuery.value.orderCodes = joinedLines;
}
Searchboxpop.value.dialogSearch = false; //关闭弹窗
@ -2455,7 +2480,6 @@ const ExportSelection = () => {
// 导出表格
const exportReport = () => {
console.log('12312');
ElMessageBox.confirm('是否导出报表?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -2470,28 +2494,32 @@ const exportReport = () => {
if (details.selectionList.length) {
dataID.ids = details.selectionList.map(item => item.id).join(',');
}
$_exportAftersalesWorkOrder(dataID)
.then(res => {
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
console.log(res, '导出');
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
})
.catch(e => {
console.log(e, 'error');
})
.finally(() => {});
JExportAll(dataID);
// switch (TabPermissions.value) {
// case 0:
// ExportAll(dataID); //全部
// break;
// case 1:
// ExportingDuringProcessing(dataID);
// break;
// case 2:
// ProcessedExported(dataID);
// break;
// case 4:
// // 理赔金额未出
// ExportClaimAmount(dataID);
// break;
// default:
// ExportAll(dataID);
// break;
// }
})
.catch(() => {});
};
// 更新本地导出显示状态
const updateTcTableexport = newValue => {
ExportObjects.value.tcTableexport = newValue;
};
// 本地导出
const LocalExport = () => {
ExportObjects.value.tcTableexport = true;
@ -2500,6 +2528,111 @@ const LocalExport = () => {
const NetworkExport = () => {
exportReport();
};
// 旧版本导出
const JExportAll = async dataID => {
try {
PageLoading.value = true;
let res = await $_exportAftersalesWorkOrder(dataID);
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
PageLoading.value = false;
} catch (e) {
console.log(e);
} finally {
}
};
// 全部导出
const ExportAll = async dataID => {
try {
let res = await $_exportWorkOrder0(dataID);
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
} catch (e) {
console.log(e);
} finally {
}
};
// 处理中导出
const ExportingDuringProcessing = async dataID => {
try {
let res = await $_exportWorkOrder1(dataID);
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
} catch (e) {
console.log(e);
} finally {
}
};
// 理赔金未出导出
const ExportClaimAmount = async dataID => {
try {
let res = await $_exportWorkOrder2(dataID);
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
} catch (e) {
console.log(e);
} finally {
}
};
// 处理完毕导出
const ProcessedExported = async dataID => {
try {
let res = await $_exportWorkOrder3(dataID);
const currentDate = new Date();
const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
.toString()
.padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
.getHours()
.toString()
.padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
.getSeconds()
.toString()
.padStart(2, '0')}`;
downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
} catch (e) {
console.log(e);
} finally {
}
};
</script>
<style scoped lang="scss">
@ -2598,6 +2731,7 @@ const NetworkExport = () => {
:deep(.Searchboxpop-upwindow) {
.el-overlay {
position: absolute;
.el-dialog {
min-height: 70%;
}
@ -2627,6 +2761,7 @@ const NetworkExport = () => {
cursor: pointer;
}
}
.el-dialog__footer {
display: flex;
justify-content: center;
@ -2677,8 +2812,15 @@ const NetworkExport = () => {
flex-direction: column;
.el-dialog__body {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: space-evenly;
border-radius: 12px;
.el-button {
width: 30%;
height: 44%;
}
}
}
</style>

90
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -1237,7 +1237,11 @@ const details = reactive({
packageOrderListlVisited: false,
},
});
const Useridentity = {
Warehouse_customer_service: '仓库客服',
Headquarters_customer_service: '总部客服',
Headquarters_Manager: '总部客服经理',
};
const warehouseIdState = ref(false); //当前订单仓库状态
// 字典公共函数
async function updateDictionary(targetArray, dictionaryType) {
@ -1254,17 +1258,23 @@ async function updateDictionary(targetArray, dictionaryType) {
//完结展示权限
const Completedsubmission = () => {
if (UserPermissions.value == '仓库客服' && endFrom.value.arbitrate) {
if (UserPermissions.value == Useridentity.Warehouse_customer_service && endFrom.value.arbitrate) {
return true;
}
if (UserPermissions.value != '仓库客服') {
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
return true;
}
return false;
};
const CompletedPresentation = () => {
if (UserPermissions.value != '仓库客服') {
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['30'].includes($route.query.workOrderStatus)) {
return false;
}
@ -1273,41 +1283,76 @@ const CompletedPresentation = () => {
};
// 处理结果提交权限
const Submissionresults = () => {
if (['10', '20'].includes($route.query.workOrderStatus)) {
return true;
if (
UserPermissions.value == Useridentity.Warehouse_customer_service ||
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['10', '20'].includes($route.query.workOrderStatus)) {
return true;
}
}
return false;
};
// 处理结果保存权限
const Saveresults = () => {
if (['10', '20'].includes($route.query.workOrderStatus)) {
return true;
if (
UserPermissions.value == Useridentity.Warehouse_customer_service ||
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['10', '20'].includes($route.query.workOrderStatus)) {
return true;
}
}
return false;
};
// 处理结果编辑提交
const Processingresultmodification = () => {
if (['90', '21'].includes($route.query.workOrderStatus)) {
return true;
if (
UserPermissions.value == Useridentity.Warehouse_customer_service ||
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['90', '21'].includes($route.query.workOrderStatus)) {
return true;
}
}
return false;
};
// 客服仲裁完结
const Arbitrationcompleted = () => {
if (UserPermissions.value != '仓库客服') {
return false
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
//总部客服、总部客服经理
if ($route.query.workOrderStatus == '10') {
return true;
}
}
return false;
};
// 处理结果是否可以填写
const Processingresultdisabled = () => {
if (['10', '20', '90'].includes($route.query.workOrderStatus)) {
return true;
if (
UserPermissions.value == Useridentity.Warehouse_customer_service ||
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['10', '20', '90'].includes($route.query.workOrderStatus)) {
return true;
}
}
return false;
};
// 修改提交权限
const isInformationEditing = () => {
if (UserPermissions.value == '仓库客服' && warehouseIdState.value) {
if (UserPermissions.value == Useridentity.Warehouse_customer_service && warehouseIdState.value) {
// 仓库客服
if (['10', '20', '90'].includes($route.query.workOrderStatus)) {
return true;
}
@ -1316,7 +1361,8 @@ const isInformationEditing = () => {
};
// 完结审核打回权限
const isRepulse = () => {
if (UserPermissions.value == '总部客服经理') {
if (UserPermissions.value == Useridentity.Headquarters_Manager) {
// 总部客服经理
if (['40', '80'].includes($route.query.workOrderStatus)) {
return true;
}
@ -1325,7 +1371,10 @@ const isRepulse = () => {
};
// 完结待审核确定权限
const isProcessingConfirmation = () => {
if (UserPermissions.value != '仓库客服') {
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['40'].includes($route.query.workOrderStatus)) {
return true;
}
@ -1334,7 +1383,10 @@ const isProcessingConfirmation = () => {
};
// 完结提交权限
const Headquarterscompletion = () => {
if (UserPermissions.value != '仓库客服') {
if (
UserPermissions.value == Useridentity.Headquarters_customer_service ||
UserPermissions.value == Useridentity.Headquarters_Manager
) {
if (['30'].includes($route.query.workOrderStatus)) {
return true;
}
@ -1343,7 +1395,7 @@ const Headquarterscompletion = () => {
};
//申诉驳回
const AppealRejectionButton = () => {
if (UserPermissions.value == '总部客服经理') {
if (UserPermissions.value == Useridentity.Headquarters_Manager) {
if ($route.query.typesOf == '0') {
return true;
}
@ -1352,7 +1404,7 @@ const AppealRejectionButton = () => {
};
// 申诉成立
const AppealEstablishmentButton = () => {
if (UserPermissions.value == '总部客服经理') {
if (UserPermissions.value == Useridentity.Headquarters_Manager) {
if ($route.query.typesOf == '0') {
return true;
}

17
src/views/financialsector/CustomerBaseprice.vue
Unescape View File

@ -24,7 +24,7 @@
<el-icon><Delete /></el-icon>删 除</el-button
>
<el-button type="primary" @click="Tableexport">
<el-icon><Delete /></el-icon>导 出</el-button
<el-icon><Download /></el-icon>导 出</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
@ -82,9 +82,14 @@
</el-row>
</div>
</basic-container>
<el-dialog v-model="tcTableexport" title="导出" width="40%">
<Tableexportcomponent :menuData="details.columnList" :data="data"></Tableexportcomponent>
</el-dialog>
<Tableexportcomponent
:menuData="details.columnList"
:data="data"
:checkedData="details.selectionList"
:tcTableexport="tcTableexport"
@update:tcTableexport="updateTcTableexport"
></Tableexportcomponent>
<!-- 列表配置显示 -->
<edittablehead
@closce="showdrawer"
@ -361,7 +366,9 @@ const Deletetemplate = () => {
details.loadingObj.list = false;
});
};
const updateTcTableexport=(newValue)=>{
tcTableexport.value = newValue;
}
// 修改模板
const Modifytemplate = row => {
console.log(row);

1112
src/views/reportforms/DeliveryDetailsVtwo.vue
View File

File diff suppressed because it is too large Load Diff

18
src/views/waybill/orderPackageList.vue
Unescape View File

@ -273,12 +273,14 @@
width="780px"
:html="details.html"
/>
<el-dialog v-model="tcTableexport" title="导出" width="40%">
<Tableexportcomponent
:menuData="details.packageListColumnList"
:data="details.packageListData"
></Tableexportcomponent>
</el-dialog>
<Tableexportcomponent
:menuData="details.packageListColumnList"
:data="details.packageListData"
:checkedData="details.selectionList"
:tcTableexport="tcTableexport"
@update:tcTableexport="updateTcTableexport"
></Tableexportcomponent>
<!-- 列表配置显示 -->
<edittablehead
@closce="showdrawer"
@ -753,7 +755,9 @@ const handlePutInStorage = ({ row }) => {
})
.catch(() => {});
};
const updateTcTableexport = newValue => {
tcTableexport.value = newValue;
};
/** 批量入库 */
const handleBatchPutInStorage = () => {
if (details.selectionList.length === 0) return ElMessage.error('最少选择一条数据');

Write Preview
Loading…
Cancel
Save