审核对比结果为undefined时的显示优化

app/Http/Controllers/CustomerController.php

@@ -227,7 +227,7 @@ class CustomerController extends Controller
     public function projectArea(Request $request)
     {
         if(!Gate::allows('项目管理-项目-面积')){ return redirect('denied');  }
-        $areas = app('OwnerAreaReportService')->paginate($request->input(),["owner"=>function($query){$query->with(["customer","ownerStoragePriceModels.unit"]);},"userOwnerGroup"]);
+        $areas = app('OwnerAreaReportService')->paginate($request->input(),["owner.customer","ownerStoragePriceModel.unit","userOwnerGroup"]);
         $ownerGroups = app('UserOwnerGroupService')->getSelection();
         $customers = app('CustomerService')->getSelection();
         $owners = app('OwnerService')->getIntersectPermitting();

resources/views/customer/project/create.blade.php

@@ -59,9 +59,9 @@
             <div v-if="base == 'two'">
                 @include("customer.project.part._two")
             </div>
-            <div v-if="base == 'three'">
-                <div v-show="isLoad">@include("customer.project.part._three")</div>
-                <div class="row justify-content-center text-secondary" style="min-height: 200px;margin-left: -25%" v-show="!isLoad">
+            <div v-show="base == 'three'">
+                <div v-if="isLoad">@include("customer.project.part._three")</div>
+                <div class="row justify-content-center text-secondary" style="min-height: 200px;margin-left: -25%" v-if="!isLoad">
                     <div class="align-self-center h1">
                         <i class="fa fa-spinner fa-pulse"></i>
                     </div>
@@ -2552,11 +2552,11 @@
                     return data;
                 },
                 transformData(data,key,font=false){
-                    if (!data[key])return;
                     let html = '<div class="float-left small ';
                     if (font)html += "text-primary font-weight-bold";
                     else html += "text-secondary";
                     html+='">';
+                    if (!data[key])return html+"无</div>";
                     switch (key) {
                         case "amount_interval":
                             data[key].forEach((am,i)=>{

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

@@ -312,8 +312,8 @@
             </div>
             <div class="modal-footer">
                 <button @click="exeAuditOrRecoverModel()" class="float-right btn" :class="isAudit ? 'btn-success' : 'btn-danger'">
-                    <label v-if="isAudit">审核所有操作</label>
-                    <label v-else>回滚所有操作</label>
+                    <label v-if="isAudit">审核内容确认</label>
+                    <label v-else>回滚内容确认</label>
                 </button>
             </div>
         </div>