Explorar el Código

波次重置BUG,问题件筛选显示

LD hace 5 años
padre
commit
0099bf1554

+ 5 - 5
app/Services/WaveService.php

@@ -59,11 +59,11 @@ class WaveService
         if (is_string($ids)) {
             $ids = [$ids];
         }
-        $count = $this->verfifyIds($ids);
-        if (!$count) {
-            $meg['fail_info'] = "取消打印的波次中有不符合条件的波次";
-            return $meg;
-        }
+//        $count = $this->verfifyIds($ids);
+//        if (!$count) {
+//            $meg['fail_info'] = "取消打印的波次中有不符合条件的波次";
+//            return $meg;
+//        }
         $cancelPrint = OracleDOCWaveHeader::whereIn("WAVENO", $ids)->update(['udfprintflag2' => 'N', 'UserDefine2' => '']);
         if (!$cancelPrint) {
             $meg['fail_info'] = '没有选中需要重置打印标记的波次!';

+ 1 - 1
resources/views/order/issue/index.blade.php

@@ -600,7 +600,7 @@
                     },
                 ],[
                     {name: 'logistic_indemnity_money', type: 'input', tip: '承运商赔偿金额', placeholder: '承运商赔偿金额'},
-                    @can('客户不可见')
+                    @cannot('客户不可见')
                     {
                         name: 'baoshi_indemnity_money', type: 'input', tip: '宝时赔偿金额', placeholder: '宝时赔偿金额'
                     },

+ 1 - 1
resources/views/order/wave/search.blade.php

@@ -169,7 +169,7 @@
                             $(".checkItem").prop("checked",false);
                         } else {
                             tempTip.setDuration(2500);
-                            tempTip.show('标记勾选内容重置打印失败,错误:' + response.data.fail_info);
+                            tempTip.show('标记勾选内容重置打印失败,错误:' + res.data.fail_info);
                         }
                     }).catch(function (err) {
                         tempTip.setDuration(4000);