订单管理->工单处理-> blade模板结构修改

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

@@ -519,36 +519,36 @@
 
 </el-dialog>
 
-<el-dialog :visible.sync="dialogBaoShiBatchHandlerVisible" width="75%">
-    <div slot="title">
-        批量处理（宝时）
-        <span v-text="batchHandlerWorkOrder ? batchHandlerWorkOrder.issue_type_name :'' "></span>
-    </div>
+{{--<el-dialog :visible.sync="dialogBaoShiBatchHandlerVisible" width="75%">--}}
+{{--    <div slot="title">--}}
+{{--        批量处理（宝时）--}}
+{{--        <span v-text="batchHandlerWorkOrder ? batchHandlerWorkOrder.issue_type_name :'' "></span>--}}
+{{--    </div>--}}
 
-    <template v-if="batchHandlerWorkOrder">
+{{--    <template v-if="batchHandlerWorkOrder">--}}
 
-        <template>
-            <div class="form-group row">
-                <label for="process_progress" class="col-sm-2 col-form-label text-right text-primary">
-                    <span class="text-danger">*</span>
-                    处理
-                </label>
-                <div class="col-sm-10">
-                    <select class="form-control" v-model="batchHandlerWorkOrder.process_progress">
-                        <option v-for="item in getBaoShiBatchHandlerProcessProgress()"
-                                :value="item" v-text="item"></option>
-                    </select>
-                </div>
-            </div>
-        </template>
+{{--        <template>--}}
+{{--            <div class="form-group row">--}}
+{{--                <label for="process_progress" class="col-sm-2 col-form-label text-right text-primary">--}}
+{{--                    <span class="text-danger">*</span>--}}
+{{--                    处理--}}
+{{--                </label>--}}
+{{--                <div class="col-sm-10">--}}
+{{--                    <select class="form-control" v-model="batchHandlerWorkOrder.process_progress">--}}
+{{--                        <option v-for="item in getBaoShiBatchHandlerProcessProgress()"--}}
+{{--                                :value="item" v-text="item"></option>--}}
+{{--                    </select>--}}
+{{--                </div>--}}
+{{--            </div>--}}
+{{--        </template>--}}
 
-    </template>
+{{--    </template>--}}
 
-    <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogEditBaoShiVisible = false">关 闭</el-button>
-        <el-button type="primary" @click="baoShiBatchHandlerProcess">
-            终审
-        </el-button>
-    </div>
+{{--    <div slot="footer" class="dialog-footer">--}}
+{{--        <el-button @click="dialogEditBaoShiVisible = false">关 闭</el-button>--}}
+{{--        <el-button type="primary" @click="baoShiBatchHandlerProcess">--}}
+{{--            终审--}}
+{{--        </el-button>--}}
+{{--    </div>--}}
 
-</el-dialog>
+{{--</el-dialog>--}}

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

@@ -4,7 +4,7 @@
     </div>
     <div class="form-group row" v-if="batchHandlerWorkOrder.issue_type_name">
         <label class="col-sm-2 col-form-label text-right text-primary">
-            处理
+            批量处理
         </label>
         <select class="form-control col-sm-10" v-model="batchHandlerWorkOrder.process_progress">
              <option v-for="item in getEditWorkOrderProcessProgress(batchHandlerWorkOrder)" :value="item" v-text="item"></option>
@@ -18,3 +18,60 @@
     </div>
 </el-dialog>
 
+<el-dialog :visible.sync="dialogLogisticBatchHandlerVisible" width="70%">
+     <span slot="title" v-text="batchHandlerWorkOrder.issue_type_name + '工单'+'（承运商）'">
+    </span>
+    <template v-if="'拦截' === batchHandlerWorkOrder.issue_type_name">
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label text-primary text-right">
+                <span class="text-danger">*</span>
+                批量处理
+            </label>
+            <div class="col-sm-10">
+                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
+                    <option
+                        v-for="item in getLogisticBatchHandlerProcessProgress()"
+                        :value="item" v-text="item"></option>
+                </select>
+            </div>
+        </div>
+    </template>
+
+    <template v-else-if="'取消拦截' === batchHandlerWorkOrder.issue_type_name">
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label text-primary text-right">
+                <span class="text-danger">*</span>
+                处理
+            </label>
+            <div class="col-sm-10">
+                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
+                    <option
+                        v-for="item in getLogisticBatchHandlerProcessProgress()"
+                        :value="item" v-text="item"></option>
+                </select>
+            </div>
+        </div>
+    </template>
+
+    <template v-else-if="'信息更改' === batchHandlerWorkOrder.issue_type_name">
+        <div class="form-group row">
+            <label class="col-sm-2 col-form-label text-primary text-right">
+                <span class="text-danger">*</span>
+                处理
+            </label>
+            <div class="col-sm-10">
+                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
+                    <option
+                        v-for="item in getLogisticBatchHandlerProcessProgress()"
+                        :value="item" v-text="item"></option>
+                </select>
+            </div>
+        </div>
+    </template>
+
+    <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogLogisticBatchHandlerVisible = false">关 闭</el-button>
+        <el-button type="primary" @click="logisticBatchHandlerProcess">提交</el-button>
+    </div>
+</el-dialog>
+

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

