Merge branch 'master' into zzd

app/Http/Controllers/PersonnelController.php

@@ -44,6 +44,9 @@ class PersonnelController extends Controller
         if ($userDutyCheckImport&&$userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录！'];
         $userDutyCheckExport=UserDutyCheck::where('user_id',$user_id)->where('checked_at','like',$checkedAtDate.'%')->where('type','登出')->orderBy('id','desc')->first();
         if ($userDutyCheckExport&&$userDutyCheck->type=='登出')return ['result'=>true,'data'=>'已存在出场记录！'];
+//        $userDutyCheckBefore=UserDutyCheck::where('user_id',$user_id)->orderBy('id','desc')->first();
+//        if ($userDutyCheckBefore['type']=='登入'&&$userDutyCheck->type=='登入')return ['result'=>true,'data'=>'已存在进场记录！'];
+//        if ($userDutyCheckBefore['type']=='登出'&&$userDutyCheck->type=='登出')return ['result'=>true,'data'=>'已存在出场记录！'];
         if ($type=='登出')$userDutyCheck->verify_user_id=Auth::user()['id'];
         $userDutyCheck->save();
         $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);

app/Http/Controllers/ProcessController.php

@@ -839,7 +839,7 @@ class ProcessController extends Controller
         $process->load(['processesContents'=>function($query){
             $query->where('type','成品单');
         }]);
-        if (count($process->processesContents) == 0)return ['success'=>false,'data'=>'该单下属单据无成本单存在！'];
+        if (count($process->processesContents) == 0)return ['success'=>false,'data'=>'没有成本单不得验收！'];
         $result=$this->statistic($process);
         if (!$result['success'])return $result;
         $process->update([

app/Http/Controllers/UserDutyCheckController.php

@@ -108,12 +108,12 @@ class UserDutyCheckController extends Controller
             'checked_at' => $date,
             'source' => '正常',
         ]);
+        //跨天登出情况
         if (!$userDutyCheckOld) {
-            //跨天登出情况
+            //当前日期的前一天
+            $yesterday = Carbon::yesterday()->format('Y-m-d');
+            $userDutyCheckYesterday = UserDutyCheck::where('user_id', $user_id)->where('checked_at', 'like', $yesterday . '%')->orderBy('id', 'desc')->limit(10)->first();
             if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'export') {
-                //当前日期的前一天
-                $yesterday = Carbon::yesterday()->format('Y-m-d');
-                $userDutyCheckYesterday = UserDutyCheck::where('user_id', $user_id)->where('checked_at', 'like', $yesterday . '%')->orderBy('id', 'desc')->limit(10)->first();
                 if ($userDutyCheckYesterday && $userDutyCheckYesterday->type == '登入') {
                     $userDutyCheck->verify_user_id = $userDutyCheckYesterday->verify_user_id;
                     $userDutyCheck->type = '登出';
@@ -121,6 +121,12 @@ class UserDutyCheckController extends Controller
                     return $userDutyCheck;
                 }
             }
+            if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'import') {
+                if ($userDutyCheckYesterday && $userDutyCheckYesterday->type == '登入') {
+                    $userDutyCheck->import = true;//已入场的不能再入场
+                    return $userDutyCheck;
+                }
+            }
             if ($importAndExportQRCodeType == 'export') {
                 $userDutyCheck->isNotImport = true;//还未进场，不可出场
                 return $userDutyCheck;

app/Http/Controllers/WaybillController.php

@@ -96,7 +96,7 @@ class WaybillController extends Controller
     }
 
     public function update(Request $request, $id,WaybillPriceModelService $waybillPriceModelService,
-                        CarrierService $carrierService,WaybillPayoffService $waybillPayoffService)
+                           CarrierService $carrierService,WaybillPayoffService $waybillPayoffService)
     {
         if(!Gate::allows('运输管理-调度')){ return redirect(url('/'));  }
         if (!$request->warehouse_weight && $request->warehouse_weight_unit_id){
@@ -803,7 +803,6 @@ class WaybillController extends Controller
 
     // 软删除恢复
     public function apiRestoreSelected(Request $request){
-        DB::enableQueryLog();
         if(!Gate::allows('运输管理-删除')){return ['success'=>'false','fail_info'=>'没有权限'];}
         $ids = $request->input('ids')??'';
         if($ids == ''){return ['success'=>'false','fail_info'=>'没有可恢复对象'];}
@@ -827,6 +826,18 @@ class WaybillController extends Controller
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>$result,'status'=>$result];
     }
+    // 修改运输收费
+    public function changeCharge(Request $request){
+        if(!Gate::allows('运输管理-运单编辑')){return ['success'=>'false','fail_info'=>'没有权限'];}
+        $wayBillId = $request->id;
+        $waybillCharge = $request->input('charge');
+        if(is_null($wayBillId) or is_null($waybillCharge)){
+            return ['success'=>'false','fail_info'=>'参数异常'];
+        }
+        $result = Waybill::where('id',$wayBillId)->update(['charge'=>$waybillCharge]);
+        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        return ['success'=>$result,'status'=>$result];
+    }
     // 置顶
     public function waybillOnTop(Request $request){
         $id =  $request->input('id');
@@ -856,5 +867,27 @@ class WaybillController extends Controller
         $result = WaybillOnTop::where('waybill_id',$id)->forceDelete();
         return ['success'=>$result,'status'=>$result];
     }
+    //同步刷新仓库计重
+    public function refreshWaveHouseWeight(Request $request){
+        $wms_bill_number=$request->input('wms_bill_number');
+        if(is_null($wms_bill_number)) return  ['success'=>false,'fail_info'=>'传参错误'];
+        $waybills=DB::connection('oracle')->table('DOC_ORDER_DETAILS')->where('orderno',$wms_bill_number)->get();
+        if($waybills->isEmpty()) return  ['success'=>false,'fail_info'=>'传参错误'];
+        $warehouseWeight=0;
+        foreach ($waybills as $waybill){
+            if ($waybill->grossweight) $warehouseWeight += $waybill->grossweight;
+            if (!$waybill->grossweight&& $waybill->netweight) $warehouseWeight +=$waybill->netweight;
+        }
+        $warehouseWeight=round($warehouseWeight,2);
+        if ($warehouseWeight!=0){
+            $waybill=Waybill::where('wms_bill_number',$wms_bill_number)->first();
+            if ($waybill['warehouse_weight_other']!=$warehouseWeight){
+                $waybill['warehouse_weight_other']=$warehouseWeight;
+                $waybill->update();
+                $this->log(__METHOD__,'刷新仓库计重'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            }
+        }
+        return ['success'=>true,'warehouseWeight'=>$warehouseWeight];
+    }
 
 }

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -39,14 +39,14 @@ class WaybillController extends Controller
                     ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
             }
             if(isset($receiveInputting['order_list'])&&$receiveInputting['order_list']){
+                $warehouseVolume=0;
                 $warehouseWeight=0;
-                $warehouseWeightOther=0;
                 $sign=false;
                 foreach ($receiveInputting['order_list'] as $orderInputting){
-                    if ($orderInputting['Cubic'])$warehouseWeight += $orderInputting['Cubic'];
+                    if ($orderInputting['Cubic'])$warehouseVolume += $orderInputting['Cubic'];
                     if ($orderInputting['Cubic']==0)$sign=true;
-                    if ($orderInputting['GrossWeight'])$warehouseWeightOther +=$orderInputting['GrossWeight'];
-                    if (!$orderInputting['GrossWeight'] && $orderInputting['NetWeight']) $warehouseWeightOther +=$orderInputting['NetWeight'];
+                    if ($orderInputting['GrossWeight'])$warehouseWeight +=$orderInputting['GrossWeight'];
+                    if (!$orderInputting['GrossWeight'] && $orderInputting['NetWeight']) $warehouseWeight +=$orderInputting['NetWeight'];
                     $orderInputting['OrderNo']=$receiveInputting['OrderNo'];
                     if(!WMSWaybillOrder::create($orderInputting)){
                         Controller::logS(__METHOD__,'error_'.__FUNCTION__,'运单订单行WMS写入错误'.'|'.json_encode($orderInputting));
@@ -55,7 +55,7 @@ class WaybillController extends Controller
                             ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
                     }
                 }
-                if ($sign)$warehouseWeight=0;
+                if ($sign)$warehouseVolume=0;
             }
             $owner=Owner::where('code',$receiveInputting['CustomerID'])->first();
             if (!$owner){$owner=new Owner(['name'=>$receiveInputting['CustomerID'],'code'=>$receiveInputting['CustomerID']]);$owner->save();}
