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

src/components/FinancialModule/BasicDocuments.vue

@@ -477,6 +477,8 @@
                             </span>
                             <span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;" @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
                         </td>
+                        <td @click="getQuotation(o)" v-if="!GetDetail.OrderID&&o.Config_OfferId>0">
+                          <span class="_jump_page _font_bold">查看报价单</span> </td>
                         <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                         <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
                         <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
@@ -2251,6 +2253,18 @@ export default {
             this.loading = false;
           },null)
         },
+        // 查看报价单详情
+        getQuotation(item) {
+          this.$router.push({
+              name: 'QuotationAduit',
+              query: {
+                configId: item.ConfigID,
+                Qtype: 1,
+                blank: 'y',
+                tab: '报价单查看'
+              }
+            })
+        },
         jumpCheZiPage(path, id){
             this.apipost('bus_post_GetCarfareTravelInfo', {TCID: id}, res=>{
                 if(res.data.resultCode==1){
@@ -2887,7 +2901,7 @@ export default {
                     }
                     this.chongJudge(data)
                     this.GetDetail = data;
-                    
+
             let list = this.GetDetail.AuditSteps.filter(x=>x.NextStep === 1);
             if(list.length) {
             let last = list[list.length - 1]

src/components/FinancialModule/FinancialDocuments.vue

@@ -1280,7 +1280,13 @@ input[type="number"] {
         </button>
       </div>
     </el-dialog>
-      <!-- 修改汇率 -->
+    <editExchangeRate v-if="costmodeHL"
+      :hlData="trabeListHL"
+      @success="resetPageIndex(),
+      getPageList(),
+      costmodeHL=false"
+      @cancel="costmodeHL=false"></editExchangeRate>
+      <!-- 修改汇率
       <el-dialog title="修改汇率" width="400px"
       :visible.sync="costmodeHL" center >
       <template v-for='(x,y) in trabeListHL'>
@@ -1298,17 +1304,14 @@ input[type="number"] {
           </el-form>
           <el-form label-width="110px" style="padding: 5px 0;">
               汇率：
-              <!-- <span v-if="!bianjiShow">{{x.Rate}}</span> -->
               <el-input-number v-model="x.Rate" :min="0" style="width: 240px;" @change="getRate"></el-input-number>
-              <!-- <span class="iconfont" :class="{'icon-bianji':!bianjiShow,'icon-quxiao1':bianjiShow}" @click="bianjiShow=!bianjiShow"
-              style="cursor: pointer;color: red;margin-left: 10px;font-size: 13px;"></span> -->
           </el-form>
       </template>
       <div slot="footer" class="dialog-footer">
       <el-button class="hollowFixedBtn" @click="costmodeHL=false">{{$t('pub.cancelBtn')}}</el-button>
       <el-button class="normalBtn" type="primary" @click="preservetransactionHL()">{{$t('pub.sureBtn')}}</el-button>
       </div>
-  </el-dialog>
+  </el-dialog> -->
     </div>
 </template>
 <script>
@@ -1317,6 +1320,7 @@ import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
 import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 import shouxufei from "./components/shouxufei.vue";
+import editExchangeRate from "./components/editExchangeRate.vue";
 export default {
   data() {
     return {
@@ -1561,7 +1565,8 @@ export default {
     "my-RVB-Bill": myrbvBill,
     "my-HB-Bill": myhrBill,
     "my-GZ-Bill": myGZBill,
-    shouxufei
+    shouxufei,
+    editExchangeRate
   },
   mounted() {
     let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
@@ -1618,6 +1623,9 @@ export default {
       }, err => {})
     },
     showhuilv(row){
+      this.trabeListHL = row
+      this.costmodeHL = true
+      return
       this.apipost('Financial_get_GetFinanceRate', {FinanceId:row.FrID}, res => {
           if (res.data.resultCode == 1) {
           this.trabeListHL = res.data.data

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -825,6 +825,7 @@
 
       </div>
       <div class="_conten">
+        {{GetDetail.Type}}
         <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID"
           :width="widthSon" :color="colorSon"></my-Bill>
         <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"
@@ -904,7 +905,7 @@
                   <span>{{o.GuestTotalNum?o.GuestTotalNum:0}}</span>份
                 </span>
                 <a v-if="o.PriceTeamTypeName && o.PriceTeamTypeName =='单团'"
-                  style="cursor: pointer;text-decoration: underline;" target="_blank" :href="o.PriceOfferUrl">报价单</a>
+                  style="cursor: pointer;text-decoration: underline;" target="_blank" :href="o.PriceOfferUrl">报价单附件</a>
                 <span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1 && GetDetail.ClientType===7"
                   @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">
                   领队导游往来
@@ -912,6 +913,8 @@
                 <span v-if="GetDetail.IsShowDiJieChargeUrl==1" style="margin-left:10px;cursor:pointer;"
                   @click="jumpHotelContract('HotelContract',o)">手配费详情</span>
               </td>
+              <td @click="getQuotation(o)" v-if="!GetDetail.OrderID&&o.Config_OfferId>0">
+                <span class="_jump_page _font_bold">查看报价单</span> </td>
               <td @click="gotoTravelList(o)"> <span class="_jump_page _font_bold">查看团队</span> </td>
               <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
               <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi"
@@ -2080,6 +2083,18 @@
           }
         }, null)
       },
+      // 查看报价单详情
+      getQuotation(item) {
+        this.$router.push({
+            name: 'QuotationAduit',
+            query: {
+              configId: item.ConfigID,
+              Qtype: 1,
+              blank: 'y',
+              tab: '报价单查看'
+            }
+          })
+      },
       //跳转到团控列表
       gotoTravelList(item) {
         var path = "";