|
|
@@ -121,22 +121,22 @@
|
|
|
<span v-text="item.status"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <span v-text="item?.owner?.name || ''"></span>
|
|
|
+ <span v-text="item.owner? item.owner.name : ''"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <span v-text="item?.order?.client_code || ''"></span>
|
|
|
+ <span v-text="item.order? item.order.client_code : ''"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <div v-for="data in (item?.order?.packages || [])">
|
|
|
+ <div v-for="data in (item.order? item.order.packages : [])">
|
|
|
<span v-text="data.logistic_number"></span>
|
|
|
</div>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <span v-text="item?.logistic?.name || ''"></span>
|
|
|
+ <span v-text="item.logistic ? item.logistic.name : ''"></span>
|
|
|
</td>
|
|
|
|
|
|
<td>
|
|
|
- <span v-text="item?.creator?.name || ''"></span>
|
|
|
+ <span v-text="item.creator ? item.creator.name : ''"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
<span v-text="item.remark"></span>
|
|
|
@@ -178,7 +178,7 @@
|
|
|
v-for="(log,index) in item.logs" v-bind:key="item.id+':'+index">
|
|
|
<div>
|
|
|
<span class="text-monospace">创建人:</span>
|
|
|
- <span v-text="log?.creator?.name"></span>
|
|
|
+ <span v-text="log.creator? log.creator.name : ''"></span>
|
|
|
</div>
|
|
|
<div>
|
|
|
<span class="text-monospace">创建时间:</span>
|
|
|
@@ -406,7 +406,7 @@
|
|
|
},
|
|
|
sortOrder(workOrder) {
|
|
|
this.groupImages(workOrder);
|
|
|
- workOrder.issue_type_name = workOrder?.issue_type?.name || '';
|
|
|
+ workOrder.issue_type_name = workOrder.issue_type ? workOrder.issue_type.name : '';
|
|
|
if (workOrder['order_issue']) {
|
|
|
workOrder.result_explain = workOrder['order_issue'].result_explain;
|
|
|
if (workOrder['order_issue']['issue_type']) {
|
|
|
@@ -424,7 +424,7 @@
|
|
|
mapLogs(logs) {
|
|
|
return logs.map(item => {
|
|
|
return {
|
|
|
- username: item.user?.name || '',
|
|
|
+ username: item.user? item.user.name : '',
|
|
|
content: item.content,
|
|
|
created_at: item.created_at
|
|
|
};
|
|
|
@@ -518,7 +518,7 @@
|
|
|
getExportText(item) {
|
|
|
if (!item.order || !item.order.packages) return '';
|
|
|
let message = '';
|
|
|
- let issue_type = item['issue_type']?.name || '';
|
|
|
+ let issue_type = item['issue_type'] ? item['issue_type'].name : '';
|
|
|
switch (issue_type) {
|
|
|
case '拦截':
|
|
|
message = this.interceptMessage(item);
|
|
|
@@ -535,9 +535,9 @@
|
|
|
interceptMessage(item) {
|
|
|
let message = '';
|
|
|
let order = item.order;
|
|
|
- let order_packages = item.order?.packages || [];
|
|
|
- let logistic_code = item.order ?.['logistic']?.code || ''; // 承运商编码
|
|
|
- let logistic_name = item.order ?.['logistic']?.name || ''; // 承运商名称
|
|
|
+ let order_packages = item.order? item.order.packages : [];
|
|
|
+ let logistic_code = item.order ? (item.order['logistic']? item.order['logistic'].code : '') : ''; // 承运商编码
|
|
|
+ let logistic_name = item.order ? (item.order['logistic']? item.order['logistic'].name : '') : ''; // 承运商名称
|
|
|
|
|
|
let {consignee_name, consignee_phone, address} = order;
|
|
|
let order_adder = `${consignee_name} ${consignee_phone} ${address}`;
|
|
|
@@ -556,8 +556,8 @@
|
|
|
modificationMessage(item) {
|
|
|
let message = '';
|
|
|
let {remark, order} = item;
|
|
|
- let order_packages = item.order?.packages || [];
|
|
|
- let logistic_code = item.order ?.['logistic']?.code || '';
|
|
|
+ let order_packages = item.order? item.order.packages : [];
|
|
|
+ let logistic_code = item.order ? (item.order['logistic']? item.order['logistic'].code : '') : '';
|
|
|
|
|
|
const {consignee_name, consignee_phone, province, city, district, address} = order;
|
|
|
let adder = `${consignee_name} ${consignee_phone} ${province} ${city} ${district} ${address}`;
|
|
|
@@ -892,7 +892,7 @@
|
|
|
$("#logistic-fill-work-order-modal").modal('hide');
|
|
|
|
|
|
} else {
|
|
|
- window.tempTip.show(res.data?.message || '');
|
|
|
+ window.tempTip.show(res.data.message ? res.data.message : '修改异常');
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
window.tempTip.show(err);
|
|
|
@@ -906,7 +906,7 @@
|
|
|
this.sortOrder(res.data.data);
|
|
|
this.$set(this.workOrders, index, res.data.data);
|
|
|
} else {
|
|
|
- window.tempTip.show(res.data?.message || '工单处理异常刷新后重试');
|
|
|
+ window.tempTip.show(res.data.message ? res.data.message : '工单处理异常刷新后重试');
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
window.tempTip.show(err || '工单处理异常刷新后重试');
|
|
|
@@ -931,7 +931,7 @@
|
|
|
window.tempTip.showSuccess('修改成功');
|
|
|
$("#baoshi-fill-work-order-modal").modal('hide');
|
|
|
} else {
|
|
|
- window.tempTip.show(res.data?.message || '');
|
|
|
+ window.tempTip.show(res.data.message ? res.data.message : '修改异常');
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
window.tempTip.show(err);
|
|
|
@@ -950,7 +950,7 @@
|
|
|
});
|
|
|
},
|
|
|
clearWorkOrderWith(item, index) {
|
|
|
- this.fillWorkOrder.id = item?.id;
|
|
|
+ this.fillWorkOrder.id = item.id;
|
|
|
this.selectIndex = index;
|
|
|
this.fillWorkOrder.reissue_logistic_number = null; // 补发单号
|
|
|
this.fillWorkOrder.logistic_number = null; // 补发单号
|
|
|
@@ -960,7 +960,7 @@
|
|
|
getOrderCommodity(item) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
let url = '{{route('order.commodity.getCommoditiesApi')}}';
|
|
|
- let data = {orderNo: item?.order?.code};
|
|
|
+ let data = {orderNo: item? (item.order ? item.order.code : '') : ''};
|
|
|
window.axios.post(url, data).then(res => {
|
|
|
if (res.data.success) {
|
|
|
resolve(res.data.data);
|
|
|
@@ -1027,7 +1027,7 @@
|
|
|
window.tempTip.showSuccess('审核完成');
|
|
|
} else {
|
|
|
window.tempTip.setIndex(1999);
|
|
|
- window.tempTip.show(res.data?.message || '审核异常刷新后重试');
|
|
|
+ window.tempTip.show(res.data.message ? res.data.message || '审核异常刷新后重试');
|
|
|
}
|
|
|
$('#bao-shi-review-modal').modal('hide');
|
|
|
}).catch(err=>{
|