@@ -84,13 +84,13 @@ class WaybillController extends Controller
             ]);
             $dflist=config('merchantsInfo.waybill.DFList');
             if (isset($dflist[$receiveInputting['CarrierID']]) && $dflist[$receiveInputting['CarrierID']])$waybill->collect_fee=0;
-            if (isset($warehouseWeight)&&$warehouseWeight){
-                $waybill->warehouse_weight=$warehouseWeight;
+            if (isset($warehouseVolume)&&$warehouseVolume){
+                $waybill->warehouse_weight=$warehouseVolume;
                 $unit=Unit::where('name','m³')->first();
                 if ($unit)$waybill->warehouse_weight_unit_id=$unit->id;
             }
-            if (isset($warehouseWeightOther)){
-                $waybill->warehouse_weight_other=$warehouseWeightOther;
+            if (isset($warehouseWeight)){
+                $waybill->warehouse_weight_other=$warehouseWeight;
                 $unit=Unit::where('name','kg')->first();
                 if ($unit)$waybill->warehouse_weight_unit_id_other=$unit->id;
             }

app/Package.php

@@ -146,7 +146,7 @@ class Package extends Model
         $this['order_code'] = $this->oracleInfo['orderno'];
         $this['batch_rule'] = $this->oracleInfo['descr'];
         $this['recipient_mobile'] = $this->oracleInfo['c_tel2']??$this->oracleInfo['c_tel1'];
-        if($this->oracleInfo['soreference5'])
+        if(!$this['logistic_number']&&$this->oracleInfo['soreference5'])
             $this['logistic_number'] = $this->oracleInfo['soreference5'];
         $this['batch_number'] = $this->oracleInfo['waveno']??null;
     }

app/Providers/AppServiceProvider.php

@@ -6,7 +6,9 @@ use App\Http\Controllers\Controller;
 use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
+use Ramsey\Uuid\Uuid;
 use Validator;
 
 class AppServiceProvider extends ServiceProvider
@@ -37,5 +39,6 @@ class AppServiceProvider extends ServiceProvider
         Validator::extend('identity_cards', function($attribute, $value, $parameters) {
             return preg_match('/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/', $value);
         });
+        View::share('pageUuid',Uuid::uuid4());
     }
 }

app/Services/LaborReportService.php

