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

src/components/course/courserefund-form.vue

@@ -24,7 +24,7 @@
       <div>您的退款协议《{{ProtocolNum}}》</div>
       <div>请长按识别二维码,查阅并签字</div>
     </div>
-    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
       separator="none" title="退课协议" :data="dataList" :columns="columns" row-key="name">
       <template v-slot:top="props">
         <div class="col-2 q-table__title">退课协议</div>
@@ -70,7 +70,7 @@
       <template v-slot:bottom>
       </template>
       <template v-slot:body-cell-optioned="props">
-        <q-td :props="props">
+        <q-td :props="props" style="width:100px;">
           <div>
             <el-tooltip v-if="AuthorityObj.isShowCopyLink" content="复制链接发送给客人签字" placement="top" effect="light">
               <q-btn flat v-if=" props.row.AuditStatus == 2 &&props.row.IsSure==0" size="xs"

src/pages/courseRefund.vue

@@ -5,7 +5,6 @@
     height: auto;
     margin: auto;
     padding: 20px 0;
-    color: #000;
   }
 
   .firstPage {

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -839,7 +839,12 @@
                 {{sItem}}</span>
               </span>
             </template>
-
+            <template v-if="GetDetail.OtherType==28">
+              <span class="fr" style="text-decoration: underline;cursor: pointer;"
+                @click="goTuikuanDetail('/user/billquery',GetDetail.ReFinanceId)"> 退款申请单:{{GetDetail.ReFinanceId}}</span>
+              <span class="fr" style="text-decoration: underline;cursor: pointer;margin-right:20px;"
+                @click="goTuikuanDetail('/courseRefund',GetDetail.ReFinanceId2)"> 退款协议:{{GetDetail.ReFinanceId2}}</span>
+            </template>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==17"
               @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
             <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)"
@@ -2181,6 +2186,12 @@
             path: tempStr
           });
       },
+      //跳转到退款协议
+      goTuikuanDetail(path,Id){
+        this.OpenNewUrl(path,{
+          Id:Id
+        })
+      },
       lookbreakage(ID) {
         this.$router.replace({
           name: "breakageSingle",

src/pages/user/billquery.vue

@@ -300,6 +300,9 @@
       }
     },
     mounted() {
+      if(this.$route.query.Id){
+        this.msg.Id = this.$route.query.Id;
+      }
       this.currentUrl = this.$route.path;
       this.getEducationType();
       this.getStuBackBill();