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

src/components/sale/orderlist.vue

@@ -647,22 +647,25 @@
                   <div class="row" style="justify-content: space-between">
                     <div class="col row justify-between">
                       <span>收款单据：</span>
-                      <span v-if="AuthorityObj.Finance_RefundCreate&&item.Income>0"
-                      style="color: #2961FE;cursor: pointer;" @click="clickRefund(1)">原路退款</span>
                     </div>
-                    <q-btn flat size="xs" icon="edit" v-if="
-                        AuthorityObj.isShowFinanceBtn &&
-                          AuthorityObj.isShowEdit &&
-                          item.OrderType == 2
-                      " style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item, 1)" />
-                    <template v-if="
-                        AuthorityObj.isShowFinanceBtn &&
-                          AuthorityObj.isShowEdit &&
-                          item.OrderType == 1
-                      ">
-                      <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
-                        @click="showChooseStudent = true" />
-                    </template>
+                    <div class="row justify-end">
+                      <q-btn flat size="xs" icon="" v-if="type&&AuthorityObj.Finance_RefundCreate&&item.Income>0"
+                        style="font-weight:400;color: #2961FE" label="原路退款" @click="clickRefund(1)" />
+                      <q-btn flat size="xs" icon="edit" v-if="
+                          AuthorityObj.isShowFinanceBtn &&
+                            AuthorityObj.isShowEdit &&
+                            item.OrderType == 2
+                        " style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item, 1)" />
+                      <template v-if="
+                          AuthorityObj.isShowFinanceBtn &&
+                            AuthorityObj.isShowEdit &&
+                            item.OrderType == 1
+                        ">
+                        <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
+                          @click="showChooseStudent = true" />
+                      </template>
+                    </div>
+
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
                         <div style="width:500px;max-height:400px;overflow-y:auto;">
@@ -716,22 +719,25 @@
                   <div class="row" style="justify-content: space-between">
                     <div class="col row justify-between">
                       <span>付款单据：</span>
-                      <span v-if="AuthorityObj.Finance_RefundCreate&&item.Income>0"
-                      style="color: #2961FE;cursor: pointer;"  @click="clickRefund(2)">转账退款</span>
+
+                    </div>
+                    <div class="row justify-end">
+                      <q-btn flat size="xs" icon="" v-if="type&&AuthorityObj.Finance_RefundCreate&&item.Income>0"
+                        style="font-weight:400;color: #2961FE" label="转账退款" @click="clickRefund(2)" />
+                      <q-btn flat size="xs" icon="edit" v-if="
+                          AuthorityObj.isShowFinanceBtn &&
+                            AuthorityObj.isShowEdit &&
+                            item.OrderType == 2
+                        " style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item, 2)" />
+                      <template v-if="
+                          AuthorityObj.isShowFinanceBtn &&
+                            AuthorityObj.isShowEdit &&
+                            item.OrderType == 1
+                        ">
+                        <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
+                          @click="showChooseStudent = true" />
+                      </template>
                     </div>
-                    <q-btn flat size="xs" icon="edit" v-if="
-                        AuthorityObj.isShowFinanceBtn &&
-                          AuthorityObj.isShowEdit &&
-                          item.OrderType == 2
-                      " style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item, 2)" />
-                    <template v-if="
-                        AuthorityObj.isShowFinanceBtn &&
-                          AuthorityObj.isShowEdit &&
-                          item.OrderType == 1
-                      ">
-                      <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
-                        @click="showChooseStudent = true" />
-                    </template>
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
                         <div style="width:500px;max-height:400px;overflow-y:auto;">
@@ -1316,7 +1322,12 @@
       loading: {
         type: Boolean,
         default: false,
-      }
+      },
+      type: {
+        // 1 显示原路退回 转账退款
+        type: Number,
+        default: 0
+      },
     },
     data() {
       return {

src/pages/sale/orderStatistics.vue

@@ -145,7 +145,7 @@
     </div>
     <div class="page-content">
       <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3" ref="orderL"
-        :loading="loading">
+        :loading="loading" :type="1">
       </orderlist>
       <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"
@@ -551,4 +551,4 @@
     border: none !important;
     background: transparent !important;
   }
-</style>
+</style>
\ No newline at end of file