@@ -137,14 +137,14 @@ class LaborReportService
     public function changeGroupAndMakeLaborReport($user_id,$userWorkgroupID){
         $laborReportBefore=LaborReport::where('user_id',$user_id)->orderby('id','desc')->first();
         if ($laborReportBefore&&$laborReportBefore['status']!='已退场')$userDutyCheck=$laborReportBefore->userDutyCheck;
-//        if ($laborReportBefore&&!$laborReportBefore['group_user_id']){
-//            if ($laborReportBefore['user_workgroup_id']!=$userWorkgroupID){
-//                $laborReportBefore['user_workgroup_id']=$userWorkgroupID;
-//                $laborReportBefore['check_in_at']=Carbon::now()->format('Y-m-d H:i:s');
-//                $laborReportBefore->update();
-//                return $laborReportBefore;
-//            }
-//        }
+        if ($laborReportBefore&&!$laborReportBefore['group_user_id']){
+            if ($laborReportBefore['user_workgroup_id']!=$userWorkgroupID){
+                $laborReportBefore['user_workgroup_id']=$userWorkgroupID;
+                $laborReportBefore['check_in_at']=Carbon::now()->format('Y-m-d H:i:s');
+                $laborReportBefore->update();
+                return $laborReportBefore;
+            }
+        }
         $userDetail=UserDetail::find($user_id);
         $name=$userDetail['full_name'];
         $mobile_phone=$userDetail['mobile_phone'];

app/Services/WaybillService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Owner;
 use App\Services\common\QueryService;
@@ -58,19 +58,11 @@ Class WaybillService
 
     public function store(Request $request){
         return DB::transaction(function ()use($request){
-            $waybill=new Waybill([
-                'type'=>$request->type,
-                'status'=>'未审核',
-                'waybill_number'=>Uuid::uuid1(),
-                'owner_id'=>$request->owner_id,
-                'wms_bill_number'=>$request->wms_bill_number,
-                'origination'=>$request->origination,
-                'destination'=>$request->destination,
-                'recipient'=>$request->recipient,
-                'recipient_mobile'=>$request->recipient_mobile,
-                'charge'=>$request->charge,
-                'ordering_remark'=>$request->ordering_remark
-            ]);
+            $waybill=new Waybill();
+            $inputs = $request->all();
+            $inputs['status']='未审核';
+            $inputs['waybill_number']=Uuid::uuid1();
+            $waybill->fill($inputs);
             if ($request->collect_fee)$waybill->collect_fee=$request->collect_fee;
             $waybill->save();
             $number_id=$waybill->id;
@@ -120,4 +112,4 @@ Class WaybillService
         $waybill->update();
         return $waybill;
     }
-}
+}

package-lock.json

@@ -5805,11 +5805,6 @@
                 "webpack-sources": "^1.1.0"
             }
         },
-        "layer": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npm.taobao.org/layer/download/layer-0.1.0.tgz",
-            "integrity": "sha1-dvirzO7Cfw+vtsUjYndJxrTsihw="
-        },
         "lcid": {
             "version": "2.0.0",
             "resolved": "https://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz",

public/js/app.js

@@ -61974,8 +61974,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__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");
+__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),

resources/js/queryForm/header.js

@@ -143,4 +143,4 @@ window.Header = function getHeader(object) {
         append();
         fixed();
     }
-};
+};

resources/js/queryForm/queryForm.js

@@ -6,7 +6,7 @@ const query = function getQueryForm(data) {
         this.url = data.url || getPathname();
         this.condition = data.condition;
         this.paginations = [50, 100, 200, 500,1000] || data.paginations;
-        this.isPaginations = data.isPaginations===false ? false : true;
+        this.isPaginations = data.isPaginations !== false;
         this.keydownfun = data.keydownfun || undefined;
         this.selectChange = data.selectChange || undefined;
         this.searchClick = data.searchClick || undefined;
@@ -18,7 +18,7 @@ const query = function getQueryForm(data) {
         this.nextPage = nextPage;
         this.pervPage = pervPage;
         this.getSearchData = getSearchData;
-        this.autoSubmit = (data.autoSubmit === false) ? false : true ;
+        this.autoSubmit = (data.autoSubmit !== false) ;
         this.param = data.param || [];
 
         // 提交表单
@@ -47,7 +47,7 @@ const query = function getQueryForm(data) {
             }
             _hidden_div.html('');
             _hidden_div.append(form);
-            // form.submit();
+            form.submit();
         }
 
     }
@@ -779,7 +779,6 @@ const query = function getQueryForm(data) {
 
     // renderer input
     function rendererSearchFormOnInput(key, value, mold) {
-        console.log('inner:',key, value, mold)
         if ([undefined, null, ''].includes(value)) {
             $(_form).find("input[name='" + key + "']").val('');
             $(_form).find("input[name='" + key + "']").removeClass('bg-warning');
@@ -926,7 +925,6 @@ const query = function getQueryForm(data) {
     }
 
     function redenerSearchFormOnData(key, value, mold) {
-        console.log('outer:',key, value, mold)
         if (mold === 'input' ||mold === 'dateTime') {
             rendererSearchFormOnInput(key, value, mold);
         } else if (mold === 'select') {
@@ -981,6 +979,9 @@ const query = function getQueryForm(data) {
                             mold: ['input', 'dateTime'].includes(types[index]) ? 'input' : types[index],
                             killings:condition.killings,
                         }
+                        if(condition.killings&&Array.isArray(condition.killings)){
+                            data.killings=condition.killings[index];
+                        }
                         _data[_name] = data;
                     })
                 }

resources/sass/text.scss

@@ -47,4 +47,4 @@
     -moz-user-select: none; /* Firefox */
     -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
-}
+}

resources/views/inventory/statement/changeInventory.blade.php

