build

src/pages/accountsReceivable.vue

@@ -3,13 +3,13 @@
     <div v-if="!state.error && isShow">
       <div class="table-header" style="line-height:36px">万宇应收账款报表看板</div>
       <el-table
-        :data="tableData"
-        v-loading="loading"
-        border
         :max-height="maxHeight"
-        :size="'mini'"
+        v-loading="loading"
+        :data="tableData"
         style="width: 100%"
+        :size="'mini'"
         row-key="id"
+        border
         stripe
       >
         <el-table-column label="业务公司" fixed="left" width="80" prop="depart">
@@ -58,7 +58,7 @@
       </el-table>
     </div>
 
-    <template v-else>
+    <template v-else-if="!state.loading">
       <unusual-state :hasPermission="isShow" :message="state.message" path="accountsReceivable" />
     </template>
   </div>

src/pages/index.vue

@@ -15,10 +15,10 @@ export default {
   data(){
     return {
       routes:[
-        {label:'业绩报表',link:'/?path=results'},
-        {label:'利润看板',link:'/?path=report'},
-        {label:'应收账款',link:'/?path=accountsReceivable'},
-        {label:'数据统计',link:'/?path=newReport'}
+        {label:'业绩报表', link:'/?path=results'},
+        {label:'利润看板', link:'/?path=report'},
+        {label:'应收账款', link:'/?path=accountsReceivable'},
+        {label:'数据统计', link:'/?path=newReport'}
       ]
     }
   },

src/pages/newReport.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="new-report" v-loading="state.loading">
+  <div class="new-report" v-loading="state.loading" style="min-height:300px">
     <div v-if="!state.error && isShow">
       <div style="display:flex;justify-content:flex-end">
         <period-date-picker :start="date[0]" :end="date[1]" size="mini" width="150px" @timeReturned="time($event)" />
@@ -7,27 +7,27 @@
 
       <el-row gutter="20">
         <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-          <p class="title">1.咨询单情况</p>
+          <p class="title">1.竞价咨询统计</p>
           <consult :date="date" />
 
-          <p class="title">2.竞价单空返情况统计:</p>
+          <p class="title">2.竞价空返统计:</p>
           <empty-return :date="date" />
         </el-col>
 
         <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
-          <p class="title">3.订单未发货情况</p>
+          <p class="title">3.无地址销售订单统计</p>
           <not-deliver-good :date="date" />
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
         <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-          <p class="title">4.备库单情况</p>
+          <p class="title">4.备库单统计</p>
           <stock :date="date" />
         </el-col>
 
         <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
-          <p class="title">5.订单情况</p>
+          <p class="title">5.销售订单统计</p>
           <order :date="date" />
         </el-col>
       </el-row>
@@ -38,37 +38,37 @@
         </el-col> -->
 
         <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-          <p class="title">6.采购员竞价反馈情况 : 竞价单总量 : {{ zxTotal }}</p>
+          <p class="title">6.竞价反馈统计</p>
           <purchase-back :date="date" @getZXTotal="getZXTotal" />
         </el-col>
 
         <el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
-          <p class="title">7.采购员采购单情况</p>
+          <p class="title">7.采购订单统计</p>
           <purchase :date="date" />
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">8.发货工单时效:</p>
+          <p class="title">8.发货工单未发货时效统计</p>
           <send-order :date="date" />
         </el-col>
 
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <p class="title">9.发货单时效:</p>
+          <p class="title">9.待采购备货统计</p>
           <send-exp :date="date" />
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
         <el-col :xs="24">
-          <p class="title">10.当日库存销售情况表:</p>
+          <p class="title">10.当日库存销售统计</p>
           <the-sales :date="date" />
         </el-col>
       </el-row>
     </div>
 
-    <template v-else>
+    <template v-else-if="!state.loading">
       <unusual-state :hasPermission="isShow" :message="state.message" path="newReport" />
     </template>
   </div>
@@ -170,7 +170,7 @@ export default {
 		  //      "subscribe_time": "2022-12-21 15:52:14",
 		  //      "addr": "\/\/",
 		  //      "status": "1",
-		  //      "is_show": ["1", "2"],
+		  //      "is_show": ["1", "2", "4"],
 		  //      "companyArr": [{
 		  //      	"companyNo": "GS2302231125079621",
 		  //      	"companyName": "北京百辰荣达国际科贸有限公司",