工单页面修改

resources/views/order/workOrder/index.blade.php

@@ -200,11 +200,9 @@
             @can('订单管理-工单处理-审核')
                 @include('order.workOrder._edit_issue_type')
             @endcan
-            @include('order.workOrder._fill_loss_work_order')
             @include('order.workOrder._baoshi_fill_work_order')
             @include('order.workOrder._logistic_fill_work_order')
             @include('order.workOrder._owner_fill_work_order')
-            @include('order.workOrder._edit_process_log')
         </div>
     </div>
 @endsection()
@@ -216,14 +214,11 @@
         .fade-enter-active, .fade-leave-active {
             transition: opacity .3s;
         }
-
         .fade-enter, .fade-leave-to {
             opacity: 0;
         }
-
         .image-div {
         }
-
         .image-w {
             width: 100%;
         }
@@ -279,20 +274,24 @@
                     logistic_number: null, // 丢件快递单号
                     refundImages: [], // 退款图
                     dealImages: [], // 交易图
-                    commodities:[],
+                    commodities: [],
                 },
                 workOrderStatus: ['创建', '信息已填写', '快递已处理', '工单完成'],
                 selectTr: null,
-                selectOrderPackage: null,
-                selectOrder: null,
-                selectLogisticLogId: null,
-                selectBaoShiLogId: null,
+                // selectOrderPackage: null,
+                // selectOrder: null,
+                // selectLogisticLogId: null,
+                // selectBaoShiLogId: null,
                 selectDetailId: null,
                 selectOrderIssue: null,
                 selectIssueType: '',
                 selectLog: null,
                 selectIndex: null,  // 选中工单
                 filePrefix: "{{asset("/storage")}}",
