Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 months ago
parent
commit
cd6b65381c
  1. 4
      src/utils/print.js
  2. 41
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 6
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 148
      src/views/aftersales/aftersalesWorkOrderTemp.vue

4
src/utils/print.js

@ -25,8 +25,8 @@ const handleDeliveryPrint = (LODOP, templateData) => {
// LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
// // 设置打印整宽且不变形 // // 设置打印整宽且不变形
LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%'); LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%');
// LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, ''); LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, '');
LODOP.SET_PRINT_PAGESIZE(1, 240 + 'mm', 139.7 + 'mm', ''); // LODOP.SET_PRINT_PAGESIZE(1, 240 + 'mm', 139.7 + 'mm', '');
// // 设置打印后自动关闭 // // 设置打印后自动关闭
LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);

41
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -354,12 +354,13 @@
</el-form-item> </el-form-item>
<!-- 初始必填 --> <!-- 初始必填 -->
<div class="el_Basic">
<el-form-item <el-form-item
label="处理方" label="处理方"
prop="basis.processor" prop="basis.processor"
class="el_Processing" class="el_Processing"
v-if="displaySettings.processor" v-if="displaySettings.processor"
style="width: 34.3%"
> >
<el-select <el-select
v-model="form.basis.processor" v-model="form.basis.processor"
@ -382,7 +383,7 @@
<el-form-item <el-form-item
label="调查经过" label="调查经过"
prop="basis.investigationProcess" prop="basis.investigationProcess"
class="el_Investigation" class="el_Investigation_process"
clearable clearable
v-if="displaySettings.investigationProcess" v-if="displaySettings.investigationProcess"
> >
@ -390,12 +391,11 @@
v-model="form.basis.investigationProcess" v-model="form.basis.investigationProcess"
placeholder="请输调查经过" placeholder="请输调查经过"
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 10 }" :autosize="{ minRows: 2, maxRows: 10 }"
clearable clearable
/> />
</el-form-item> </el-form-item>
</div> </div>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 内部责任划分 --> <!-- 内部责任划分 -->
@ -1574,15 +1574,12 @@ const onSubmit = () => {
).label; // ).label; //
data.businessId = item.businessId; //id data.businessId = item.businessId; //id
} else { } else {
data.personResponsibleId = Responsibleperson ? Responsibleperson.id : null; //id data.personResponsibleId = Responsibleperson ? Responsibleperson.id : null; //id
data.personResponsibleName = Responsibleperson data.personResponsibleName = Responsibleperson
? Responsibleperson.name ? Responsibleperson.name
: item.personResponsibleId; // : item.personResponsibleId; //
data.businessName = item.Responsibleoptions.find( data.businessName =
res => res.value == item.businessId item.Responsibleoptions.find(res => res.value == item.businessId)?.label || ''; //
)?.label || ''; //
data.businessId = item.businessId; //id data.businessId = item.businessId; //id
} }
// ID // ID
@ -1631,9 +1628,8 @@ const onSubmit = () => {
); );
} }
submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({ submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
compensationMethodName: item.Paymentmethod.find( compensationMethodName:
res => res.value == item.compensationMethod item.Paymentmethod.find(res => res.value == item.compensationMethod)?.label || '', //
)?.label ||'', //
compensationMethod: item.compensationMethod, //value compensationMethod: item.compensationMethod, //value
compensationTime: item.compensationTime, // compensationTime: item.compensationTime, //
money: item.money, // money: item.money, //
@ -1856,24 +1852,6 @@ const TabactiveClick = (a, b) => {
margin-bottom: 0; margin-bottom: 0;
} }
} }
.el_Basic {
flex: 1;
display: flex;
min-width: 32%;
.el_Processing {
min-width: 50%;
}
:deep(.el_Investigation) {
flex: 1;
}
// :deep(.is-error) {
// .el-input--suffix {
// .el-textarea__inner:focus {
// box-shadow: 0 0 0 1px #ff0000 inset !important;
// }
// }
// }
}
} }
.responsibilities { .responsibilities {
:deep(.el-upload-dragger) { :deep(.el-upload-dragger) {
@ -2039,4 +2017,7 @@ const TabactiveClick = (a, b) => {
top: 10%; top: 10%;
background-color: #ffffffc2; background-color: #ffffffc2;
} }
.el_Investigation_process {
min-width: 100%;
}
</style> </style>

6
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -1697,7 +1697,7 @@ const CustomerServiceCompleted = () => {
id: $route.query.id, id: $route.query.id,
name: $route.query.workOrderNumber + '-客服仲裁完结', name: $route.query.workOrderNumber + '-客服仲裁完结',
businessId: $route.query.businessId, businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId, // warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber, workOrderNumber: $route.query.workOrderNumber,
RouterState: 'Kfend', RouterState: 'Kfend',
workOrderStatus: $route.query.workOrderStatus, // workOrderStatus: $route.query.workOrderStatus, //
@ -1716,7 +1716,7 @@ const EditInformation = () => {
id: $route.query.id, id: $route.query.id,
name: $route.query.workOrderNumber + '-编辑', name: $route.query.workOrderNumber + '-编辑',
businessId: $route.query.businessId, businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId, // warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber, workOrderNumber: $route.query.workOrderNumber,
RouterState: 'Infoedit', RouterState: 'Infoedit',
workOrderStatus: $route.query.workOrderStatus, // workOrderStatus: $route.query.workOrderStatus, //
@ -1731,7 +1731,7 @@ const AppealEstablished = () => {
id: $route.query.id, //idworkOrderId id: $route.query.id, //idworkOrderId
name: $route.query.workOrderNumber + '-申诉编辑', name: $route.query.workOrderNumber + '-申诉编辑',
businessId: $route.query.businessId, businessId: $route.query.businessId,
warehouseId: $route.query.warehouseId, // warehouseId: $route.query.warehouseId,
workOrderNumber: $route.query.workOrderNumber, workOrderNumber: $route.query.workOrderNumber,
RouterState: 'Kfend', RouterState: 'Kfend',
workOrderStatus: $route.query.workOrderStatus, // workOrderStatus: $route.query.workOrderStatus, //

148
src/views/aftersales/aftersalesWorkOrderTemp.vue

@ -37,7 +37,13 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" icon="Edit" v-if="ButtonPermissions.add">创建工单</el-button> <el-button
type="primary"
icon="Edit"
v-if="ButtonPermissions.add"
@click="CreateworkOrder"
>创建工单</el-button
>
<el-button type="primary" icon="Download" v-if="ButtonPermissions.export_Report" <el-button type="primary" icon="Download" v-if="ButtonPermissions.export_Report"
>Excel导出</el-button >Excel导出</el-button
> >
@ -114,7 +120,7 @@
> >
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '异常工单号'"> <template v-if="slotProps.scope.column.label === '异常工单号'">
<el-text class="el_textBtn" @click="InformationViewing(slotProps.scope)"> <el-text class="el_textBtn" @click="ViewDetailsRow(slotProps.scope.row)">
{{ {{
slotProps.scope.column.label === '异常工单号' slotProps.scope.column.label === '异常工单号'
? slotProps.scope.row.workOrderNumber ? slotProps.scope.row.workOrderNumber
@ -124,7 +130,7 @@
</template> </template>
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<el-text>查看</el-text> <el-text @click="ViewDetails(slotProps.scope.row)">查看</el-text>
</template> </template>
</template> </template>
</tablecmt> </tablecmt>
@ -629,13 +635,15 @@ const timesc = (index, row) => {
if (!index) { if (!index) {
delete details.query[row.prop]; delete details.query[row.prop];
} }
onLoad();
}; };
/** 表格表头下拉框选择 */ /** 表格表头下拉框选择 */
const selectsc = (index, row) => { const selectsc = (index, row) => {
processRowPropertyName(index, row, details.query); let _Obj = MatchCurrentMenu(); //
onLoad(); _Obj.request = true; //
_Obj.query = details.query;
processRowPropertyName(index, row, _Obj.query);
PublicDataRequest(TabPermissions.value); //
}; };
/** 表格表头复选框选择 */ /** 表格表头复选框选择 */
const selectionChange = list => { const selectionChange = list => {
@ -690,6 +698,48 @@ const autoscaling = () => {
const _node = document.querySelector('.tableNode'); const _node = document.querySelector('.tableNode');
setNodeHeight(_node, '', true); setNodeHeight(_node, '', true);
}; };
/**
* 该函数将 columnList - columnList10 等十一个表头对象的
* checkarr 属性赋值为对应的字典数组
* @param {Array} columnLists - 一个包含 columnList - columnList10 等十一个对象的数组
* @param {Object} propToDictionaryMap - 一个对象键为 columnList 对象的 prop 属性值为对应的字典数组
*/
const SelectionInitialization = () => {
const columnLists = [
columnList,
columnList1,
columnList2,
columnList3,
columnList4,
columnList5,
columnList6,
columnList7,
columnList8,
columnList9,
columnList10,
];
// if-else
const propToDictionaryMap = {
workOrderTypeNameS: dictionaries.pc_work_order.value,
discoveryNodeNameS: dictionaries.pc_discovery_node.value,
workOrderStatusNameS: dictionaries.work_order_status.value,
};
const functionIF = item => {
//
const filteredData = item.filter(item => item.type === 3);
filteredData.forEach(item => {
const checkarr = propToDictionaryMap[item.prop];
if (checkarr) {
item.checkarr = checkarr;
}
});
};
columnLists.forEach(functionIF);
};
/** /**
* 描述: 初始化字典包含角色信息异常类型发现环节工单状态 * 描述: 初始化字典包含角色信息异常类型发现环节工单状态
@ -747,26 +797,27 @@ const Roleverification = () => {
}; };
onMounted(() => { onMounted(() => {
autoscaling(); autoscaling();
}) });
//
const onLoad = () => {};
/** /**
*页面初始化函数包含字典等必要请求 *页面初始化函数包含字典等必要请求
*/ */
const PageOnlaod = async () => { const PageOnlaod = async () => {
PageLoading.value = true; PageLoading.value = true;
try { try {
await Dictionaryrequest(); // //
await Roleverification(); // await Promise.all([
PublicDataRequest(TabPermissions.value); // Dictionaryrequest(), //
Roleverification(), //
SelectionInitialization(), //
]);
//
PublicDataRequest(TabPermissions.value);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} } finally {
PageLoading.value = false; PageLoading.value = false;
console.log(Useridentity, 'Useridentity'); }
console.log('外部执行完毕');
console.log(dictionaries);
}; };
// //
PageOnlaod(); PageOnlaod();
@ -795,11 +846,13 @@ const PagingDataProcessing = () => {
* @return {void} 无返回值 * @return {void} 无返回值
*/ */
const tabChenge = async (value, Reset) => { const tabChenge = async (value, Reset) => {
PageLoading.value = true; // loading
let _Obj = await MatchCurrentMenu(); // let _Obj = await MatchCurrentMenu(); //
_Obj.query = await deepClone(details.query); // _Obj.query = await deepClone(details.query); //
TabPermissions.value = value; // TabPermissions.value = value; //
PublicDataRequest(value, Reset); // PublicDataRequest(value, Reset); //
}; };
const PublicDataRequest = async (value, Reset) => { const PublicDataRequest = async (value, Reset) => {
try { try {
await MenuHeaderProcessing(value); // await MenuHeaderProcessing(value); //
@ -807,6 +860,7 @@ const PublicDataRequest = async (value, Reset) => {
// {_state}truefalse // {_state}truefalse
let _state = PagingDataProcessing(); let _state = PagingDataProcessing();
if (!_state) { if (!_state) {
PageLoading.value = false; // oading
return; return;
} }
PageLoading.value = true; // loading PageLoading.value = true; // loading
@ -1095,20 +1149,56 @@ const Publicaccessdata = async Reset => {
} }
}; };
// /**
const InformationViewing = val => { *
console.log(val, '当前行数据'); * @description 创建工单
const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo'; */
const CreateworkOrder = () => {
$router.push('/aftersales/aftersalesWorkOrderAdd');
};
/**
* @description: 全部常工单号跳转到详情信息页面
* @param {Object} row - 当前行数据
* @return {void}
*/
const ViewDetails0 = row => {
console.log(row, '当前行数据');
const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo'; //
const queryParams = { const queryParams = {
id: val.row.workOrderId, id: row.id, //ID
name: `${val.row.workOrderNumber}-信息查看`, name: `${row.workOrderNumber}-详情信息`,
warehouseId: val.row.warehouseId, workOrderNumber: row.workOrderNumber, //
workOrderNumber: val.row.workOrderNumber, RouteIndexs: TabPermissions.value, //
businessId: val.row.businessId, workOrderStatus: row.workOrderStatus, //
RouteIndexs: TabPermissions.value, };
workOrderStatus: val.row.workOrderStatus, $router.push({ path: workOrderInfoPath, query: { ...queryParams } });
};
//
const ViewDetailsRow = row => {
console.log(row, '异常工单号点击查看详情当前行数据');
switch (TabPermissions.value) {
case 0:
ViewDetails0(row);
break;
case 1:
break;
}
}; };
$router.push({ path: workOrderInfoPath, query: { ...queryParams, id: val.row.id } });
/**
* @description: 查看按钮
* @param {Object} row 当前行数据
* @return {void} 无返回值
*/
const ViewDetails = row => {
console.log(row, '点击查看详情当前行数据');
switch (TabPermissions.value) {
case 0:
ViewDetails0(row); //
break;
case 1:
break;
}
}; };
</script> </script>

Loading…
Cancel
Save