@@ -260,62 +260,5 @@
 </el-dialog>
 
 
-<el-dialog :visible.sync="dialogLogisticBatchHandlerVisible" width="70%">
-     <span slot="title" v-text="batchHandlerWorkOrder.issue_type_name + '工单'+'（承运商）'">
-    </span>
-
-    <template v-if="'拦截' === batchHandlerWorkOrder.issue_type_name">
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label text-primary text-right">
-                <span class="text-danger">*</span>
-                处理
-            </label>
-            <div class="col-sm-10">
-                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
-                    <option
-                        v-for="item in getLogisticBatchHandlerProcessProgress()"
-                        :value="item" v-text="item"></option>
-                </select>
-            </div>
-        </div>
-    </template>
-
-    <template v-else-if="'取消拦截' === batchHandlerWorkOrder.issue_type_name">
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label text-primary text-right">
-                <span class="text-danger">*</span>
-                处理
-            </label>
-            <div class="col-sm-10">
-                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
-                    <option
-                        v-for="item in getLogisticBatchHandlerProcessProgress()"
-                        :value="item" v-text="item"></option>
-                </select>
-            </div>
-        </div>
-    </template>
-
-    <template v-else-if="'信息更改' === batchHandlerWorkOrder.issue_type_name">
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label text-primary text-right">
-                <span class="text-danger">*</span>
-                处理
-            </label>
-            <div class="col-sm-10">
-                <select class="form-control form-control-sm" v-model="batchHandlerWorkOrder.process_progress">
-                    <option
-                        v-for="item in getLogisticBatchHandlerProcessProgress()"
-                        :value="item" v-text="item"></option>
-                </select>
-            </div>
-        </div>
-    </template>
-
-    <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogLogisticBatchHandlerVisible = false">关 闭</el-button>
-        <el-button type="primary" @click="logisticBatchHandlerProcess">提交</el-button>
-    </div>
-</el-dialog>
 
 

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

@@ -2483,7 +2483,7 @@
                     this.ownerEditWorkOrder.commodities.forEach(e => {
                         let {process_result} = e;
                         if (process_result.indexOf('少发，宝时补发') >= 0) out_in++;
-                        else if (e.process_result.indexOf()) out_in++;
+                        // else if (e.process_result.indexOf()) out_in++;
                         else if (e.process_result === '多发，客户退回') store_in++;
                         else if (e.process_result === '少发，不补发') out_in++;
                         else if (e.process_result === '核实未错漏发') store_in++;
@@ -2587,7 +2587,8 @@
                             this.successTempTip('完结成功');
                             item.status = "完成";
                             item.owner_tag = "";
-                            $("input:checkbox[name='checkData']").attr("checked",false);
+                            this.$delete(this.workOrders,index);
+                            $("input:checkbox[name='checkData']").attr('checked',false);
                         } else {
                             this.errorTempTip(res.data.message ? res.data.message : '完结工单异常');
                         }
@@ -2623,7 +2624,6 @@
                         item.out_order_numbere = null;
                     }
                 },
-
                 hasReturnAddressInfo(commodities) {
                     let filter = commodities.filter(e => (e.process_result_info ? e.process_result_info : '').indexOf('宝时上门取件') >= 0);
                     return filter.length > 0;
@@ -2856,12 +2856,15 @@
                     window.axios.post(url, data).then(res => {
                         window.tempTip.cancelWaitingTip();
                         if (res.data.success) {
+                            this.successTempTip('处理完成');
                             checkData.forEach(e => {
                                 let index = this.workOrders.findIndex(workOrder => `${workOrder.id}` === `${e}`);
                                 if (index >= 0) {
                                     this.$delete(this.workOrders, index);
                                 }
                             });
+                            $("input:checkbox[name='checkData']").attr('checked',false);
+                            checkData = [];
                         } else {
                             this.errorTempTip(res.data.message);
                         }