Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -17,6 +17,11 @@
   float: left;
 }
 .page_EasyReport_form .el-date-editor.el-input,.page_EasyReport_form .el-date-editor.el-input__inner{width: 100% !important;}
+.easyUpdateTime{
+  position: absolute;
+  top: 55px;
+  right: 0;
+}
 </style>
 <template>
   <div class="page_EasyReport" v-loading="AALloading">
@@ -55,6 +60,8 @@
         <!-- <button class="normalBtn " @click="togbu">一键同步</button> -->
       </div>
       <button class="normalBtn page_EasyReport_search" @click="getData">确定</button>
+      <p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
+      <p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
     </div>
     <div style="margin-bottom:25px;" v-loading='loading'>
       <v-table
@@ -488,6 +495,9 @@ export default {
       },
       data: [],
       DataList: [],
+      UpdateStaus:0,
+      UpdateStartTime:'',
+      UpdateEndTime:'',
       BranchList: [],
       MonthIndex: 0,
       pageSize: 18,
@@ -865,6 +875,9 @@ export default {
             this.monthList[i].value = x.Money
           })
           this.DataList = data.list
+          this.UpdateStaus=data.Status;
+          this.UpdateStartTime=data.UpdateStartTime;
+          this.UpdateEndTime=data.UpdateEndTime;
           this.loading = false
           this.$forceUpdate()
           return

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -517,6 +517,11 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>     
+          <el-col  :span="4">
+            <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
+            <p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
+            </el-col>     
+          
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -749,6 +754,9 @@ export default {
         Status: "0"
       },
       DataList: [],
+      UpdateStaus:0,
+      UpdateStartTime:'',
+      UpdateEndTime:'',
       CompanyList: [],
       productionDate: [],
       loading: false,
@@ -1889,11 +1897,13 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             //console.log( res.data.data);
-            let data = res.data.data.pageData;
+            let data = res.data.data.pmodel.pageData;
             // res.data.data.TotalRevenue
-            this.total = res.data.data.count;
-            this.SDate=res.data.data.StartDate;
-            this.EDate=res.data.data.NextDate;
+            this.total = res.data.data.pmodel.count;
+            this.SDate=res.data.data.pmodel.StartDate;
+            this.EDate=res.data.data.pmodel.NextDate;
+            this.UpdateStaus=res.data.data.Status;
+            this.UpdateStartTime=res.data.data.UpdateTime;
             if (this.total == 0) {
               this.DataList = [];
             } else {

src/router/config.js

@@ -1715,7 +1715,7 @@ export default {
               name: 'groupInquiry',
               component: resolve => require(['@/components/SalesModule/groupInquiry'], resolve),
               meta: {
-                title: '团期查询'
+                title: '签证办理'
               },
             },{ // 签证中心 签证财务单据
               path: '/VisaFinancialDocuments',