@@ -70,8 +70,9 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
+        $.cookie('xxx', 2223);
         new Vue({
             el:"#list",
             data:{
@@ -97,7 +98,8 @@
                 }
                 let data=[
                     [
-                        {name:['date_start','range'],type:'dateTime_select',tip:['选择创建日期的起始时间','查询内容的日期范围'],placeholder:['','查询内容的日期范围'],data: this.date},
+                        {name:['date_start','range'],type:'dateTime_select',tip:['选择创建日期的起始时间','查询内容的日期范围'],placeholder:['','查询内容的日期范围'],data: this.date
+                            ,killings:[['range'],['date_start']]},
                         {name:'TOLocation',type:'input',tip:'库位：糊模查找需要在左边打上%符号',placeholder: '库位'},
                         {name:'LotAtt05',type:'input',tip:'属性仓：糊模查找需要在左边打上%符号',placeholder: '属性仓'},
                         {name:'LotAtt02_start',type:'dateTime',tip:'选择显示失效日期的起始时间'},
@@ -105,7 +107,7 @@
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                     ],
                     [
-                        {name:'date_end',type:'dateTime',tip:'选择创建日期的结束时间'},
+                        {name:'date_end',type:'dateTime',tip:'选择创建日期的结束时间',killings:['range']},
                         {name:'SKU',type:'input',tip:'产品编码：糊模查找需要在左边打上%符号',placeholder: '产品编码'},
                         {name:'ALTERNATE_SKU1',type:'input',tip:'产品条码：糊模查找需要在左边打上%符号',placeholder: '产品条码'},
                         {name:'LotAtt02_end',type:'dateTime',tip:'选择显示失效日期的结束时间'},

resources/views/layouts/app.blade.php

@@ -57,5 +57,42 @@
             }
         });
 </script>
+<script>
+    //后退则刷新页面
+    let currentPageUuid=function (){
+        let maxPagesOpening = 60;
+        let pageUuid="{{$pageUuid}}";
+        let pageUuids=localStorage.getItem('pageUuids')
+        if(!pageUuids)pageUuids=[];
+        try{
+            pageUuids=JSON.parse(pageUuids)
+        }catch (error){pageUuids=[]}
+        if(pageUuids.length>=maxPagesOpening)pageUuids.shift();
+        pageUuids.push(pageUuid)
+        localStorage.setItem('pageUuids',JSON.stringify(pageUuids))
+        return pageUuid;
+    }()
+    window.addEventListener('pageshow', function(e) {
+        let pageUuids=localStorage.getItem('pageUuids')
+        if(!pageUuids)return;
+        try{
+            pageUuids=JSON.parse(pageUuids)
+        }catch (error){return}
+        let pageReturnedTimes=pageUuids.reduce(function(prev,cur){
+            if(cur===currentPageUuid){
+                if(!prev)return 1;
+                return prev+1;
+            }
+            if(!prev)return 0;
+            if(prev&&prev.length>5)return 0;
+            return prev;
+        })
+        if(pageReturnedTimes>1){
+            $('body').remove();
+            $('html').append("<h5>刷新中……</h5>")
+            location.reload();
+        }
+    });
+</script>
 @yield('lastScript')
 </html>

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

@@ -128,7 +128,7 @@
                                     <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.checktime }}</div></td>
                                 </tr>
                                 <tr v-if="isBtn[order.orderno]">
-                                    <td colspan="5">
+                                    <td colspan="6">
                                         <b style="cursor:pointer;color: #4aa0e6;" @click="isBtn[order.orderno]=false;">点击收起明细</b>
                                     </td>
                                 </tr>
