|
|
@@ -80,9 +80,9 @@
|
|
|
</template>
|
|
|
|
|
|
<template >
|
|
|
- <br v-show="item.is_issue_order === true">
|
|
|
+ <br v-show="item.is_issue_order">
|
|
|
<a :href="'{{url("order/issue/index")}}'+'?is_handle=ture&orderCode='+item.orderno"
|
|
|
- v-show="item.is_issue_order === true"
|
|
|
+ v-show="item.is_issue_order"
|
|
|
target="order/issue/index?addtime=15">
|
|
|
<span class="badge badge-danger ">问题件</span>
|
|
|
</a>
|
|
|
@@ -302,7 +302,7 @@
|
|
|
<script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
|
|
|
<script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
|
|
|
<script type="text/javascript" src="{{mix('js/element-ui.js') }}"></script>
|
|
|
- <script src="https://unpkg.com/element-ui/lib/index.js"></script>
|
|
|
+{{-- <script src="https://unpkg.com/element-ui/lib/index.js"></script>--}}
|
|
|
|
|
|
<style>
|
|
|
.fade-enter-active {
|
|
|
@@ -802,7 +802,6 @@
|
|
|
workOrder.commodities = this.groupCommodities(workOrder);
|
|
|
workOrder.issue_type_name = workOrder.issue_type ? workOrder.issue_type.name : ''; // 工单类型
|
|
|
workOrder.pending_detail = this.groupPendingDetail(workOrder);
|
|
|
- workOrder.order_issue ? (workOrder.order_issue.log_is_show = false) : '';
|
|
|
workOrder.logistic_numbers = this.groupLogisticNumber(workOrder);
|
|
|
workOrder.orderno = workOrder.order ? workOrder.order.code : '';
|
|
|
workOrder.process_logs = this.groupProcess_logs(workOrder.pending_detail);
|
|
|
@@ -812,7 +811,8 @@
|
|
|
workOrder.logisitc_name = workOrder.logistic ? workOrder.logistic.name : '';
|
|
|
workOrder.order_client_code = workOrder.order ? workOrder.order.client_code : '';
|
|
|
workOrder.order_commodities = this.groupOrderPackageCommodities(workOrder);
|
|
|
- workOrder.is_issue_order = 'order_issue' in workOrder;
|
|
|
+ workOrder.is_issue_order = workOrder.order_issue !== null;
|
|
|
+ if (workOrder.order_issue !== null) workOrder.order_issue.log_is_show = 'order_issue' in workOrder;
|
|
|
},
|
|
|
groupOrderPackageCommodities(workOrder) {
|
|
|
let order_packages = workOrder.order ? workOrder.order.packages : [];
|