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

src/components/FinancialModule/RecPayQuery.vue

@@ -602,6 +602,8 @@
                 @click="editRate(scope.row)">{{$t('objFill.modifytheexchangerate')}}</div>
                 <div class="recpayQueryMore" v-if="scope.row.Type==1&&(istransaction == true || isJapanCommission == true)"
                 @click="editCommission(scope.row)">{{$t('objFill.xiugaishouxufei')}}</div>
+                <div class="recpayQueryMore" v-if="scope.row.Type==2 && scope.row.RB_Branch_Id == 1248 &&Finance_ExpenseType == true"
+                @click="editCarPayHandFee(scope.row)">永乐车行转账手续费</div>
                 <div class="recpayQueryMore" v-if="
                 scope.row.TradeWayList&&scope.row.TradeWayList.length>0&&isManageFinance == true" @click="showjiaoyi(scope.row.FrID)">{{$t('tips.jiaoyifangshi')}}</div>
                 <div class="recpayQueryMore" v-if="IsUpdatePayment == true && scope.row.Type==2" @click="showPayment(scope.row.FrID)">{{$t('objFill.xiugaidianfudx')}}</div>
@@ -828,6 +830,9 @@
     <template v-if="transactionTax">
       <shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
     </template>
+    <template v-if="transactionTax_car">
+      <shouxufei_car :transTax="transTax" @success="close(),getPageList()" @close="close"></shouxufei_car>
+    </template>
     <!--修改付款对象-->
     <el-dialog :title="$t('active.xiugaidianfudx')" width="300px" :visible.sync="PaymentSync" center >
       <el-form class="cdForm" label-width="90px">
@@ -900,6 +905,7 @@
   import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
   import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
   import shouxufei from "./components/shouxufei.vue";
+  import shouxufei_car from "./components/shouxufei_car.vue";
   import editExchangeRate from "./components/editExchangeRate.vue";
   import Vue from 'vue'
 
@@ -927,6 +933,7 @@
           ClientID: ''
         },
         transactionTax: false,
+        transactionTax_car: false,
         PaymentSync: false,//修改垫付对象
 
         showID: false,
@@ -1142,6 +1149,7 @@
       "my-Bill": myBill,
       "my-RVB-Bill": myrbvBill,
       shouxufei,
+      shouxufei_car,
       editExchangeRate
     },
     mounted() {
@@ -1182,6 +1190,9 @@
       that.MsgBus.$on('shouxufei', function (row) {
         that.shouxufei(row)
       })
+      that.MsgBus.$on('shouxufei_car', function (row) {
+        that.shouxufei_car(row)
+      })
     },
     methods: {
       goPrinting(){
@@ -1379,6 +1390,9 @@
       editCommission(rowData) {
         this.MsgBus.$emit('shouxufei', rowData);
       },
+      editCarPayHandFee(rowData) {
+        this.MsgBus.$emit('shouxufei_car', rowData);
+      },
       customCompFunc(params) {},
       sortChange(param) {
         //自己写实现
@@ -1978,8 +1992,13 @@
         this.transTax.FrId = row.FrID;
         this.transactionTax = true
       },
+      shouxufei_car(row) {
+        this.transTax.FrId = row.FrID;
+        this.transactionTax_car = true
+      },
       close() {
         this.transactionTax = false
+        this.transactionTax_car =false
       },
       showhuilv(row) {
         this.trabeListHL = row

src/components/FinancialModule/components/shouxufei_car.vue

+
+  <template>
+    <div>
+      <el-dialog title="车行转账手续费" width="300px"
+      :visible.sync="transactionTax" center @close="close">
+       <p style="font-size:12px;margin-bottom:10px;">{{$t('objFill.jiaoyishouxufei')}}：</p>
+        <el-input v-model="ObjData.Fee" :placeholder="$t('fnc.qsrneirong')"></el-input>
+      <div slot="footer" class="dialog-footer">
+      <el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
+      <el-button class="normalBtn" type="primary" @click="saveTransTaxMoney" :loading="ObjData.loading">{{$t('pub.sureBtn')}}</el-button>
+      </div>
+  </el-dialog>
+    </div>
+  </template>
+  <script>
+  export default {
+    props: ['transTax'],
+    data() {
+      return {
+        transactionTax: true,
+        ObjData:{
+          FrId: 0,
+          Fee: "0.0",
+          loading: false
+        }
+      };
+    },
+    watch: {
+      transTax:{
+        handler(val, oldval) {
+          this.ObjData = JSON.parse(JSON.stringify(val))
+        },
+        deep: true,
+        immediate: true
+      }
+    },
+    methods: {
+      saveTransTaxMoney() {
+      if (this.ObjData.loading) return;
+      this.ObjData.loading = true;
+      if (this.ObjData.Fee && this.ObjData.Fee != "") {
+        this.apipost(
+          "Financial_post_SetCarPayFinanceHandFee",
+          { FrId: this.ObjData.FrId, OriginalFee: this.ObjData.Fee },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.transactionTax=false
+              this.$emit('success')
+            }
+            this.ObjData.loading = false;
+          },
+          err => {
+            this.ObjData.loading = false;
+          }
+        );
+      } else {
+        this.ObjData.loading = false;
+        this.$message.error(this.$t('objFill.qingshurusxf'));
+      }
+      },
+      close(){
+        this.$emit('close')
+      },
+    },
+    mounted() {
+
+    }
+  };
+  </script>
+
+  <style>
+
+  </style>

src/components/orderCommon/productOrderList.vue

@@ -824,17 +824,22 @@
             <p>
               <i class="iconfont icon-hangban1"></i>{{ $t("Operation.Op_Warmprompt") }}
             </p>
-            <p>
+            <!-- <p style="color:red;">
+              <span>签证人员</span><i>{{
+                  item.VisaOPName === "" ? "未设置" : item.VisaOPName
+                }}</i>
+            </p> -->
+            <p style="color:red;">
               <span>{{ $t("visa.v_sqtime") }}</span><i>{{
                   item.SendVisaTime === "" ? "未设置" : item.SendVisaTime
                 }}</i>
             </p>
-            <p>
+            <p style="color:red;">
               <span>{{ $t("visa.v_cqtime") }}</span><i>{{
                   item.OutVisaTime === "" ? "未设置" : item.OutVisaTime
                 }}</i>
             </p>
-            <p>
+            <p style="color:red;">
               <span>{{ $t("visa.v_kptime") }}</span><i>{{
                   item.TicketDeadline === "" ? "未设置" : item.TicketDeadline
                 }}</i>
@@ -849,7 +854,7 @@
               </p>
             </template>
             <p>
-              <span>{{ $t("salesModule.TicketStatus")}}：</span>
+              <span>{{ $t("salesModule.TicketStatus")}}</span>
               <span class="fz16 fbold">
                 <el-tooltip class="item" effect="dark" :content="$t('salesModule.AllTk')" placement="top">
                   <span style="color: #4bca81" v-if="item.MakeInvoice == 1">√</span>
@@ -862,9 +867,9 @@
                 </el-tooltip>
               </span>
             </p>
-            <p v-if="item.TicketCreateByName&&item.TicketCreateByName!=''">
-              <span>本团票务：</span>
-              <i> {{item.TicketCreateByName}}</i>
+            <p v-if="item.TicketCreateByName&&item.TicketCreateByName!=''" style="color:red;">
+              <span>本团票务</span>
+              <i>{{item.TicketCreateByName}}</i>
             </p>
           </div>
           <div class="d7">