Browse Source

修复bug

dev-xx
马远东 1 year ago
parent
commit
620e22d6ab
  1. 2
      src/components/tablecmt/tablecmt.vue
  2. 12
      src/option/aftersales/vueTvemp.js
  3. 110
      src/views/aftersales/aftersalesWorkOrder.vue
  4. 82
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  5. 36
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  6. 48
      src/views/distribution/signfor/distributionSignforedt.vue

2
src/components/tablecmt/tablecmt.vue

@ -40,7 +40,7 @@
<template #header>
<!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
<el-input
v-if="column.type == 2"
v-if="column.type == 2 || column.type == 13"
v-model.trim="column.values"
clearable
:placeholder="`请输入${column.label}`"

12
src/option/aftersales/vueTvemp.js

@ -39,7 +39,7 @@ export const columnList = [
{
prop: 'workOrderNumber',
label: '异常工单号',
type: 2,
type: 13,
values: '',
width: '120',
checkarr: [],
@ -743,6 +743,16 @@ export const AppealList = [
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '80',
checkarr: [],
fixed: 'right',
sortable: false,
},
]

110
src/views/aftersales/aftersalesWorkOrder.vue

@ -120,10 +120,10 @@
<!-- 申诉列表展示 -->
<el-tabs
type="border-card"
v-if="details.query.workOrderStatus == 30"
v-if="TabPermissions == 6"
@tab-change="AppealTab"
>
<el-tab-pane label="处理完毕"></el-tab-pane>
<el-tab-pane label="完结"></el-tab-pane>
<el-tab-pane label="申诉列表"></el-tab-pane>
</el-tabs>
<!-- 首页表格 -->
@ -154,9 +154,13 @@
<div class="ElBtnClass">
<div>
<!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
<el-button v-if="TabPermissions != '4'" @click="view(slotProps.scope)"
<el-button v-if="TabPermissions != '4' && !AppealStatusT" @click="view(slotProps.scope)"
>查看</el-button
>
<!-- AppealStatusT申诉列表状态 -->
<el-button v-if="AppealStatusT"
>待添加</el-button
>
<!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
<!-- <el-button @click="reply(slotProps.scope)">回复</el-button> -->
<!-- <el-button @click="ViewDelete(slotProps.scope)">删除</el-button> -->
@ -400,10 +404,10 @@
<el-upload
v-model:file-list="AppealAttachment"
list-type="picture-card"
:on-preview="pictureList"
:on-remove="ImgListRemove"
:on-preview="AppealAttachmentpictureList"
:on-remove="AppealAttachmentImgListRemove"
:action="doubledCount"
:on-success="ImgSuccess"
:on-success="AppealAttachmentImgSuccess"
:before-upload="beforeAvatarUpload"
:headers="headers"
multiple
@ -548,7 +552,7 @@ const TransportlossList = ref([
//
]);
const pageSize = ref(30); //
const AppealAttachment=ref('');//
const AppealAttachment = ref([]); //
const total = ref(0); //
const KFinput = ref(''); //
const Appealselection = ref([]); //
@ -1118,7 +1122,18 @@ const AddInfo = () => {
// });
// });
};
//
const beforeAvatarUpload = rawFile => {
console.log(rawFile);
if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
ElMessage.error('图片格式只能为 png/jpg!');
return false;
} else if (rawFile.size / 1024 / 1024 > 10) {
ElMessage.error('图片大小不能大于10MB!');
return false;
}
return true;
};
//
const ConfirmForm = () => {
console.log(warehouseData.value, '准备好的数据');
@ -1182,6 +1197,22 @@ const searchHide = () => {
console.log(details);
details.search = !details.search;
};
//
const InformationViewing=(val)=>{
$router.push({
path: '/aftersales/aftersalesWorkOrderInfo',
query: {
id: val.row.id,
name: val.row.workOrderNumber + '-信息查看',
warehouseId: val.row.warehouseId,
workOrderNumber: val.row.workOrderNumber, //
businessId: val.row.businessId,
ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', // 1 2
RouteIndexs: TabPermissions.value, //
},
});
}
//
const view = val => {
console.log(val.row.id);
@ -1297,6 +1328,18 @@ const addingRecord = val => {
});
};
//
const AppealAttachmentpictureList = val => {
console.log(val, '点击申诉附件图片');
};
//
const AppealAttachmentImgListRemove = val => {
console.log(val, '申诉附件移除');
};
//
const AppealAttachmentImgSuccess = val => {
console.log(val, '申诉图片上传成功');
};
//
const appeal = val => {
console.log(details.selectionList, 'details.selectionList');
@ -1318,36 +1361,46 @@ const appeal = val => {
};
//
const Appealbutton = () => {
if(AppealAttachment.value.length>1){
ElMessage({
message: '只能上传一张图片',
type: 'warning',
});
return
}
console.log(details.selectionList, '当前申诉的东西');
loadingappeal.value = true; //
console.log(Appealselection.value, '当前选择的责任人');
console.log(warehouseData.value, '要循环处理的参数');
let data = {
peopleEntityList: [], //
imagePath: '', //
};
data.workOrderId = details.selectionList[0].lawoId;
data.reason = Reasonforappeal.value;
(data.appealPeopleName = warehouseData.value
data.appealPeopleName = warehouseData.value
.filter(item => Appealselection.value.includes(item.value))
.map(item => item.label)
.join(',')), //
details.selectionList.forEach(item => {
console.log(item.id);
console.log(item, '已经选择的列表');
data['peopleEntityList'].push({
workOrderId: item.id, //ID
warehouseId: item.warehouseId == '/' ? '' : item.warehouseId,
reason: Reasonforappeal.value, //
claimant: userInfo.value.content.user_name, //
claimantUserId: userInfo.value.content.user_id, //ID
actualPersonName: warehouseData.value
.filter(item => Appealselection.value.includes(item.value))
.map(item => item.label)
.join(','), //
});
.join(','); //
details.selectionList.forEach(item => {
console.log(item.id);
console.log(item, '已经选择的列表');
data['peopleEntityList'].push({
workOrderId: item.id, //ID
warehouseId: item.warehouseId == '/' ? '' : item.warehouseId,
reason: Reasonforappeal.value, //
claimant: userInfo.value.content.user_name, //
claimantUserId: userInfo.value.content.user_id, //ID
actualPersonName: warehouseData.value
.filter(item => Appealselection.value.includes(item.value))
.map(item => item.label)
.join(','), //
});
});
data.imagePath = AppealAttachment.value[0].response.data.link; //
console.log(data, '处理好的值');
$_appealSubmit(data).then(res => {
dialogappeal.value = false; //
loadingappeal.value = false; //
@ -1754,11 +1807,11 @@ const AppealTab = val => {
Tableheaderswitching(columnList); //
console.log('处理完毕');
ProcessingPartyState.value = false; //
details.query.workOrderStatus = 30;
details.query.workOrderStatus = 80;
ArbitrationStatus.value = false; //
empty(); //
let data = {
workOrderStatus: 30,
...details.query,
};
IndexTable(data);
@ -2957,4 +3010,9 @@ const CompletedSubmission = () => {
.el_textBtn {
color: #9bb40d;
}
:deep(.el-upload-dragger) {
display: flex;
align-items: center;
justify-content: center;
}
</style>

82
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -137,36 +137,7 @@
<el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
</el-form-item> -->
<!-- 必填 -->
<el-form-item
label="配送司机"
v-if="
groundlineSet ||
groundlineType == 3 ||
groundlineType == 4 ||
groundlineType == 8 ||
groundlineType == 5 ||
groundlineType == 7 ||
groundlineType == 8
"
>
<el-select
v-model="Indexform.deliveryDriver"
filterable
default-first-option
:reserve-keyword="false"
placeholder="请输入配送司机"
@change="changeDeliveryDriver"
>
<el-option
v-for="item in DeliveryDriver"
:key="item.value"
:label="item.driverName + '-' + item.trainNumber"
:value="item.id"
/>
</el-select>
</el-form-item>
<!-- 必填 -->
<el-form-item
@ -205,12 +176,44 @@
<el-date-picker
v-model="Indexform.deliveryTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择配送时间"
@change="DeliveryTrainnumber"
/>
</el-form-item>
<!-- 必填 -->
<el-form-item
label="配送司机"
v-if="
groundlineSet ||
groundlineType == 3 ||
groundlineType == 4 ||
groundlineType == 8 ||
groundlineType == 5 ||
groundlineType == 7 ||
groundlineType == 8
"
>
<el-select
v-model="Indexform.deliveryDriver"
filterable
default-first-option
:reserve-keyword="false"
placeholder="请输入配送司机"
@change="changeDeliveryDriver"
>
<el-option
v-for="item in DeliveryDriver"
:key="item.value"
:label="item.driverName + '-' + item.trainNumber"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
<el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable />
</el-form-item>
@ -219,8 +222,8 @@
<el-date-picker
v-model="Indexform.deliverGoodsTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择发货时间"
/>
</el-form-item>
@ -708,7 +711,7 @@ const ResponsiblePartychange = (val, index) => {
});
};
const onLoad = () => {
DeliveryTrainnumber(); //
// DeliveryTrainnumber(); //
console.log($route.query.id, '页面初始化');
routerState.value = $route.query.routerState;
updateDictionary(IndexException.value, 'pc_work_order'); //
@ -747,6 +750,14 @@ const DiscoveringNodesChange = val => {
//
function DeliveryTrainnumber() {
if(!Indexform.value.trainNumber){
Indexform.value.deliveryTime=''
Indexform.value.deliveryDriver=''
DeliveryDriver.value =[]
}
if(!Indexform.value.trainNumber){
return
}
let data = {
trainNumber: Indexform.value.trainNumber,
taskTime: Indexform.value.deliveryTime,
@ -754,9 +765,6 @@ function DeliveryTrainnumber() {
data.current = 1; //
data.size = 999; //
$_shippingInformation(data).then(res => {
// DeliveryDriver;
// Indexform.deliveryDriver;
console.log(res, '查询返回值');
DeliveryDriver.value = res.data.data.records; //
//

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

@ -1378,7 +1378,7 @@ export default {
values: '',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1389,7 +1389,7 @@ export default {
values: '',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1400,7 +1400,7 @@ export default {
values: '',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1411,7 +1411,7 @@ export default {
values: '',
width: '180',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
},
{
@ -1419,7 +1419,7 @@ export default {
label: '仓库',
type: 2,
values: '',
width: '180',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1472,7 +1472,7 @@ export default {
label: '一级品类',
type: 2,
values: '',
width: '180',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1482,7 +1482,7 @@ export default {
label: '二级品类',
type: 2,
values: '',
width: '180',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1492,7 +1492,7 @@ export default {
label: '三级品类',
type: 2,
values: '',
width: '180',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1524,7 +1524,7 @@ export default {
label: '包件状态',
type: 1,
values: '',
width: '180',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1534,7 +1534,7 @@ export default {
label: '冻结状态',
type: 1,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1544,7 +1544,7 @@ export default {
label: '上架状态',
type: 1,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1555,7 +1555,7 @@ export default {
label: '备货状态',
type: 1,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1566,7 +1566,7 @@ export default {
label: '预约状态',
type: 1,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1577,7 +1577,7 @@ export default {
label: '装车状态',
type: 1,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1588,7 +1588,7 @@ export default {
label: '包件数量',
type: 1,
values: '',
width: '180',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1599,7 +1599,7 @@ export default {
label: '计划数量',
type: 1,
values: '',
width: '180',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1609,7 +1609,7 @@ export default {
label: '装车数量',
type: 1,
values: '',
width: '180',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1619,7 +1619,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '180',
width: '40',
checkarr: [],
fixed: false,
sortable: true,

48
src/views/distribution/signfor/distributionSignforedt.vue

@ -1035,9 +1035,9 @@ const menuData2 = ref([
label: '运单号',
type: 2,
values: '',
width: '150',
width: '100',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1046,9 +1046,9 @@ const menuData2 = ref([
label: '服务号',
type: 2,
values: '',
width: '250',
width: '150',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1057,9 +1057,9 @@ const menuData2 = ref([
label: '订单自编号',
type: 2,
values: '',
width: '280',
width: '160',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1068,9 +1068,9 @@ const menuData2 = ref([
label: '包条码',
type: 2,
values: '',
width: '200',
width: '130',
checkarr: [],
fixed: false,
fixed: true,
sortable: true,
head: false,
},
@ -1079,7 +1079,7 @@ const menuData2 = ref([
label: '仓库',
type: 2,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1090,7 +1090,7 @@ const menuData2 = ref([
label: '发站仓',
type: 2,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1101,7 +1101,7 @@ const menuData2 = ref([
label: '目的地',
type: 2,
values: '',
width: '150',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1157,7 +1157,7 @@ const menuData2 = ref([
label: '计划数量',
type: 1,
values: '',
width: '150',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1169,7 +1169,7 @@ const menuData2 = ref([
label: '装车数量',
type: 1,
values: '',
width: '150',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1181,7 +1181,7 @@ const menuData2 = ref([
label: '签收数量',
type: 1,
values: '',
width: '150',
width: '40',
checkarr: [],
fixed: false,
sortable: true,
@ -1193,7 +1193,7 @@ const menuData2 = ref([
label: '一级品类',
type: 2,
values: '',
width: '150',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1204,7 +1204,7 @@ const menuData2 = ref([
label: '二级品类',
type: 2,
values: '',
width: '200',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1215,7 +1215,7 @@ const menuData2 = ref([
label: '三级品类',
type: 2,
values: '',
width: '200',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
@ -1226,7 +1226,7 @@ const menuData2 = ref([
label: '包件状态',
type: 1,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1237,7 +1237,7 @@ const menuData2 = ref([
label: '冻结状态',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1259,7 +1259,7 @@ const menuData2 = ref([
label: '备货状态',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1270,7 +1270,7 @@ const menuData2 = ref([
label: '预约状态',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1281,7 +1281,7 @@ const menuData2 = ref([
label: '装车状态 ',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1292,7 +1292,7 @@ const menuData2 = ref([
label: '装车方式',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,
@ -1303,7 +1303,7 @@ const menuData2 = ref([
label: '计划装车人',
type: 2,
values: '',
width: '200',
width: '80',
checkarr: [],
fixed: false,
sortable: true,

Loading…
Cancel
Save