Browse Source

接口电话去除逗号

Zhouzhendong 5 years ago
parent
commit
7011f6c282

+ 2 - 3
app/Http/Controllers/TestController.php

@@ -135,9 +135,8 @@ class TestController extends Controller
     }
 
     public function test1(){
-        $str=",15984854564564,";
-        $str=ltrim($str,',');
-        $str=rtrim($str,',');
+        $str=",15984854564564,154484645684,874545454   4565546,";
+        $str=trim($str,',');
         dd($str);
     }
 

+ 2 - 2
app/Http/Controllers/WaybillsController.php

@@ -233,7 +233,7 @@ class WaybillsController extends Controller
         $this->validatorWaybillDispatch($request,$id)->validate();
 
         $data=$request->input();
-
+        $total_receivable=0;
         $waybill->fill($data);
         if ($waybill->save()){
             if ($waybill->type=="直发车"){
@@ -264,7 +264,7 @@ class WaybillsController extends Controller
                 }
                 $total_expense=($waybill->pick_up_fee)+($waybill->other_fee)+($waybill->fee);
             }
-            if (isset($total_receivable)&&$total_receivable>0){
+            if ($total_receivable>0){
                 $waybillPayoff=WaybillPayoff::where('waybill_id','=',$id)->first();
                 if ($waybillPayoff){
                     $waybillPayoff->waybill_id=$id;

+ 4 - 4
public/js/app.js

@@ -2259,7 +2259,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -61384,8 +61384,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\wamp64\www\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -61401,4 +61401,4 @@ module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.
 
 /***/ })
 
-/******/ });
+/******/ });

+ 1 - 0
resources/views/waybill/index.blade.php

@@ -139,6 +139,7 @@
                     <th>创建时间</th>
                     <th>运单类型</th>
                     <th>货主</th>
+                    <th>上游单号</th>
                     <th>WMS订单号</th>
                     <th>运单号</th>
                     <th>收件人</th>