@@ -173,7 +173,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -219,9 +219,9 @@
                     ],
                     [
                         {name:'codename_c_end',type:'select',placeholder:'订单状态范围',data:this.codes},
+                        {name:'orderdate_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'customerid',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
-                        {name:'orderdate_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'soreference5',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder: '多快递单号'},
                         {name:'soreference1',type:'input',tip:'客户订单号，糊模查找需要在左边打上%符号',placeholder: '客户订单号'},
                         {name:'waveno',type:'input',tip:'波次编号，模糊查找需要在左边打上%的符号',placeholder: '波次编号'},

resources/views/order/wave/search.blade.php

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/checking-in/getQRcode.blade.php

@@ -27,8 +27,6 @@
 
                 </div>
             </div>
-
-                <h3 v-else>还未录入仓库，请先录入仓库！</h3>
             </div>
         </div>
     </div>

resources/views/personnel/laborReport/index.blade.php

@@ -133,7 +133,8 @@
                                             </span>
                                         </span>
                             <span class="mr-3   text-nowrap"><span class="text-black">进场时间：</span><span class="text-black-50">@{{laborReport.enter_at  }}</span></span>
-                            {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">退场时间：</span><span style="color:#af7651">@{{ laborReport.exit_at }}</span></span>--}}
+                            <span class="mr-3 text-nowrap"><span class="text-muted">退组时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.checkOutAt }} </span></span>
+                            <span class="mr-3 text-nowrap"><span class="text-black">退场时间：</span><span style="color:#af7651">@{{ laborReport.exit_at }}</span></span>
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">进场编号：</span><span style="color:#af7651">@{{ laborReport.enter_number }}</span></span>--}}
                             <span class="mr-3  text-nowrap"><span class="text-black">小组：</span><span class="text-black-50">@{{laborReport.userWorkGroupName  }}</span></span>
                             <span class="mr-3   text-nowrap"><span class="text-black">临时工：</span><span class="text-black-50">@{{ laborReport.name }} </span></span>
@@ -141,7 +142,6 @@
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">身份证号：</span><span style="color:#af7651" v-if="">@{{ laborReport.identity_number }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">劳务所：</span><span style="color:#af7651" v-if="">@{{ laborReport.labor_company }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">进组时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.checkInAt }} </span></span>--}}
-                            {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">退组时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.checkOutAt }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">审核时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.verifyAt }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">审核人：</span><span style="color:#af7651" v-if="">@{{ laborReport.verifyPerson }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">晚饭打卡(分)：</span><span style="color:#af7651" v-if="">@{{ laborReport.relax_time }} </span></span>--}}
@@ -232,7 +232,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){
@@ -250,7 +250,7 @@
         setInterval(reloadOnTomorrow,1000*60*60)
     </script>
     <script>
-            @if(isset($request))
+        @if(isset($request))
         let request={!! json_encode($request) !!};
         @endif
         new Vue({
@@ -328,18 +328,18 @@
                 //组长审核
                 Echo.channel('{{$laravelEchoPrefix}}laborReport').listen('TeamAuditEvent',(e)=>{
                     let labor=e.laborReport;
-                        laborReports.every(function (laborReport) {
-                            if (laborReport.id==labor.id){
-                                if(labor.remark){
-                                    laborReport.remark=labor.remark;
-                                }
-                                laborReport.verifyAt=labor.verify_at;
-                                laborReport.groupUserId=labor.group_user_id;
-                                laborReport.verifyPerson=labor.verifyPerson;
-                                return false
+                    laborReports.every(function (laborReport) {
+                        if (laborReport.id==labor.id){
+                            if(labor.remark){
+                                laborReport.remark=labor.remark;
                             }
-                            return true;
-                        });
+                            laborReport.verifyAt=labor.verify_at;
+                            laborReport.groupUserId=labor.group_user_id;
+                            laborReport.verifyPerson=labor.verifyPerson;
+                            return false
+                        }
+                        return true;
+                    });
                 });
                 //进组
                 _this.permittingWorkgroups.forEach(function(workgroup){

resources/views/process/create.blade.php

@@ -280,7 +280,7 @@
                 is_delBtn:[],
                 sum:0,
                 pasteData:'',
-                rows:['货主','单据','品名','SKU','条码','数量'],
+                rows:['货主','单据号','品名','SKU','条码','数量'],
                 popoverContent:'',
             },
             watch:{
@@ -582,22 +582,23 @@
                     content['addBtnShow'] = false ;
                     content['type'] = type ;
                     this.processContents.unshift(content);
-                    this.commodityIds.push(processContent.bill_type+"_"+commodity.id+"_"+content['type']);
+                    this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+content['type']);
                     if (!type) this.sum += Number(commodity.amount);
                     return content;
                 },
                 //添加所有
                 addAll(processContent){
+                    console.log("processContent.wms_code:"+processContent.wms_code)
                     let _this=this;
                     processContent.commodities.forEach(function (commodity) {
-                        if (!_this.commodityIds.includes(processContent.bill_type+"_"+commodity.id+"_"+false)){
+                        if (!_this.commodityIds.includes(processContent.wms_code+"_"+commodity.id+"_"+false)){
                             let content = _this._add(processContent,commodity,false);
                             if (processContent.bill_type==='入库单' && !_this.commodityIds.includes(commodity.id+"_"+true)){
                                 let contentTemp={};
                                 Object.assign(contentTemp,content);
                                 contentTemp['type'] = true;
                                 _this.processContents.unshift(contentTemp);
-                                _this.commodityIds.push(processContent.bill_type+"_"+commodity.id+"_"+contentTemp['type']);
+                                _this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+contentTemp['type']);
                             }
                         }
                     });

resources/views/process/index.blade.php

@@ -1,13 +1,13 @@
 @extends('layouts.app')
 @section('title')二次加工管理@endsection
 @section('content')
-<span id="nav2">
+    <span id="nav2">
     @component('process.menu')@endcomponent
 </span>
-<div class="d-none" id="process">
-    <div class="container-fluid">
-        <div id="form_div"></div>
-        <span class="dropdown">
+    <div class="d-none" id="process">
+        <div class="container-fluid">
+            <div id="form_div"></div>
+            <span class="dropdown">
             <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
                     data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                 导出Excel
@@ -453,14 +453,14 @@
         </table>
             {{$processes->appends($paginateParams)->links()}}
         </div>
-</div>
+    </div>
 
 
 @endsection
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header.js')}}"></script>
     <script>
         new Vue({
@@ -468,7 +468,7 @@
             data:{
                 participantInputting:{},
                 processes:[
-                    @foreach($processes as $processOne)
+                        @foreach($processes as $processOne)
                     {id:'{{$processOne->id}}',code:'{{$processOne->code}}',owner_name:'{{$processOne->owner_name}}',owner_id:'{{$processOne->owner_id}}',operatorLogs:{!! $processOne->operatorLogs !!},
                         process_method_name:'{{$processOne->process_method_name}}',amount:'{{$processOne->amount}}',type:'{{$processOne->type}}',signs:{!!$processOne->signs  !!},signUnitPrice:'{{$processOne->signUnitPrice ? $processOne->signUnitPrice->mark :''}}'
                         ,tutorials:{!! $processOne->tutorials !!},processesContents:{!! $processOne->processesContents !!},unit_price:'{{$processOne->unit_price}}',created_at:'{{$processOne->created_at}}',
@@ -479,7 +479,7 @@
                 ],
                 processesList:[],
                 owners:[
-                    @foreach($owners as $owner)
+                        @foreach($owners as $owner)
                     { name:'{{$owner->id}}',value:'{{$owner->name}}'},
                     @endforeach
                 ],
@@ -498,7 +498,7 @@
                 userLabors:[],
                 modalDaily_id:'',
                 processDailyParticipantOne:{id:'',user_id:'',user_detail_full_name:'',started_at:"",ended_at:"",
-                                        hour_price:'',unit_price:'',dinner_duration:'',hour_count:'',unit_count:'',remark:''},
+                    hour_price:'',unit_price:'',dinner_duration:'',hour_count:'',unit_count:'',remark:''},
                 processTutorial:{id:'',owner_id:'',tutorials:[],},
                 processUnfold:[],
                 processFullSum:[],
@@ -524,24 +524,7 @@
                 this.resetProcessData();
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
                 $('#process').removeClass('d-none');
-
-                function focusin() {
-                    if (isJustBack()) location.reload();
-                }
-
-                window.enterAt = (new Date()).getTime();
-
-                function isJustBack() {
-                    let nowAt = (new Date()).getTime();
-                    return (nowAt - window.enterAt) < 600;
-                }
-
-                if ("onfocusin" in document) {//for IE
-                    document.onfocusin = focusin;
-                } else {
-                    window.onfocus = focusin;
-                }
-                let data = [
+                let data=[
                     [
                         {name: 'date_start', type: 'dateTime', tip: '选择显示指定日期的起始时间'},
                         {
@@ -1531,9 +1514,9 @@
                             tempTip.setDuration(3000);
                             tempTip.show(response.data.data);
                         }).catch(function (err) {
-                            tempTip.setDuration(3000);
-                            tempTip.show('网络错误：'+err);
-                        })
+                        tempTip.setDuration(3000);
+                        tempTip.show('网络错误：'+err);
+                    })
                 },
                 resetProcessDailyParticipants(index){
                     if (this.processDailyParticipants[index].daily_id){
@@ -1581,9 +1564,9 @@
                             tempTip.setDuration(3000);
                             tempTip.show(res.data.data);
                         }).catch(err=>{
-                            tempTip.setDuration(4000);
-                            tempTip.show('网络错误：'+err);
-                        })
+                        tempTip.setDuration(4000);
+                        tempTip.show('网络错误：'+err);
+                    })
                 },
                 //修改时的晚饭时间改变计时工时
                 updateDinnerDuration(processDailyParticipantOne,e){

resources/views/rejected/search/general.blade.php

@@ -209,7 +209,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/waybill/create.blade.php

@@ -108,20 +108,46 @@
                         </div>
                     </div>
                     {{--zengjun start--}}
-                    @can('运输管理-运费')
+{{--                    @can('运输管理-运费')--}}
+                        <div class="form-group row">
+                            <label for="charge" class="col-2 col-form-label text-right ">运输收费(元)</label>
+                            <div class="col-8">
+                                <input type="text" class="form-control @error('charge') is-invalid @enderror"
+                                       name="charge" autocomplete="off" value="{{ old('charge') }}" >
+                                @error('charge')
+                                <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                                @enderror
+                            </div>
+                        </div>
+
+
                     <div class="form-group row">
-                        <label for="charge" class="col-2 col-form-label text-right ">收费(元)</label>
+                        <label for="other_charge" class="col-2 col-form-label text-right text-muted">其他收费(元)</label>
                         <div class="col-8">
-                            <input type="text" class="form-control @error('charge') is-invalid @enderror"
-                                   name="charge" autocomplete="off" value="{{ old('charge') }}" >
-                            @error('charge')
+                            <input type="text" class="form-control @error('other_charge') is-invalid @enderror"
+                                   name="other_charge" autocomplete="off" value="@if(old('other_charge')){{ old('other_charge') }}@endif"  >
+                            @error('other_charge')
                             <span class="invalid-feedback" role="alert">
                                         <strong>{{ $message }}</strong>
                                     </span>
                             @enderror
                         </div>
                     </div>
-                    @endcan
+                    <div class="form-group row">
+                        <label for="other_charge_remark" class="col-2 col-form-label text-right text-muted">其他收费备注</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('other_charge') is-invalid @enderror"
+                                   name="other_charge_remark" autocomplete="off" value="@if(old('other_charge_remark')){{ old('other_charge_remark') }}@endif"  >
+                            @error('other_charge_remark')
+                            <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>·
+                            @enderror
+                        </div>
+                    </div>
+{{--                    @endcan--}}
                     {{--zengjun end--}}
                     <div class="form-group row">
                         <label for="collect_fee" class="col-2 col-form-label text-right text-muted">到付金额(元)</label>

resources/views/waybill/index.blade.php

@@ -121,13 +121,15 @@
                                 <button class="btn btn-outline-primary btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
                             @endcan
                             @can('运输管理-编辑')
-                                <button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>
+{{--                                <button  class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>--}}
+                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('waybill/waybillEdit')}}/'+waybill.id)">修改</a>
                             @endcan
                         </span>
                         <span v-if=waybill.status==="已审核">
                             @can('运输管理-调度')
                                 <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
-                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>
+{{--                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>--}}
+                                <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('waybill')}}/'+waybill.id+'/edit')">调度</a>
                             @endcan
                         </span>
                         <span v-if=waybill.status==="待终审">
@@ -135,7 +137,8 @@
                                 <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
                             @endcan
                             @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>
+{{--                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>--}}
+                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('waybill')}}/'+waybill.id+'/edit')">改调度</a>
                             @endcan
                         </span>
                     </td>
