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

src/components/sale/orderlist.vue

@@ -645,7 +645,11 @@
                 </div>
                 <div class="col">
                   <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 &&
@@ -658,6 +662,7 @@
                       ">
                       <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;">
@@ -678,11 +683,12 @@
                             </tr>
                           </table>
                         </div>
-                          <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单"
+                        <q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单"
+                          style="min-width:70px;float:right;margin-top:10px" />
+                        <q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1,'原路')" label="确定原路退款"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
-                    </template>
                   </div>
                   <div class="row wrap">
                     <div class="finance row" v-for="(x, j) in item.FinanceList" :key="j" :style="{
@@ -708,7 +714,11 @@
                   </div>
 
                   <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>
                     <q-btn flat size="xs" icon="edit" v-if="
                         AuthorityObj.isShowFinanceBtn &&
                           AuthorityObj.isShowEdit &&
@@ -721,6 +731,7 @@
                       ">
                       <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;">
@@ -741,11 +752,12 @@
                             </tr>
                           </table>
                         </div>
-                          <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单"
+                        <q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单"
+                          style="min-width:70px;float:right;margin-top:10px" />
+                        <q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2,'学费退回')" label="确定转账退款"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
-                    </template>
                   </div>
                   <div class="row wrap">
                     <div class="finance row" v-for="(x, j) in item.RefundFinanceList"
@@ -1370,7 +1382,8 @@
         isShowContract: false,
         imgViewUrl: "",
         imgViewList: [],
-        initialIndex: 0
+        initialIndex: 0,
+        IsRefund: 0,
       };
     },
     created() {
@@ -1387,6 +1400,7 @@
           if (x.FunctionCode == "Edit_Order") {
             this.isEditOrder = true;
           }
+          this.AuthorityObj[x.FunctionCode] = x.FunctionCode
         });
       }
     },
@@ -1414,6 +1428,10 @@
     },
     mounted() {},
     methods: {
+      clickRefund(type){
+        this.IsRefund = type
+        this.showChooseStudent = true
+      },
       //点击合同编号预览
       getShowContract(item) {
         this.isShowPop = false;
@@ -1797,7 +1815,7 @@
           });
       },
       //财务单据
-      chanceType(obj, type) {
+      chanceType(obj, type,name) {
         let TCIDARR = [];
         if (obj && obj.OrderType == 2) {
           //留学就业订单
@@ -1872,17 +1890,20 @@
           type = 1;
           orderObj.OtherType = 59; //59 教育 留学订单返佣  收入  2022-06-08 hk
         }
-        this.$router.push({
-          path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
-          query: {
+        let query = {
           Type: type,
           companyID: obj.ClassSchoolId,
           path: "",
           blank: "y",
           orderObj: JSON.stringify(orderObj),
           tradeWay: obj.tradeWay,
-            GuestId: guestId
+          GuestId: guestId,
+          searchTitle: name?name:''
         }
+        this.IsRefund = 0
+        this.$router.push({
+          path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
+          query
         });
       },
       chanceType_lx(obj) {

src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue

@@ -524,7 +524,6 @@
       this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
       this.searchVal = this.$route.query.searchTitle ? this.$route.query.searchTitle : '';
 
-      // searchVal
 
       if (this.$route.query.visaType) {
         this.visaShowTab = true;