Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/TestController.php

@@ -178,7 +178,6 @@ class TestController extends Controller
 
     public function test()
     {
-        app('OwnerAreaReportService')->update(["id"=>99],["accounting_area"=>'60.0']);
     }
     public function restoreBillReport()
     {
@@ -189,14 +188,12 @@ class TestController extends Controller
             if ($report){
                 if (!$area->ownerStoragePriceModel)return false;
                 $storeFee = app("OwnerStoragePriceModelService")->calculationAmount($area->ownerStoragePriceModel, $area->accounting_area, $area->owner_id, $area->counting_month);
-                if ($storeFee != 0){
-                    $up = ["storage_fee"=>$storeFee];
-                    if ($report->confirm_fee !== null || $report->confirmed == '是'){
-                        $initial = $report->work_fee + $report->logistic_fee + $storeFee;
-                        $up["difference"] = $initial - $report->confirm_fee;
-                    }
-                    $report->update($up);
+                $up = ["storage_fee"=>$storeFee];
+                if ($report->confirm_fee !== null || $report->confirmed == '是'){
+                    $initial = $report->work_fee + $report->logistic_fee + $storeFee;
+                    $up["difference"] = $initial - $report->confirm_fee;
                 }
+                $report->update($up);
             }
         }
     }

app/Services/OwnerAreaReportService.php

@@ -63,14 +63,12 @@ class OwnerAreaReportService
                 if ($report){
                     if (!$area->ownerStoragePriceModel)return false;
                     $storeFee = app("OwnerStoragePriceModelService")->calculationAmount($area->ownerStoragePriceModel, $values["accounting_area"], $area->owner_id, $area->counting_month);
-                    if ($storeFee != 0){
-                        $up = ["storage_fee"=>$storeFee];
-                        if ($report->confirm_fee !== null || $report->confirmed == '是'){
-                            $initial = $report->work_fee + $report->logistic_fee + $storeFee;
-                            $up["difference"] = $initial - $report->confirm_fee;
-                        }
-                        $report->update($up);
+                    $up = ["storage_fee"=>$storeFee];
+                    if ($report->confirm_fee !== null || $report->confirmed == '是'){
+                        $initial = $report->work_fee + $report->logistic_fee + $storeFee;
+                        $up["difference"] = $initial - $report->confirm_fee;
                     }
+                    $report->update($up);
                 }
             }
             $area->update($values);

resources/views/customer/project/part/_express.blade.php

@@ -100,22 +100,22 @@
              :class="hover.express ? 'text-danger font-weight-bold text-shadow-stress' : ''">
             <div class="w-100 text-nowrap">
                 <label class="w-25 d-inline-block m-0 text-center">省</label>
-                <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*25+'%'}">
-                    首重价格(@{{ (model.express.amount_interval[i+1]) ? (model.express.amount_interval[i]+'-'+model.express.amount_interval[i+1]) : (model.express.amount_interval[i]+' +') }}单)
+                <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*33+'%'}">
+                    首重价(@{{ (model.express.amount_interval[i+1]) ? (model.express.amount_interval[i]+'-'+model.express.amount_interval[i+1]) : (model.express.amount_interval[i]+' +') }}单)
                 </label>
-                <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*25+'%'}">
-                    续重价格(@{{ (model.express.amount_interval[i+1]) ? (model.express.amount_interval[i]+'-'+model.express.amount_interval[i+1]) : (model.express.amount_interval[i]+' +') }}单)
+                <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*33+'%'}">
+                    续重价(@{{ (model.express.amount_interval[i+1]) ? (model.express.amount_interval[i]+'-'+model.express.amount_interval[i+1]) : (model.express.amount_interval[i]+' +') }}单)
                 </label>