@@ -158,7 +161,19 @@
                     <td class="td-warm toptd" :title="waybill.remark? '置顶备注：'+waybill.remark :''">@{{waybill.source_bill}}</td>
                     <td class="td-warm" >@{{waybill.wms_bill_number}}</td>
                     <td class="td-warm">@{{waybill.waybill_number}}</td>
-                    <td class="td-warm">@{{waybill.charge}}</td>
+                    @can('运输管理-运单编辑')
+                    <td class="td-warm" >
+                        <span v-if="waybill.charge" class="btn-sm btn-outline-secondary btn" @click="waybillChargeCheck($event)" :data_id="waybill.id">@{{waybill.charge|money}}</span>
+                        <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillCharge($event)" onfocus="$(this).css('width','85px')" :value="waybill.charge" :data_id="waybill.id" >
+                        <input type="number" class="form-control form-control-sm"  @blur="updateWaybillCharge($event)" :value="waybill.charge" :data_id="waybill.id" style="min-width:85px;display: none">
+                    </td>
+                        @else
+                        <td class="td-warm" ><span v-if="waybill.charge">@{{waybill.charge|money}}</span></td>
+                    @endcan
+{{--                    <td class="td-warm ">--}}
+{{--                        @{{waybill.charge}}--}}
+{{--                    </td>--}}
+
                     <td class="td-warm">@{{waybill.other_charge}}</td>
                     <td class="td-warm">@{{waybill.other_charge_remark}}</td>
                     <td class="td-warm">