+                damagedResults: ['核实破损', '核实未破损'],
+                mistakeResults: ['核实少发', '核实多发', '核实未错漏发'],
+                processResults: ['核实破损', '核实未破损'],
+                mistakeProcessResults: ['少发', '多发，客户买下', '多发，客户退回', '少发，不补发', '核实未错漏发'],
             },
             mounted() {
                 let data = [[
@@ -324,11 +323,10 @@
                         data: [{name: 'true', value: '有'}, {name: 'false', value: '无'}]
                     },
                     {name: 'creator', type: 'input', placeholder: '创建人'},
-                ], [{name: 'review_at_start', type: 'time', tip: ['工单审核开始日期', '时间']},
-                    {name: 'review_at_end', type: 'time', tip: ['工单审核结束日期', '时间']},
+                ], [
                     {name: 'order_issue_type', type: 'select', placeholder: '问题件类型', data: this.orderIssueTypes},
                     {name: 'client_code', type: 'input', placeholder: '客户订单号'},
-                    {name: 'is_review', type: 'checkbox', tip: '是否审核', data: [{name: 'true', value: '已审核'}]},
+                    {name: 'is_end', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已完成'}]},
                 ]];
                 this.form = new query({
                     el: '#form_div',
@@ -364,16 +362,6 @@
                             @endcan
                         ], neglect: true
                     },
-                    {{--{name: 'Info', value: '物流跟踪信息', neglect: true},--}}
-                    {{--{name: 'creator', value: '创建人', neglect: true},--}}
-                    {{--{name: 'submit_at', value: '提交时间', neglect: true},--}}
-                    {{--{name: 'reviewer', value: '审核人', neglect: true},--}}
-                    {{--{name: 'review_at', value: '审核时间', neglect: true},--}}
-                    {{--    @can('订单管理-工单处理-删除')--}}
-                    {{--{--}}
-                    {{--    name: 'delete_operation', value: '其他操作', neglect: true--}}
-                    {{--}--}}
-                    {{--@endcan--}}
                 ];
                 new Header({
                     el: "table",
@@ -411,9 +399,6 @@
                     workOrder.commodity_images = this.filterItem(workOrder.images, 'type', 2);
                     workOrder.deal_images = this.filterItem(workOrder.images, 'type', 3);
                     workOrder.refund_images = this.filterItem(workOrder.images, 'type', 4);
-                },
-                groupLogs(workOrder) {
-
                 },
                 sortOrder(workOrder) {
                     this.groupImages(workOrder);
@@ -492,12 +477,12 @@
                 },
                 replaceWorkOrder(workOrders) {
                     let data = [];
-                    workOrders.forEach(workOrder => {
-                        data[workOrder.id] = workOrder;
+                    workOrders.forEach(item => {
+                        data[item.id] = item;
                     });
-                    this.workOrders.forEach((workOrder, i) => {
-                        if (data[workOrder.id]) {
-                            let item = data[workOrder.id];
+                    this.workOrders.forEach((e, i) => {
+                        if (data[e.id]) {
+                            let item = data[e.id];
                             this.sortOrder(item);
                             this.$set(this.workOrders, i, item);
                         }
@@ -711,18 +696,6 @@
                     this.fillWorkOrder.refundImages = []; // 退款图
                     this.fillWorkOrder.commodities = [];
                 },
-                updateLossWorkOrder() {
-                    let formData = new FormData();
-                    formData.append('id', this.workOrder.id);
-                    formData.append('reissue_logistic_number', this.workOrder.reissue_logistic_number);
-                    formData.append('logistic_number', this.workOrder.logistic_number);
-                    formData.append('price', this.workOrder.price);
-                    let dealImages = this.getImages(this.workOrder.dealImages);
-                    let refundImages = this.getImages(this.workOrder.refundImages);
-                    this.setFormDataImagePrefix(formData, 'dealImages', dealImages);
-                    this.setFormDataImagePrefix(formData, 'refundImages', refundImages);
-                    this.fillLossWorkOrder(formData);
-                },
                 setFormDataImagePrefix(formData, prefix, images) {
                     images.forEach((item, i) => {
                         formData.append(`${prefix}[]`, item);
@@ -733,23 +706,6 @@
                         return item.file;
                     })
                 },
-                fillLossWorkOrder(data) {
-                    let url = "{{route('workOrder.lossApi')}}";
-                    window.tempTip.setIndex(1999);
-                    window.axios.post(url, data, {'Content-Type': 'multipart/form-data'}).then(res => {
-                        if (res.data.success) {
-                            this.sortOrder(res.data.data);
-                            this.$set(this.workOrders, this.workOrder.index, res.data.data);
-                            window.tempTip.showSuccess('工单信息填充成功');
-                            this.clearWorkOrder();
-                            $("#fill-loss-work-order-modal").modal('hide');
-                        } else {
-                            window.tempTip.show(res.data.message);
-                        }
-                    }).catch(err => {
-                        window.tempTip.show(err);
-                    });
-                },
                 showEditLog(item, index, type) {
                     this.processLog.type = type;
                     this.processLog.index = index;
@@ -917,9 +873,7 @@
                     let url = "{{route("workOrder.commodity.logisticUpdateApi")}}";
                     let formData = new FormData();
                     formData.append('id', this.fillWorkOrder.id);
-                    this.fillWorkOrder.commodities.forEach(e => {
-                        formData.append("commodities[]", JSON.stringify(e));
-                    });
+                    this.fillWorkOrderCommodity(formData);
                     window.tempTip.setIndex(1999);
                     window.axios.post(url, formData, {'Content-Type': 'multipart/form-data'})
                         .then(res => {
@@ -934,11 +888,9 @@
                             }
                         }).catch(err => {
                         window.tempTip.show(err);
-                    })
-
+                    });
                 },
                 logisticEndWorkOrder(item, index) {
-                    // 拦截，信息更改的工单处理
                     let url = "{{route("workOrder.logistic.endApi")}}";
                     window.axios.post(url, {id: item.id}).then(res => {
                         if (res.data.success) {
@@ -961,9 +913,7 @@
                     let url = "{{route("workOrder.commodity.baoShiUpdateCommodities")}}";
                     let formData = new FormData();
                     formData.append('id', this.fillWorkOrder.id);
-                    this.fillWorkOrder.commodities.forEach(e => {
-                        formData.append("commodities[]", JSON.stringify(e));
-                    });
+                    this.fillWorkOrderCommodity(formData)
                     window.tempTip.setIndex(1999);
                     window.axios.post(url, formData, {'Content-Type': 'multipart/form-data'})
                         .then(res => {
@@ -1021,21 +971,24 @@
                     let refundImages = this.getImages(this.fillWorkOrder.refundImages);
                     this.setFormDataImagePrefix(formData, 'dealImages', dealImages);
                     this.setFormDataImagePrefix(formData, 'refundImages', refundImages);
+                    this.fillWorkOrderCommodity(formData);
+                    this.ownerFillLossWorkOrder(formData);
+                },
+                fillWorkOrderCommodity(formData) {
                     this.fillWorkOrder.commodities.forEach(e => {
                         formData.append("commodities[]", JSON.stringify(e));
                     });
-                    this.ownerFillLossWorkOrder(formData);
                 },
                 ownerFillLossWorkOrder(data) {
-                    let url = "{{route('workOrder.lossApi')}}";
+                    let url = "{{route('workOrder.updateLossApi')}}";
                     window.tempTip.setIndex(1999);
                     window.axios.post(url, data, {'Content-Type': 'multipart/form-data'}).then(res => {
                         if (res.data.success) {
                             this.sortOrder(res.data.data);
-                            this.$set(this.workOrders, this.workOrder.index, res.data.data);
+                            this.$set(this.workOrders, this.selectIndex, res.data.data);
                             window.tempTip.showSuccess('工单信息填充成功');
                             this.clearWorkOrder();
-                            $("#owner—fill-work-order-modal").modal('hide');
+                            $("#owner-fill-work-order-modal").modal('hide');
                         } else {
                             window.tempTip.show(res.data.message);
                         }
@@ -1043,7 +996,7 @@
                         window.tempTip.show(err);
                     });
                 },
-                console(i){
+                console(i) {
                     console.log(i);
                 }
             },