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

src/components/FinancialModule/invoicesManager.vue

@@ -123,6 +123,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="公司">
+              <el-select v-model="msg.RB_Branch_Id" filterable style="width: 130px">
+                <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" :gutter="35">
             <el-form-item label="申请日期">
               <el-date-picker
@@ -230,6 +239,8 @@ export default {
   data() {
     return {
       active: 1,
+      RB_Group_Id:'',
+      companyList:[],
       msg: {
         TCID: 0,
         TCNUM: '',
@@ -243,6 +254,7 @@ export default {
         eDate: '',
         pageIndex: 1,
         pageSize: 10,
+        RB_Branch_Id:-1
       },
       productionDate: [],
       dataList: [],
@@ -288,6 +300,7 @@ export default {
       this.msg.eDate = this.productionDate[1];
     },
     getPageList: function () {
+      console.log(this.msg.BName)
       this.loading = true
       if (this.msg.OrderId === '') {
         this.msg.OrderId = 0
@@ -324,9 +337,19 @@ export default {
       this.msg.pageIndex=1;
       this.currentPage = 1;
     },
+    getBranchList(){
+
+      this.RB_Group_Id = this.getLocalStorage().RB_Group_id;
+      this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
+        if (res.data.resultCode == 1) {
+          this.companyList=res.data.data;
+        }
+      }, null)
+    }
   },
   mounted() {
     this.getPageList();
+    this.getBranchList();
   }
 };
 </script>

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -149,7 +149,7 @@
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> &nbsp;
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
           <button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
         </li>
       </ul>
@@ -202,6 +202,17 @@
         </tr>
       </tbody>
     </table>
+    <div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
+    <div v-if="DataList.length>0">
+      <el-pagination
+        background
+        @current-change="handleCurrentChange"
+        :current-page.sync="currentPage"
+        layout="total,prev, pager, next, jumper"
+        :page-size='queryMsg.pageSize'
+        :total='total'>
+      </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -232,7 +243,9 @@
           QEndDate: ""
         },
         //数据列表
-        DataList: []
+        DataList: [],
+        currentPage: 0,
+        total:0,
       };
     },
     methods: {
@@ -285,8 +298,8 @@
           res => {
             this.queryCommonData.loading = false;
             if (res.data.resultCode == 1) {
-              this.DataList = res.data.data;
-
+              this.total = res.data.data.count
+              this.DataList = res.data.data.pageData;
               this.DataList.forEach(item => {
                 switch (item.StartCityName) {
                   case '成都':
@@ -374,6 +387,14 @@
         d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
         return d.toLocaleDateString().match(/\d+/g).join('-')
       },
+      handleCurrentChange: function (val) { //翻页
+        this.queryMsg.pageIndex = val;
+        this.getList();
+      },
+      resetPageIndex: function (){  // 重置页码
+        this.queryMsg.pageIndex=1;
+        this.currentPage = 1;
+      },
     },
     mounted() {
       let myDate = new Date();

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -81,7 +81,7 @@
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" /> &nbsp;
+          <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
           <button class="hollowFixedBtn" @click="DownLoadFile()">下载</button>
         </li>
       </ul>
@@ -126,6 +126,18 @@
         </tr>
       </tbody>
     </table>
+
+    <div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
+    <div v-if="DataList.length>0">
+      <el-pagination
+        background
+        @current-change="handleCurrentChange"
+        :current-page.sync="currentPage"
+        layout="total,prev, pager, next, jumper"
+        :page-size='queryMsg.pageSize'
+        :total='total'>
+      </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -156,7 +168,9 @@
           QEndDate: ""
         },
         //数据列表
-        DataList: []
+        DataList: [],
+        currentPage: 0,
+        total:0,
       };
     },
     methods: {
@@ -209,7 +223,8 @@
           res => {
             this.queryCommonData.loading = false;
             if (res.data.resultCode == 1) {
-              this.DataList = res.data.data;
+              this.total = res.data.data.count
+              this.DataList = res.data.data.pageData;
               this.DataList.forEach(item => {
                 switch (item.StartCityName) {
                   case '成都':
@@ -289,6 +304,14 @@
           }
         });
       },
+      handleCurrentChange: function (val) { //翻页
+        this.queryMsg.pageIndex = val;
+        this.getList();
+      },
+      resetPageIndex: function (){  // 重置页码
+        this.queryMsg.pageIndex=1;
+        this.currentPage = 1;
+      },
     },
     mounted() {
       this.getCompanyList();