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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

dev-xx
qb 5 months ago
parent
4d307d3744 a7a39872ac
commit
b1e756328a
4 changed files with 283 additions and 155 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. 11
      src/option/aftersales/vueTvemp.js
  2. 121
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  3. 206
      src/views/aftersales/aftersalesWorkOrderTemp.vue
  4. 100
      src/views/aftersales/aftersalesWorkOrderend.vue

11
src/option/aftersales/vueTvemp.js
Unescape View File

@ -340,6 +340,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'ceator',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'remarks',

121
src/views/aftersales/aftersalesWorkOrderInfo.vue
Unescape View File

@ -567,7 +567,10 @@
<el-button type="primary" v-if="PermissionButton.Processing_results" @click="addingRecord"
>处理结果
</el-button>
<el-button type="primary" v-if="PermissionButton.Processing_resultsSub" @click="addingRecord"
<el-button
type="primary"
v-if="PermissionButton.Processing_resultsSub"
@click="addingRecord"
>处理结果提交
</el-button>
<!-- <el-button type="primary" v-if="PermissionButton.Confirm_review" @click="ConfirmReview"
@ -679,7 +682,7 @@
<el-icon> <ChatRound /> </el-icon>:<span> {{ item.content }}</span>
</div>
<div class="img" v-if="item.img">
<!-- <div class="img" v-if="item.img">
<el-image
:src="item.img"
:zoom-rate="1.2"
@ -689,6 +692,19 @@
:initial-index="4"
fit="cover"
/>
</div> -->
<div class="img" v-if="item.img">
<el-image
v-for="(item, index) in item.imgList"
:key="index"
:src="item"
:zoom-rate="1.2"
:max-scale="7"
:min-scale="0.2"
:preview-src-list="[item]"
:initial-index="4"
fit="cover"
/>
</div>
<div class="mp4" @click="AddVideoPreview(index)" v-if="item.mp4">
<span
@ -1000,19 +1016,27 @@ onMounted(() => {
// appeal.value && AppealReview.value,
// 文件识别
const Fileidentifier = val => {
const url = val;
const fileName = url.substring(url.lastIndexOf('/') + 1);
const extension = fileName.substring(fileName.lastIndexOf('.') + 1);
if (extension === 'mp4') {
return 'mp4';
}
if (extension === 'png') {
return 'png';
}
if (extension === 'docx') {
return 'docx';
if (val) {
const url = val;
// 获取文件名
const fileName = url.substring(url.lastIndexOf('/') + 1);
// 获取文件扩展名
const extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
// 判断文件类型
if (extension === 'mp4') {
return 'mp4';
}
if (extension === 'png' || extension === 'jpg' || extension === 'jpeg') {
return 'image'; // 可以将 'png' 改为 'image' 来统一表示图片类型
}
if (extension === 'docx') {
return 'docx';
}
// 针对其他扩展名的情况返回 undefined
return undefined;
}
return undefined; // 针对其他扩展名的情况返回 undefined
};
// 聊天记录获取
const Chathistory = res => {
@ -1023,23 +1047,55 @@ const Chathistory = res => {
})
.then(res => {
MessageContent.value = []; //先清空内容，防止内容重复叠加
// res.data.data.surveyRecordEntities.forEach(item => {
// if (item.pictureUrl) {
// filetype = Fileidentifier(item.pictureUrl);
// }
// MessageContent.value.push({
// time: item.createTime, //时间
// content: item.processingResults, //消息内容
// name: item.addDepartment, //营业部名称
// username: item.processorName, //用户名
// img: filetype == 'image' ? item.pictureUrl : '',
// file: filetype == 'docx' ? item.pictureUrl : '',
// mp4: filetype == 'mp4' ? item.pictureUrl : '',
// imgList: [filetype === 'png' ? item.pictureUrl : ''],
// difference: item.difference,
// identifying: false, //待回复标识
// });
// });
res.data.data.surveyRecordEntities.forEach(item => {
if (item.pictureUrl) {
filetype = Fileidentifier(item.pictureUrl);
const filetype = Fileidentifier(item.pictureUrl);
console.log(filetype, '文件类型');
// 处理图片列表，根据分隔符（假设是 ';'）拆分
let imgList = [];
if (filetype === 'image') {
// 如果包含多个图片URL，拆分处理
if (item.pictureUrl.includes(',')) {
imgList = item.pictureUrl.split(',').filter(url => url.trim() !== '');
} else {
// 单个图片的情况
imgList = [item.pictureUrl];
}
}
// 构造消息内容
MessageContent.value.push({
time: item.createTime, //时间
content: item.processingResults, //消息内容
name: item.addDepartment, //营业部名称
username: item.processorName, //用户名
img: filetype == 'png' ? item.pictureUrl : '',
file: filetype == 'docx' ? item.pictureUrl : '',
mp4: filetype == 'mp4' ? item.pictureUrl : '',
imgList: [filetype === 'png' ? item.pictureUrl : ''],
time: item.createTime, // 时间
content: item.processingResults, // 消息内容
name: item.addDepartment, // 营业部名称
username: item.processorName, // 用户名
img: imgList.length > 0 ? imgList[0] : '', // 只显示第一个图片（如果有多个）
file: filetype === 'docx' ? item.pictureUrl : '',
mp4: filetype === 'mp4' ? item.pictureUrl : '',
imgList: imgList, // 包含所有图片的列表
difference: item.difference,
identifying: false, //待回复标识
identifying: identifying, // 是否显示待回复按钮
});
});
setTimeout(() => {
const container = scrollContainer.value;
if (container) {
@ -1167,10 +1223,9 @@ const onLoad = async () => {
} else {
warehouseIdState.value = false;
}
console.log(res.data.data.createUser,'工单创建人');
console.log(userInfo.content.user_id,'系统登录人');
console.log(res.data.data.createUser, '工单创建人');
console.log(userInfo.content.user_id, '系统登录人');
Indexform.value['result'] = [];
Indexform.value['processor'] = [];
Indexform.value['processorEntityList'] = []; //责任方
@ -1236,11 +1291,11 @@ const onLoad = async () => {
console.log(res, '发现环节');
ProcessingResults.value = res.data.data;
});
// 处理结果回显
// 处理结果回显
if (res.data.data.processingResultsVO.processingMoneyEntityList) {
ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
item => {
Indexform.value.result.push(item.resultType);
Indexform.value.result.push(item.resultType);
return {
money: item.money + '元',
state: item.resultType,
@ -1339,12 +1394,12 @@ const isProcessingResults = () => {
}
return false;
};
const isProcessingResultssub=()=>{
const isProcessingResultssub = () => {
if (workOrderStatus == '90') {
return true;
}
return false;
}
};
//完结工单权限
const isWorkOrderCompletion = () => {

206
src/views/aftersales/aftersalesWorkOrderTemp.vue
Unescape View File

@ -80,9 +80,21 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
<el-tooltip content="刷新数据" placement="top">
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
</el-tooltip>
<el-tooltip content="重置表格搜索" placement="left">
<el-button icon="CircleClose" @click="ResetTableSearch" circle></el-button>
</el-tooltip>
<el-tooltip content="表格设置" placement="bottom">
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
</el-tooltip>
<el-tooltip content="高级搜索" placement="bottom">
<el-button icon="Search" @click="searchHide" circle></el-button>
</el-tooltip>
</div>
</div>
</el-row>
@ -139,13 +151,17 @@
</div>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
<!-- <edittablehead
v-for="columnList in columnLists"
:key="columnList"
v-show="columnListName == columnList"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="details.columnListPublic"
v-model="details.columnListPublic"
:columnListName="columnListName"
></edittablehead>
></edittablehead> -->
</template>
<script>
export default {
@ -242,6 +258,19 @@ const UserPermissions = ref(''); //当前人身份
const workOrderStatus = ref(30); //工单状态
const PageLoading = ref(false); //页面loading
const columnListName = ref('columnList');
const columnLists = [
'columnList',
'columnList1',
'columnList2',
'columnList3',
'columnList4',
'columnList5',
'columnList6',
'columnList7',
'columnList8',
'columnList9',
'columnList10',
];
/**
* 人身份
* Warehouse_customer_service 仓库客服
@ -581,11 +610,13 @@ const showdrawer = _flag => {
};
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
console.log(details.query, 'details.query');
let _Obj = MatchCurrentMenu(); //匹配出当前菜单
_Obj.request = true; //更新请求状态
_Obj.query = deepClone(details.query);
_Obj.query = details.query;
processRowPropertyName(index, row, _Obj.query);
tabChenge(TabPermissions.value); //获取页面数据
PublicDataRequest(TabPermissions.value); //获取页面数据
};
/** 表格表头时间选择 */
@ -613,7 +644,7 @@ const selectionChange = list => {
};
// 网页顶部搜索按钮
const searchChange = () => {
tabChenge();
PublicDataRequest();
};
// 刷新按钮
@ -621,16 +652,21 @@ const searchChangeS = () => {
details.search = false; //关闭搜索
let _Obj = MatchCurrentMenu();
_Obj.request = true;
tabChenge(TabPermissions.value);
PublicDataRequest(TabPermissions.value);
};
//清空
const searchReset = () => {
details.query = {};
details.page.currentPage = 1;
handleClearTableQuery(details.columnList);
onLoad();
// 重置表格搜索
const ResetTableSearch = async () => {
let _Obj = MatchCurrentMenu();
_Obj.request = true;
await handleClearTableQuery(details.columnListPublic);
let _query = await getQuery(); //查询条件
console.log(_query, '查询条件');
_Obj = {};
_query = {};
PublicDataRequest(TabPermissions.value, true);
};
//清空
const searchReset = () => {};
// 顶部搜索
const searchHide = () => {
console.log(details);
@ -709,7 +745,9 @@ const Roleverification = () => {
console.log('内部执行完毕');
console.log(matchingItem, '匹配出来的角色');
};
onMounted(() => {
autoscaling();
})
// 页面初始化请求
const onLoad = () => {};
/**
@ -720,7 +758,7 @@ const PageOnlaod = async () => {
try {
await Dictionaryrequest(); //初始化字典
await Roleverification(); //获取角色信息
tabChenge(TabPermissions.value); //获取页面数据
PublicDataRequest(TabPermissions.value); //获取页面数据
} catch (error) {
console.log(error);
}
@ -756,11 +794,16 @@ const PagingDataProcessing = () => {
* @param {number} value 当前点击的tab的value
* @return {void} 无返回值
*/
const tabChenge = async value => {
const tabChenge = async (value, Reset) => {
let _Obj = await MatchCurrentMenu(); //匹配出上一个菜单
_Obj.query = await deepClone(details.query); //把上一个菜单的搜索条件缓存起来
TabPermissions.value = value; //记录最新的菜单
PublicDataRequest(value, Reset); //请求数据
};
const PublicDataRequest = async (value, Reset) => {
try {
TabPermissions.value = value; // 记录当前点击的菜单
await MenuHeaderProcessing(value); // 处理头部菜单
await Processingworkorderstatus(value); // 处理工单状态
await Processingworkorderstatus(value); // 处理工单请求状态
// 判断是否需要请求数据{_state}返回true表示需要false表示不需要
let _state = PagingDataProcessing();
if (!_state) {
@ -785,7 +828,7 @@ const tabChenge = async value => {
// 执行对应的函数
const processDataFn = dataProcessingMap[value] || Publicaccessdata;
await processDataFn(); // 使用await确保完成
await processDataFn(Reset); // 使用await确保完成
} catch (error) {
console.error('An error occurred:', error);
} finally {
@ -844,7 +887,7 @@ const sizeChange = value => {
_Obj.pageSize = value; //更新菜单每页条数
_Obj.currentPage = 1; //切换每页条数的时候重置页码
updatePageDetails(value, 1); //更新页码
tabChenge(TabPermissions.value);
PublicDataRequest(TabPermissions.value);
};
/** 页码改变执行的回调 */
@ -853,36 +896,36 @@ const currentChange = value => {
_Obj.request = true; //更新请求状态
_Obj.currentPage = value; //更新当前菜单页码
updatePageDetails(_Obj.pageSize, value); //更新分页信息
tabChenge(TabPermissions.value); //请求数据
PublicDataRequest(TabPermissions.value); //请求数据
};
/**
* @description: 公共菜单数据处理
* @param {object} data 接收公共菜单数据
*/
const PublicDataProcessing = data => {
const PublicDataProcessing = data => {
const { records, total, size, current } = data;
const matchedTab = TabList.value.find(tab => tab.name === TabPermissions.value);
// 更新 details 数据
details.data = records;
details.page = {
total,
pageSize: size,
currentPage: current
currentPage: current,
};
// 更新匹配的 TabList 项
const matchedTab = TabList.value.find(tab => tab.name === TabPermissions.value);
if (matchedTab) {
details.query = matchedTab.query; //重新把缓存的条件赋值给搜索
console.log(matchedTab.query, '重新把缓存的条件赋值给搜索');
Object.assign(matchedTab, {
DataList: records,
total,
pageSize: size,
currentPage: current,
request: !(records?.length > 0),//如果有值状态改为false下次默认不请求，否则true下次继续请求
request: !(records?.length > 0), //如果有值状态改为false下次默认不请求，否则true下次继续请求
});
console.log(matchedTab, '匹配出来的公共菜单');
}
@ -975,110 +1018,68 @@ const getQuery = () => {
};
/**
* @description: 待回复菜单数据请求
* @return {Object} 包含待回复菜单数据的对象
* @description 通用函数用于处理数据请求（包含待回复、理赔金额未出、申诉、超时未处理）
* @param {Function} fetchFunction - 用于执行具体数据请求的函数
* @param {boolean} [reset=false] - 控制是否重置查询条件的标志，默认值为 false
* @returns {Promise<void>} 不返回任何内容，仅执行数据请求和处理
*/
const DataAwaitingReplyData = async () => {
const fetchData = async (fetchFunction, reset) => {
try {
let _submitData = {
current: details.page.currentPage, //页码
size: details.page.pageSize, //条数
...getQuery(), //查询条件
current: details.page.currentPage, // 页码
size: details.page.pageSize, // 条数
...(reset ? {} : getQuery()), // 查询条件，条件重置根据 reset 标志
};
let _res = await $_getProcessor(_submitData);
console.log(_res, '待回复菜单数据请求');
let _res = await fetchFunction(_submitData);
console.log(_res);
const { code, data } = _res.data;
if (code !== 200) {
return;
}
DataAndStateProcessing(data); //对数据和状态处理
DataAndStateProcessing(data); // 对数据和状态处理
} catch (error) {
console.log(error);
} finally {
}
};
/**
* @description: 待回复菜单数据请求
*/
const DataAwaitingReplyData = async Reset => {
await fetchData($_getProcessor, Reset);
};
/**
* @description: 理赔金额未出菜单数据请求
* @return {Object} 包含待回复菜单数据的对象
*/
const ClaimAmountData = async () => {
try {
let _Obj = MatchCurrentMenu(); //匹配当前菜单传入当前菜单搜索条件
let _submitData = {
current: details.page.currentPage, //页码
size: details.page.pageSize, //条数
...getQuery(), //查询条件
};
let _res = await $_listSettlement(_submitData);
console.log(_res, '理赔金额未出菜单数据请求');
const { code, data } = _res.data;
if (code !== 200) {
return;
}
DataAndStateProcessing(data); //对数据和状态处理
} catch (error) {
console.log(error);
} finally {
}
const ClaimAmountData = async Reset => {
await fetchData($_listSettlement, Reset);
};
/**
* @description: 申诉菜单数据请求
* @return {Object} 包含申诉菜单数据的对象
*/
const AppealData = async () => {
try {
let _Obj = MatchCurrentMenu(); //匹配当前菜单传入当前菜单搜索条件
let _submitData = {
current: details.page.currentPage, //页码
size: details.page.pageSize, //条数
...getQuery(), //查询条件
};
let _res = await $_listAppeal(_submitData);
console.log(_res, '申诉列表菜单数据请求');
const { code, data } = _res.data;
if (code !== 200) {
return;
}
DataAndStateProcessing(data); //对数据和状态处理
} catch (error) {
console.log(error);
} finally {
}
const AppealData = async Reset => {
await fetchData($_listAppeal, Reset);
};
/**
* @description: 超时未处理菜单数据请求
* @return {Object} 包含超时未处理菜单数据的对象
*/
const OverdueUnprocessedData = async () => {
try {
let _submitData = {
current: details.page.currentPage, //页码
size: details.page.pageSize, //条数
...getQuery(), //查询条件
};
let _res = await $_listOwn(_submitData);
console.log(_res, '超时未处理表菜单数据请求');
const { code, data } = _res.data;
if (code !== 200) {
return;
}
DataAndStateProcessing(data); //对数据和状态处理
} catch (error) {
console.log(error);
} finally {
}
const OverdueUnprocessedData = async Reset => {
await fetchData($_listOwn, Reset);
};
/**
* @description: 公共数据请求，包含全部、待处理、处理中、处理完毕、客服介入、待审核、完结
*/
const Publicaccessdata = async () => {
const Publicaccessdata = async Reset => {
try {
let _submitData = {
workOrderStatus: workOrderStatus.value, //工单状态
current: details.page.currentPage, //页码
size: details.page.pageSize, //条数
...getQuery(), //查询条件
...(Reset ? {} : getQuery()), // 查询条件，条件重置根据 reset 标志
};
let _res = await $_getList(_submitData);
const { code, data } = _res.data;
@ -1087,6 +1088,7 @@ const Publicaccessdata = async () => {
}
DataAndStateProcessing(data); //对数据和状态处理
console.log(_res, '公共数据菜单=:' + TabPermissions.value);
console.log(TabList.value, '公共菜单');
} catch (error) {
console.log(error);
} finally {

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

@ -536,7 +536,7 @@
<el-tabs
type="border-card"
:class="{
'Reason_arbitration_tip': ReasonarbClass,
Reason_arbitration_tip: ReasonarbClass,
'demo-tabs Reason_arbitration': true,
}"
>
@ -744,11 +744,13 @@
<div class="img" v-if="item.img">
<el-image
:src="item.img"
v-for="(item, index) in item.imgList"
:key="index"
:src="item"
:zoom-rate="1.2"
:max-scale="7"
:min-scale="0.2"
:preview-src-list="item.imgList"
:preview-src-list="[item]"
:initial-index="4"
fit="cover"
/>
@ -805,7 +807,8 @@
:action="doubledCount"
:headers="headers"
:on-success="fellSuccess"
:limit="1"
:limit="3"
multiple
>
<template #trigger>
<el-button type="primary" class="el-fil">上传附件</el-button>
@ -1356,7 +1359,7 @@ const onLoad = async () => {
}
});
FangAddList.value.forEach(item => {
item.responsibilityRatio = item.responsibilityRatio + '%';
item.responsibilityRatio =item.responsibilityRatio? item.responsibilityRatio + '%':item.responsibilityRatio;
});
}
companyProportion.value = 100 - sum;
@ -1455,18 +1458,24 @@ watch($route, (to, from) => {
const Fileidentifier = val => {
if (val) {
const url = val;
// 获取文件名
const fileName = url.substring(url.lastIndexOf('/') + 1);
const extension = fileName.substring(fileName.lastIndexOf('.') + 1);
// 获取文件扩展名
const extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
// 判断文件类型
if (extension === 'mp4') {
return 'mp4';
}
if (extension === 'png') {
return 'png';
if (extension === 'png' || extension === 'jpg' || extension === 'jpeg') {
return 'image'; // 可以将 'png' 改为 'image' 来统一表示图片类型
}
if (extension === 'docx') {
return 'docx';
}
return undefined; // 针对其他扩展名的情况返回 undefined
// 针对其他扩展名的情况返回 undefined
return undefined;
}
};
// 聊天记录获取
@ -1477,23 +1486,68 @@ const Chathistory = res => {
Msgtextarea.value = ''; //清空输入框消息
MessageContent.value = []; //先清空内容，防止内容重复叠加
// const updateMessageContent = (records, identifying) => {
// records.forEach(item => {
// const filetype = Fileidentifier(item.pictureUrl);
// console.log(filetype, '文件类型');
// MessageContent.value.push({
// time: item.createTime, //时间
// content: item.processingResults, //消息内容
// name: item.addDepartment, //营业部名称
// username: item.processorName, //用户名
// img: filetype === 'png' ? item.pictureUrl : '',
// file: filetype === 'docx' ? item.pictureUrl : '',
// mp4: filetype === 'mp4' ? item.pictureUrl : '',
// imgList: [filetype === 'png' ? item.pictureUrl : ''],
// difference: item.difference,
// identifying: identifying, //是否显示待回复按钮
// });
// });
// console.log( MessageContent.value,' MessageContent.value');
// setTimeout(() => {
// const container = scrollContainer.value;
// if (container) {
// container.scrollTop = container.scrollHeight;
// }
// }, 0);
// };
const updateMessageContent = (records, identifying) => {
records.forEach(item => {
const filetype = Fileidentifier(item.pictureUrl);
console.log(filetype, '文件类型');
// 处理图片列表，根据分隔符（假设是 ';'）拆分
let imgList = [];
if (filetype === 'image') {
// 如果包含多个图片URL，拆分处理
if (item.pictureUrl.includes(',')) {
imgList = item.pictureUrl.split(',').filter(url => url.trim() !== '');
} else {
// 单个图片的情况
imgList = [item.pictureUrl];
}
}
// 构造消息内容
MessageContent.value.push({
time: item.createTime, //时间
content: item.processingResults, //消息内容
name: item.addDepartment, //营业部名称
username: item.processorName, //用户名
img: filetype === 'png' ? item.pictureUrl : '',
time: item.createTime, // 时间
content: item.processingResults, // 消息内容
name: item.addDepartment, // 营业部名称
username: item.processorName, // 用户名
img: imgList.length > 0 ? imgList[0] : '', // 只显示第一个图片（如果有多个）
file: filetype === 'docx' ? item.pictureUrl : '',
mp4: filetype === 'mp4' ? item.pictureUrl : '',
imgList: [filetype === 'png' ? item.pictureUrl : ''],
imgList: imgList, // 包含所有图片的列表
difference: item.difference,
identifying: identifying, //是否显示待回复按钮
identifying: identifying, // 是否显示待回复按钮
});
});
console.log(MessageContent.value, 'MessageContent.value');
// 滚动到容器底部
setTimeout(() => {
const container = scrollContainer.value;
if (container) {
@ -1501,7 +1555,6 @@ const Chathistory = res => {
}
}, 0);
};
const handleError = error => {
console.log(error, 'error');
};
@ -2771,11 +2824,18 @@ const CustomerServiceCompleted = () => {
font-size: 12px;
}
.img {
width: 50px;
height: 50px;
width: 100%;
height:20%;
overflow: scroll;
.el-image{
width: 20%;
height: 100%;
margin: 4px;
}
img {
width: 100%;
height: 100%;
height: 50px;
}
}
.mp4 {

Write Preview
Loading…
Cancel
Save