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

src/components/FinancialModule/CostSharing.vue

@@ -334,7 +334,7 @@
         this.msg.sTradeDate = this.$route.query.StartDate;
         this.msg.eTradeDate = this.$route.query.StartDate;
       }
-      this.msg.QMonth = this.getBeforeDate(30, new Date().Format("yyyy-MM-dd"),'yyyy-MM');
+      this.msg.QMonth = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"),'yyyy-MM');
     },
     components: {
     

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2794,7 +2794,8 @@
                         <div v-if="childItem.IsChargeLossOrders == 1" @click="setChargeLoss(childItem)">
                           {{ $t("salesModule.LossSheet") }}
                         </div>
-                        <div @click="lianyunFY(childItem)">
+                        <div v-if="getFunctionalPermission('F_Query_AllIncomPay')" 
+                        @click="lianyunFY(childItem)">
                           {{ $t("ground.lyfyong") }}
                         </div>
                         <div @click="ZhuiJiaTuanKuan(childItem.OrderId)" v-if="RBBranchId == 0|| RBBranchId==1218|| RBBranchId==1253 || RBBranchId==1216">
@@ -4154,7 +4155,9 @@
   import orderTicketUnion from '../../commonPage/orderTicketUnion.vue';
   import PriceDetail from '../../orderCommon/PriceDetail.vue';
   import priceDialog from "../TravelNewQuotation/priceDialog.vue";
+  import { userMixin } from "../../common/mixins/userMixin.js";
   export default {
+    mixins: [userMixin],
     data() {
       return {
         timer: false,