diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 3e5efa02..3a8a1da0 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1561,11 +1561,11 @@ const IndexTable = val => { res.data.data.records.forEach(item => { console.log(item, 'item'); // 对为null的数据进行处理 - for (const property in item) { - if (item[property] == null) { - item[property] = '/'; - } - } + // for (const property in item) { + // if (item[property] == null) { + // item[property] = '/'; + // } + // } // 对状态进行处理 if (item.workOrderType == 1) { item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 96be3bca..8c17dc6a 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -1460,17 +1460,17 @@ const ConfirmForm = () => { DataSubmit['processorEntityList'].push({ businessName: warehouseData.value.find(obj => obj.value == item).label, //名称 businessId: warehouseData.value.find(obj => obj.value == item).value, //ID - workOrderId: $route.query.id, //异常工单ID + workOrderId: $route.query.id=='/'?'':$route.query.id, //异常工单ID conditions: 1, //状态 1正常 2新增 3取消 typesOf: 2, //1 责任方 2 处理方 warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, //仓库ID - processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理 + processingStatus: $route.query.ProcessType=='/'?'':$route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理 }); }); // 新增处理方要携带调查经过 DataSubmit.surveyRecordDTO = { content: Indexform.value.investigationProcess, //内容' - workOrderId: $route.query.id, //工单ID + workOrderId: $route.query.id =='/'?'':$route.query.id, //工单ID // pictureUrl: KFfeel.value.join(','), //附件路径 }; } @@ -1549,7 +1549,7 @@ const ConfirmForm = () => { money: Number(item.num), // 金额 reasonArbitration: item.reason, // 说明 workOrderId: $route.query.id, // 异常工单 - warehouseId: $route.query.warehouseId, // 仓库ID + warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID }); } else { DataSubmit['completionRecipientEntities'].push({ @@ -1565,7 +1565,7 @@ const ConfirmForm = () => { .join(',') ) .join(','), - warehouseId: $route.query.warehouseId, // 仓库ID + warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID workOrderId: $route.query.id, //异常工单 }); }