1

src/pages/sale/japaneseTrain.vue

@@ -142,6 +142,7 @@
               v-model="msg.pageIndex"
               :max="pageCount"
               @input="changePage"
+              class="full-width justify-end" color="primary" :input="true"
             >
             </q-pagination>
           </li>

src/pages/sale/myOrder.vue

@@ -294,7 +294,10 @@
                   </div>
                 </div>
                 <div class="col">
-                  <div>收款单据：</div>
+                  <div class="row" style="justify-content: space-between">
+                    <span>收款单据：</span>
+                    <span @click="chanceType(item,1)">修改</span>
+                  </div>
 
                 </div>
               </div>
@@ -302,6 +305,16 @@
           </tr>
         </tbody>
       </table>
+      <div class="row" style="justify-content: flex-end;padding: 5px 20px">
+        <q-pagination
+          v-model="msg.pageIndex"
+          :max="pageCount"
+          @input="changePage"
+          class="full-width justify-end" color="primary" :input="true"
+        >
+        </q-pagination>
+
+      </div>
 
     </div>
 
@@ -501,8 +514,11 @@
 
       //翻页
       changePage(val) {
-        this.msg.pageIndex = val;
-        this.getList()
+        if(val !=1 && this.msg.pageIndex!=1){//对第一次进来防止掉2次getList
+          this.msg.pageIndex = val;
+          this.getList()
+        }
+
       },
       resetSearch() {
         this.msg.pageIndex = 1;
@@ -526,13 +542,39 @@
         }
         this.loading = true;
         getMyOrderPageList(this.msg).then(res => {
-          this.loading = false
-          this.data = res.Data.PageData
+
+          this.data = res.Data.PageData;
+          let OrderIds=[]
+          this.data.List.forEach(x=>{
+            OrderIds.push(x.OrderId)
+          })
+          OrderIds = OrderIds.join(',')
+          this.getOrderFinanceList(OrderIds)
+
           this.pageCount = res.Data.PageCount;
         }).catch(() => {
           this.loading = false
         })
       },
+      getOrderFinanceList(msg){
+        this.apipost('sellorder_post_GetOrderFinanceListForEdu',{OrderIds:msg},res=>{
+          if(res.data.resultCode===1){
+            this.loading = false;
+            this.data.List.forEach(x=>{
+              res.data.data.forEach(j=>{
+                if(x.OrderId == j.OrderId){
+                  x.FinanceList = j.FinanceList
+                  x.RefundFinanceList = j.RefundFinanceList
+                }
+              })
+            })
+            console.log()
+          }else{
+            this.loading = false;
+            this.$message.error(res.data.message);
+          }
+        },err=>{})
+      },
       gostudent(item){//跳转到学生名单
         var tempStr = '/sale/studentList?OrderId='+item.OrderId+'&ClassId='+item.ClassId;
         this.$router.push({
@@ -748,6 +790,29 @@
         }).catch(() => {
 
         })
+      },
+      chanceType(obj,type){
+        let TCIDARR=[]
+        TCIDARR.push(obj.ClassId)
+        let orderObj = {
+          OrderID:obj.orderId,
+          OrderSource:8,
+          Obj: {},
+          SourceID:17,
+          TCIDList: TCIDARR
+        }
+        this.$router.push({
+          path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
+          query:{
+            "Type":1,
+            "companyID":this.getLocalStorage().School_Id,
+            "path": "",
+            'blank':'y',
+            'orderObj':JSON.stringify(orderObj),
+            'tradeWay':obj.tradeWay,
+
+          }
+        });
       }