@@ -181,7 +196,16 @@
                             <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
                     <td class="td-cool"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight|filterZero}}  @{{waybill.warehouse_weight_unit}}</span></td>
                     <td class="td-cool"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight|filterZero}}  @{{waybill.carrier_weight_unit}}</span></td>
-                    <td class="td-cool"><span v-if="waybill.warehouse_weight_other">@{{waybill.warehouse_weight_other|filterZero}}  @{{waybill.warehouse_weight_unit_other}}</span></td>
+                    <td class="td-cool text-center" style="position: relative" @mouseenter="btnRefreshWeightZoomOut(waybill)" @mouseleave="btnRefreshWeightZoomIn(waybill)">
+                        <span v-if="waybill.warehouse_weight_other&&waybill.btn_refresh_weight=='zoomIn'"> @{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</span>
+                        <button type="button" class="btn btn-sm btn-outline-info" @click="refreshWaveHouseWeight(waybill.wms_bill_number)"
+                                :style="[
+                                {position:waybill.btn_refresh_weight&&waybill.btn_refresh_weight=='zoomIn'?'absolute':'static'},
+                                {transform:waybill.btn_refresh_weight&&waybill.btn_refresh_weight=='zoomIn'?'scale(0.55)':'scale(1)'},
+                                {right:waybill.btn_refresh_weight&&waybill.btn_refresh_weight=='zoomIn'?'-10px':'auto'},
+                                {bottom:waybill.btn_refresh_weight&&waybill.btn_refresh_weight=='zoomIn'?'-6px':'auto'},
+                                ]">刷新</button>
+                    </td>
                     <td class="td-cool"><span v-if="waybill.carrier_weight_other">@{{waybill.carrier_weight_other|filterZero}}  @{{waybill.carrier_weight_unit_other}}</span></td>
                     <td class="td-cool"><span v-if="waybill.amount">@{{waybill.amount}} @{{waybill.amount_unit_name }}</span></td>
                     <td class="td-cool">@{{waybill.mileage|km}} </td>
@@ -362,7 +386,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',
@@ -389,6 +413,7 @@
                         pick_up_fee:'{{$waybill->pick_up_fee}}',other_fee:'{{$waybill->other_fee}}',
                         collect_fee:'{{$waybill->collect_fee}}', @endcan deliver_at:'{{$waybill->deliver_at}}',dispatch_remark:'{{$waybill->dispatch_remark}}',isBtn:false,
                         waybillAuditLogs:{!! $waybill->waybillAuditLogs !!},
+                        btn_refresh_weight:'zoomIn',
                         @if($waybill->remark)remark:'{{$waybill->remark}}', @else remark:'', @endif
                     },
                     @endforeach
@@ -470,6 +495,12 @@
                 this.form.init();
             },
             methods:{
+                btnRefreshWeightZoomIn(waybill){
+                    waybill.btn_refresh_weight='zoomIn'
+                },
+                btnRefreshWeightZoomOut(waybill){
+                    waybill.btn_refresh_weight='zoomOut'
+                },
                 lazy(){
                     //可视区域高度
                     let height=window.innerHeight;
@@ -518,9 +549,9 @@
                         tempTip.show('审核失败,网络连接错误!'+err);
                     });
                 },
-                waybillUpdate(id){
-                    location.href="{{url('waybill/waybillEdit')}}/"+id;
-                },
+                {{--waybillUpdate(id){--}}
+                {{--    location.href="{{url('waybill/waybillEdit')}}/"+id;--}}
+                {{--},--}}
                 // 软删除
                 waybillDestroy(id,waybill_number){
                     if(!confirm('确定要删除运单号为：“'+waybill_number+'”的运单吗？')){return};
@@ -574,9 +605,9 @@
                         tempTip.show('审核驳回失败,网络连接错误!'+err);
                     });
                 },
-                job(id){
-                    location.href="{{url('waybill')}}/"+id+"/edit";
-                },
+                {{--job(id){--}}
+                {{--    location.href="{{url('waybill')}}/"+id+"/edit";--}}
+                {{--},--}}
                 waybillEndAudit(id,waybill_number){
                     if(!confirm('确定要通过“'+waybill_number+'”的终审吗？')){return};
                     let _this=this;
@@ -765,6 +796,85 @@
                         tempTip.show("网络错误："+err);
                     });
                 },