-                <label v-if="!model.express.isInterval" class="w-25 d-inline-block m-0 text-center">首重价格</label>
-                <label v-if="!model.express.isInterval" class="w-25 d-inline-block m-0 text-center">续重价格</label>
+                <label v-if="!model.express.isInterval" class="w-25 d-inline-block m-0 text-center">首重价</label>
+                <label v-if="!model.express.isInterval" class="w-25 d-inline-block m-0 text-center">续重价</label>
             </div>
             <div class="w-100 text-nowrap" v-if="model.express.isInterval">
                 <label class="w-25 d-inline-block m-0 text-center"></label>
-                <label class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*25+'%'}">
+                <label class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*33+'%'}">
                     <label v-if="model.express.weight_interval[i].length>0" v-for="(weight,j) in model.express.weight_interval[i]" :style="{width:100/model.express.weight_interval[i].length+'%'}">重(@{{ model.express.weight_interval[i][j+1] ? (model.express.weight_interval[i][j]+'-'+model.express.weight_interval[i][j+1]) : (model.express.weight_interval[i][j]+' +') }}kg)</label>
                     <label v-if="model.express.weight_interval[i].length<=0" class="w-100">重(0 +kg)</label>
                 </label>
-                <label class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*25+'%'}">
+                <label class="d-inline-block m-0 text-center" v-for="(amount,i) in model.express.amount_interval" :style="{width:(model.express.weight_interval[i].length<1 ? 1 : model.express.weight_interval[i].length)*33+'%'}">
                     <label v-if="model.express.weight_interval[i].length>0" v-for="(weight,j) in model.express.weight_interval[i]" :style="{width:100/model.express.weight_interval[i].length+'%'}">重(@{{ model.express.weight_interval[i][j+1] ? (model.express.weight_interval[i][j]+'-'+model.express.weight_interval[i][j+1]) : (model.express.weight_interval[i][j]+' +') }}kg)</label>
                     <label v-if="model.express.weight_interval[i].length<=0" class="w-100">重(0 +kg)</label>
                 </label>
@@ -127,7 +127,7 @@
                             <option v-for="province in pool.provinces" :value="province.id">@{{ province.name }}</option>
                         </select>
                     </label>
-                    <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,j) in model.express.amount_interval" :style="{width:(model.express.weight_interval[j].length<1 ? 1 : model.express.weight_interval[j].length)*25+'%'}">
+                    <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,j) in model.express.amount_interval" :style="{width:(model.express.weight_interval[j].length<1 ? 1 : model.express.weight_interval[j].length)*33+'%'}">
                         <label v-for="(weight,k) in model.express.weight_interval[j]" :style="{width:100/model.express.weight_interval[j].length+'%'}">
                             <input type="number" step="0.01" min="0" :class="errors['items.'+i+'.initial_weight_price.'+j+'.'+k] ? 'is-invalid' : ''" class="form-control form-control-sm" v-model="item.initial_weight_price[j][k]">
                         </label>
@@ -135,7 +135,7 @@
                             <input type="number" step="0.01" min="0" :class="errors['items.'+i+'.initial_weight_price.'+j+'.0'] ? 'is-invalid' : ''" class="form-control form-control-sm" v-model="model.express.items[i]['initial_weight_price'][j][0]">
                         </label>
                     </label>
-                    <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,j) in model.express.amount_interval" :style="{width:(model.express.weight_interval[j].length<1 ? 1 : model.express.weight_interval[j].length)*25+'%'}">
+                    <label v-if="model.express.isInterval" class="d-inline-block m-0 text-center" v-for="(amount,j) in model.express.amount_interval" :style="{width:(model.express.weight_interval[j].length<1 ? 1 : model.express.weight_interval[j].length)*33+'%'}">
                         <label v-for="(weight,k) in model.express.weight_interval[j]" :style="{width:100/model.express.weight_interval[j].length+'%'}">
                             <input type="number" :class="errors['items.'+i+'.additional_weight_price.'+j+'.'+k] ? 'is-invalid' : ''" step="0.01" min="0" class="form-control form-control-sm" v-model="item.additional_weight_price[j][k]">
                         </label>