2

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -801,7 +801,10 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 员工人头奖励:{{GetDetail.ReFinanceId}}</span>
           <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==49 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 佣金/存折:{{GetDetail.ReFinanceId}}</span>   
-
+          <span class="fr q-mr-sm" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==33&&GetDetail.RelevanceFrId"
+              @click="goCoffeeOrder(GetDetail.RelevanceFrId)"> 商品订单:{{GetDetail.RelevanceFrId}}</span>
+          <span class="cursor-pointer q-mr-sm" style="color:#1273bc;text-decoration: underline;float: right;" @click="goCoffeeOrder(GetDetail.ReFinanceId2)" 
+           v-if="GetDetail.OtherType===54">查看订单：{{GetDetail.ReFinanceId2}}</span>
           <template v-if="GetDetail.RelevanceFrId">
             <span class="fr" style="margin-right:10px;">
               相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -3502,7 +3505,12 @@
             CommissionType: 1
           }
         })
-      }
+      },
+      goCoffeeOrder(id) {
+        this.OpenNewUrl('/stuMan/coffeeManage/order',{
+          id: id,
+        })
+      },
     },
     created() {
       if (this.$route.query.pageIndex) {

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -818,6 +818,7 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育资产采购:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==32"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材采购:{{GetDetail.ReFinanceId}}</span>
+            
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==33"
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==39"
@@ -839,7 +840,6 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 员工人头奖励:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==49 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 佣金/存折:{{GetDetail.ReFinanceId}}</span>
-
             <template v-if="GetDetail.RelevanceFrId">
               <span class="fr" style="margin-right:10px;">
                 相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)"
@@ -884,6 +884,10 @@
               <span style="color:blue;cursor:pointer;text-decoration:underline;"
                 @click="showViewOrder">{{GetDetail.ReFinanceId}}</span>
             </span>
+            <span class="fr q-mr-sm" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==33&&GetDetail.RelevanceFrId"
+              @click="goCoffeeOrder(GetDetail.RelevanceFrId)"> 商品订单:{{GetDetail.RelevanceFrId}}</span>
+            <span class="cursor-pointer q-mr-sm" style="color:#1273bc;text-decoration: underline;float: right;" @click="goCoffeeOrder(GetDetail.ReFinanceId2)" 
+              v-if="GetDetail.OtherType===54">查看订单：{{GetDetail.ReFinanceId2}}</span>
           </p>
           <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%"
             v-if="GetDetail.TCIDAndTCNUMList.length>0">
@@ -1011,8 +1015,7 @@
               发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
             </div>
           </div>
-          <div class="cursor-pointer full-width " style="color:#1273bc;text-decoration: underline;display:flex;justify-content:flex-end;position:absolute;top:10px;right:15px" @click="goCoffeeOrder" 
-           v-if="GetDetail.OtherType==54">查看订单：{{GetDetail.ReFinanceId2}}</div>
+          
         </div>
 
         <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
@@ -2364,9 +2367,9 @@
           }
         })
       },
-      goCoffeeOrder() {
+      goCoffeeOrder(id) {
         this.OpenNewUrl('/stuMan/coffeeManage/order',{
-          id: this.GetDetail.ReFinanceId2
+          id: id,
         })
       },
     },