+                // 运输收费修改
+                waybillChargeCheck:function (e) {
+                    let target = $(e.target);
+                    target.hide();
+                    let input = target.next();
+                    input.show();
+                    input.focus();
+                },
+                // 运输收费失焦事件
+                updateWaybillCharge:function (e) {
+                    let target = $(e.target);
+                    let _this = this;
+                    let span = target.prev();
+                    let id = target.attr('data_id');
+                    let oldCharge = span.text();
+                    let charge = target.val();
+                    if(charge !== span.text()){
+                        let ajaxUrl= '{{url("apiLocal/waybill/changeCharge")}}';
+                        axios.post(ajaxUrl,{'id':id,'charge':charge}).then(function (response) {
+                            if(response.data.success){
+                                _this.updateWaybill(id,charge);
+                                tempTip.setDuration(2000);
+                                tempTip.showSuccess('运输收费修改成功');
+                            }else{
+                                tempTip.setDuration(3000);
+                                tempTip.show('运输收费修改失败!'+response.data.fail_info);
+                                _this.updateWaybill(id,oldCharge);
+                            }
+                        }).catch(function (err) {
+                            tempTip.setDuration(3000);
+                            tempTip.show('运输收费修改失败!网络异常：'+err);
+                            _this.updateWaybill(id,oldCharge);
+                        });
+                    }
+                    span.show();
+                    target.hide();
+                },
+                // 为运单添加运输收费
+                addWaybillCharge(e){
+                    let target = $(e.target);
+                    target.css('width','85px');
+                    let _this = this;
+                    let id = target.attr('data_id');
+                    let charge = target.val();
+                    console.log(charge);
+                    let ajaxUrl= '{{url("apiLocal/waybill/changeCharge")}}';
+                    if(charge === ''|| charge === null){
+                        target.css('width','75px');
+                        return;
+                    }else{
+                        axios.post(ajaxUrl,{'id':id,'charge':charge}).then(function (response) {
+                            if(response.data.success){
+                                tempTip.setDuration(2000);
+                                tempTip.showSuccess('运输收费添加成功');
+                                _this.updateWaybill(id,charge);
+                            }else{
+                                tempTip.setDuration(3000);
+                                tempTip.show('运输收费添加失败!'+response.data.fail_info);
+                            }
+                        }).catch(function (err) {
+                            tempTip.setDuration(3000);
+                            tempTip.show('运输收费添加失败！网络异常：'+err);
+                        });
+                        target.css('width','75px');
+                    }
+                },
+                // 修改运输收费更新表格数据
+                updateWaybill(id,newCharge){
+                    this.waybills.some(function(waybill){
+                        if(waybill.id === id){
+                            waybill.charge = newCharge;
+                            return true;
+                        }
+                    })
+                },
+
+
+
+
                 // 运费修改
                 waybillFeeCheck:function (e) {
                     let target = $(e.target);
@@ -912,6 +1022,29 @@
                     let tip = target.parent().find('.toptd');
                     top.show();
                     tip.tooltip('hide');
+                },
+                refreshWaveHouseWeight(wms_bill_number) {
+                    let _this=this;
+                    let url='{{url('waybill/refreshWaveHouseWeight')}}';
+                    axios.post(url,{'wms_bill_number':wms_bill_number}).then(function (response) {
+                        if(response.data.success){
+                            _this.waybills.every(function (waybill) {
+                                if (waybill.wms_bill_number==wms_bill_number){
+                                    waybill.warehouse_weight_other=response.data.warehouseWeight;
+                                    return false;
+                                }
+                                return true;
+                            });
+                            tempTip.setDuration(3000);
+                            tempTip.showSuccess('刷新计重成功');
+                        }else{
+                            tempTip.setDuration(3000);
+                            tempTip.show('刷新计重失败!'+response.data.fail_info);
+                        }
+                    }).catch(function (err) {
+                        tempTip.setDuration(3000);
+                        tempTip.show('刷新计重失败,网络连接错误!'+err);
+                    });
                 }
             },
             filters:{

resources/views/waybill/menu.blade.php

@@ -8,7 +8,7 @@
             </li> @endcan
             @can('运输管理-录入')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('waybill/create?type=ZF')}}" :class="{active:isActive('create',2)}">录入</a>
+                <a class="nav-link" href="{{url('waybill/create?type=ZX')}}" :class="{active:isActive('create',2)}">录入</a>
             </li> @endcan
             @can('运输管理-发运')
             <li class="nav-item">

resources/views/waybill/waybillEdit.blade.php

@@ -96,7 +96,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="charge" class="col-2 col-form-label text-right text-primary">收费(元) *</label>
+                        <label for="charge" class="col-2 col-form-label text-right text-primary">运输收费(元) *</label>
                         <div class="col-8">
                             <input type="text" class="form-control @error('charge') is-invalid @enderror"
                                    name="charge" autocomplete="off" value="@if(old('charge')){{ old('charge') }}@else{{$waybill->charge}}@endif"  >
@@ -107,6 +107,32 @@
                             @enderror
                         </div>
                     </div>
+
+                    <div class="form-group row">
+                        <label for="other_charge" class="col-2 col-form-label text-right text-muted">其他收费(元)</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('other_charge') is-invalid @enderror"
+                                   name="other_charge" autocomplete="off" value="@if(old('other_charge')){{ old('other_charge') }}@else{{$waybill->other_charge}}@endif"  >
+                            @error('other_charge')
+                            <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="other_charge_remark" class="col-2 col-form-label text-right text-muted">其他收费备注</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('other_charge') is-invalid @enderror"
+                                   name="other_charge_remark" autocomplete="off" value="@if(old('other_charge_remark')){{ old('other_charge_remark') }}@else{{$waybill->other_charge_remark}}@endif"  >
+                            @error('other_charge_remark')
+                            <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $message }}</strong>
+                                    </span>·
+                            @enderror
+                        </div>
+                    </div>
+
                     <div class="form-group row">
                         <label for="collect_fee" class="col-2 col-form-label text-right text-muted">到付金额(元)</label>
                         <div class="col-8">

resources/views/weight/package/index.blade.php

@@ -78,7 +78,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200804.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200806.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

routes/apiLocal.php

@@ -27,4 +27,5 @@ Route::post('commodity/getCommodityByBarcode', 'CommodityController@apiGetCommod
 
 Route::post('waybill/recoverSelected', 'WaybillController@apiRestoreSelected');
 Route::post('waybill/changeFee', 'WaybillController@changeFee');
+Route::post('waybill/changeCharge', 'WaybillController@changeCharge');
 

routes/web.php

@@ -81,6 +81,8 @@ Route::get('waybill/recycle', 'WaybillController@recycle');   //回收站
 Route::any('waybill/ontop/top','WaybillController@waybillOnTop');
 Route::any('waybill/ontop/cancel','WaybillController@cancelOnTop');
 
+Route::post('waybill/refreshWaveHouseWeight','WaybillController@refreshWaveHouseWeight');
+
 Route::get('waybill/index','WaybillController@index');
 Route::get('waybill/delivering','WaybillController@delivering');
 Route::post('waybill/storeCarrierBill','WaybillController@storeCarrierBill');

webpack.mix.js

@@ -19,7 +19,7 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200804.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200806.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200804.js');
 mix.js('resources/js/queryForm/header.js','public/js/queryForm/header.js');