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

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -132,7 +132,7 @@
             <div v-show="tableShow3" class="sanjiao-box _padding_20_15">
                 <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
                     <tr>
-                        <th width="50">编号</th>
+                        <th width="90">编号</th>
                         <th>名称</th>
                         
                     </tr>

src/components/SalesModule/ElectricityGoodsDetails.vue

@@ -185,6 +185,17 @@
           </td>
         </tr>
       </table>
+      <div style="text-align:center">
+          <el-pagination
+        background
+        @current-change="handleCurrentChange"
+        v-if="dataList.length>0"
+        :current-page.sync="currentPage"
+        layout="total,prev, pager, next, jumper"
+        :page-size="msg.pageSize"
+        :total="total"
+        ></el-pagination>
+      </div>
       <p class="sfd_tit clearfix">付款单 
           <!-- <input type="button"  v-if="(item.isOwn ? item.isOwn : item.IsOwn) ===1 && (item.orderState ? item.orderState : item.OrderState) !== '4' && (item.orderState ? item.orderState : item.OrderState) !== '3'" value="新增付款" class="normalBtn" @click="addFinancialOrder(2)"> -->
     </p>
@@ -273,6 +284,17 @@
           </td>
         </tr>
       </table>
+      <div style="text-align:center">
+          <el-pagination
+        background
+        @current-change="handleCurrentChange2"
+        v-if="dataListP.length>0"
+        :current-page.sync="currentPage2"
+        layout="total,prev, pager, next, jumper"
+        :page-size="msg2.pageSize"
+        :total="total2"
+        ></el-pagination>
+      </div>
     </div>
   </div>
 </template>
@@ -280,6 +302,10 @@
 export default {
   data() {
     return {
+      currentPage:1,
+      currentPage2:1,
+      total:0,
+      total2:0,
       orderId: 0,
       dataList: [],
       dataListP: [],
@@ -289,10 +315,16 @@ export default {
       tcnum: '',
       msg:{
         pageIndex: 1,
-        pageSize: 999,
+        pageSize: 15,
         ReFinanceId:0,
         Type:1,
       },
+      msg2:{
+        pageIndex: 1,
+        pageSize: 15,
+        ReFinanceId:0,
+        Type:2,
+      },
       GetFinancLogList: [],
       LogLoading: true,
       allMoney: 0,
@@ -322,14 +354,19 @@ export default {
     goUrl: function (name, path, id ) {
       this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
     },
-    getList: function (type) {
-      this.msg.Type = type;
-      this.loading = true;
+    handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+    },
+    handleCurrentChange2(val) {
+        this.msg2.pageIndex = val;
+        this.getList2();
+    },
+    getList(){
       this.apipost('Financial_get_GetECommerceGoodsFinancePageList', this.msg, res=>{
-        
+        this.loading = false;
         if (res.data.resultCode == 1) {
           let data = res.data.data.pageData;
-          if (type===1) {
             this.allMoney = 0;
             this.shiMoney = 0;
             data.forEach(x=>{
@@ -337,9 +374,19 @@ export default {
                 this.shiMoney += (x.PayMoney+x.Fee)
             })
             this.dataList = data;
-            this.getList(2)
-          } else {
-            this.loading = false;
+            this.total=res.data.data.count;
+        } else {
+          this.loading = false;
+          this.$message.error(res.data.message);
+        }
+      }, null)
+    },
+    getList2() {
+      this.loading = true;
+      this.apipost('Financial_get_GetECommerceGoodsFinancePageList', this.msg2, res=>{
+        this.loading = false;
+        if (res.data.resultCode == 1) {
+          let data = res.data.data.pageData;
             this.allMoneyP = 0;
             this.shiMoneyP = 0;
             data.forEach(x=>{
@@ -349,8 +396,7 @@ export default {
               // }
             })
             this.dataListP = data;
-            
-          }
+            this.total2=res.data.data.count;
         } else {
           this.loading = false;
           this.$message.error(res.data.message);
@@ -402,6 +448,7 @@ export default {
   }, mounted() {
     this.ReFinanceId=this.$route.query.ReFinanceId?this.$route.query.ReFinanceId:this.ReFinanceId;
     this.msg.ReFinanceId=this.$route.query.ReFinanceId?this.$route.query.ReFinanceId:this.ReFinanceId;
+    this.msg2.ReFinanceId=this.$route.query.ReFinanceId?this.$route.query.ReFinanceId:this.ReFinanceId;
     this.userId = this.getLocalStorage().EmployeeId;
     let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
     this.item = obj
@@ -409,7 +456,8 @@ export default {
     this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
     this.tcid = obj.tcid ? obj.tcid : obj.TCID
     this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId
-    this.getList(1)
+    this.getList()
+    this.getList2()
     this.getstaInfo();
   }
 }