前端BUGs

database/migrations/2020_07_29_160826_create_order_issues_table.php

@@ -22,7 +22,7 @@ class CreateOrderIssuesTable extends Migration
             $table->string('send_back_number')->nullable()->index()->comment('退回单号');
             $table->enum('is_new_rejecting',['无','有','已处理'])->default('无')->index()->comment('有新退件');
             $table->integer('rejected_bill_id')->index()->nullable()->comment('退回单');
-            $table->enum('rejecting_status', ['无', '未退回', '全部退回', '部分退回', '差异退回', '超量退回', '全部退回'])->default('无')->index()->comment('退回状态');
+            $table->enum('rejecting_status', ['无', '未退回', '全部退回', '部分退回', '差异退回', '超量退回', '全部退回',])->default('无')->index()->comment('退回状态');
             $table->string('order_issue_type_id')->nullable()->comment('问题类别');
             $table->string('result_explain')->nullable()->comment('处理结果说明');
             $table->integer('second_order_id')->nullable()->comment('二次订单号');

resources/views/maintenance/user/index.blade.php

@@ -53,7 +53,7 @@
     <script>
 
     </script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200825.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         new Vue({

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

@@ -686,7 +686,7 @@
                 },
                 isRejectedBillExist(){
                     let _this = this;
-                    if(confirm('是否生成退货单')){return;}
+                    if(!confirm('是否生成退货单')){return;}
                     axios.post('{{url('order/isRejectedBillExist')}}',{data:this.checkData})
                         .then(function (response) {
                             if (!response.data.success){

resources/views/process/statistic.blade.php

@@ -79,7 +79,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200825.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201010.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         new Vue({