Merge branch 'master' into month

src/App.vue

@@ -326,7 +326,9 @@
     float: left;
   }
   .width100-float-l{
-    width: 100%;
     float: left;
   }
+  .width100-float-l+.width100-float-l{
+    margin-left: 10px;
+  }
 </style>

src/components/FinancialModule/FinancialDocuments.vue

@@ -590,6 +590,18 @@ input[type="number"] {
                     <el-option key="3" value="3" :label="$t('fnc.jylshuihao')"></el-option>
                   </el-select>
                 </span>
+              </li>
+              <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
+                <span>
+                    <em>{{$t('fnc.zdriqi')}}</em>
+                    <el-date-picker class="h34"
+                        @change="timeAdd(1)"
+                        v-model="productionDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        :range-separator="$t('restaurant.res_To')">
+                    </el-date-picker>
+                </span>
             </li>
                 <template v-if="heightQueryBox">
                      <li>
@@ -730,7 +742,8 @@ input[type="number"] {
                             <el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
                         </span>
                     </li>
-                    <li v-if="msg.Conditon==1">
+                    <!-- 制单日期 -->
+                    <!-- <li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
                         <span>
                             <em>{{$t('fnc.zdriqi')}}</em>
                             <el-date-picker class="h34"
@@ -741,7 +754,7 @@ input[type="number"] {
                                 :range-separator="$t('restaurant.res_To')">
                             </el-date-picker>
                         </span>
-                    </li>
+                    </li> -->
                     <li v-if="msg.Conditon==2">
                         <span>
                             <em>{{$t('fnc.spriqi')}}</em>
@@ -968,7 +981,8 @@ input[type="number"] {
                             <i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
                               @click="showjiaoyi(item.FrID)"></i>
                           </el-tooltip>
-                        <el-tooltip class="item" content="手续费设置" placement="top" v-if="active==2 && istransaction == true && item.Type==1">
+                        <el-tooltip class="item" content="手续费设置" placement="top"
+                        v-if="active==2 && item.Type==1 &&(istransaction == true || isJapanCommission == true)">
                           <i class="iconfont icon-zhifupeizhiguanli"
                             @click="showTranTax(item.FrID,'1')"></i>
                         </el-tooltip>
@@ -1157,15 +1171,12 @@ input[type="number"] {
                 </div>
             </template>
         </el-dialog>
-        <el-dialog title="修改单据手续费" width="300px"
-            :visible.sync="transactionTax" center :before-close="closeChangeMachie">
-             <p style="font-size:12px;margin-bottom:10px;">交易手续费：</p>
-              <el-input v-model="transTax.Fee" placeholder="请输入内容"></el-input>
-            <div slot="footer" class="dialog-footer">
-            <el-button class="hollowFixedBtn" @click="transactionTax=false">{{$t('pub.cancelBtn')}}</el-button>
-            <el-button class="normalBtn" type="primary" @click="saveTransTaxMoney" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
-            </div>
-        </el-dialog>
+        <!-- 修改手续费 -->
+        <template v-if="transactionTax">
+          <shouxufei :transTax="transTax"
+          @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
+        </template>
+
         <el-dialog title="修改付款对象" width="300px"
             :visible.sync="PaymentSync" center :before-close="closeChangeMachie">
             <el-form class="cdForm" label-width="90px">
@@ -1305,6 +1316,7 @@ import myBill from "./FinancialSubmodule/BillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
 import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
+import shouxufei from "./components/shouxufei.vue";
 export default {
   data() {
     return {
@@ -1499,6 +1511,7 @@ export default {
       F_Update_CurrencyRate: false,
       costmodeHL:false,
       trabeListHL:[],//修改费率下拉数据
+      isJapanCommission: false
     };
   },
   created() {
@@ -1517,6 +1530,9 @@ export default {
     if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
       this.F_Update_CurrencyRate=true;
     }
+    if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
+      this.isJapanCommission=true;
+    }
     if (this.$route.query.returnCode) {
       this.active = this.$route.query.returnCode;
       this.msg.Conditon = this.$route.query.returnCode;
@@ -1544,9 +1560,13 @@ export default {
     "my-Bill": myBill,
     "my-RVB-Bill": myrbvBill,
     "my-HB-Bill": myhrBill,
-    "my-GZ-Bill": myGZBill
+    "my-GZ-Bill": myGZBill,
+    shouxufei
   },
   mounted() {
+    let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
+    let EndDate = this.getBeforeDate(-1,new Date().Format("yyyy-MM-dd"))
+    this.productionDate = [StartDate,EndDate]
     this.GetAuth();
     this.getCostTypeList();
     let userInfo = this.getLocalStorage();
@@ -2722,6 +2742,9 @@ export default {
         });
       }
     },
+    close(){
+      this.transactionTax = false
+    },
     showjiaoyi(FrId) {
       //弹出交易方式修改
       this.apipost(
@@ -2774,8 +2797,6 @@ export default {
     },
     showTranTax(fid,type) {
       this.transTax.FrId = fid;
-
-      this.transTax.loading = false;
       if(type==1){
         this.transTax.Fee = "0.00";
         this.transactionTax = true;
@@ -2785,30 +2806,6 @@ export default {
         this.PaymentSync = true
       }
     },
-    saveTransTaxMoney() {
-      if (this.transTax.loading) return;
-      this.transTax.loading = true;
-      if (this.transTax.Fee && this.transTax.Fee != "") {
-        this.apipost(
-          "Financial_post_UpdateFinanceFee",
-          { FrId: this.transTax.FrId, Fee: this.transTax.Fee },
-          res => {
-            if (res.data.resultCode == 1) {
-              this.$message.success("修改成功");
-              this.getPageList();
-              this.transactionTax = false;
-            }
-            this.transTax.loading = false;
-          },
-          err => {
-            this.transTax.loading = false;
-          }
-        );
-      } else {
-        this.transTax.loading = false;
-        this.$message.error("请输入手续费");
-      }
-    },
     getAccountList2(AccountTypeId, y) {
       //获取账户类型对应下的账户列表
       this.alltransaction.map(x => {

src/components/FinancialModule/RecPayQuery.vue

@@ -329,7 +329,6 @@
                 :table-data="DataList"
                 :filter-method="filterMethod"
                 :row-height='100'
-                
                 @on-custom-comp="customCompFunc"
                 @sort-change="sortChange"
                 multiple-sort><!-- 多个排序 -->
@@ -424,12 +423,18 @@
             <el-button class="normalBtn" type="primary" @click="preservetransactionHL()">{{$t('pub.sureBtn')}}</el-button>
             </div>
         </el-dialog>
+        <!-- 修改手续费 -->
+        <template v-if="transactionTax">
+          <shouxufei :transTax="transTax"
+          @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
+        </template>
     </div>
 </template>
 <script>
 import myBill from "./FinancialSubmodule/BillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
+import shouxufei from "./components/shouxufei.vue";
 import Vue from 'vue'
 // 自定义列组件
 Vue.component('table-BranchName',{  //查看操作按钮
@@ -532,6 +537,22 @@ Vue.component('table-operation',{  //查看操作按钮
                 outline: none;" class="iconfont icon-money" v-if="F_Update_CurrencyRate==true && (rowData.Type==2 || rowData.Type==1)"  @click="editRate(rowData)">
             </i>
         </el-tooltip>
+        <el-tooltip class="item" effect="dark" content="修改手续费" placement="top">
+            <i style="width: 30px;
+                height: 30px;
+                display: inline-block;
+                color: white !important;
+                border-radius: 50%;
+                text-align: center;
+                line-height: 30px;
+                margin-right: 10px;
+                cursor: pointer;
+                background-color: #47BF8C;
+                outline: none;" class="iconfont icon-money"
+                v-if="rowData.Type==1&&(istransaction == true || isJapanCommission == true)"
+                @click="editCommission(rowData)">
+            </i>
+        </el-tooltip>
     </span>`,
     props:{
 
@@ -548,7 +569,9 @@ Vue.component('table-operation',{  //查看操作按钮
     data(){
         return{
             Finance_ExpenseType:false,
-            F_Update_CurrencyRate:false
+            F_Update_CurrencyRate:false,
+            istransaction: false,
+            isJapanCommission: false
         }
     },
     created(){
@@ -561,6 +584,12 @@ Vue.component('table-operation',{  //查看操作按钮
         if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
             this.F_Update_CurrencyRate=true;
         }
+        if (ActionMenuCode.indexOf("F_Trademodify") != -1) {
+          this.istransaction = true;
+        }
+        if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
+          this.isJapanCommission=true;
+        }
     },
     methods:{
         goUrl(path){
@@ -583,6 +612,9 @@ Vue.component('table-operation',{  //查看操作按钮
         editRate(rowData){
             this.MsgBus.$emit('showhuilv',rowData);
         },
+        editCommission(rowData){
+            this.MsgBus.$emit('shouxufei',rowData);
+        },
     }
 })
 Vue.component('table-RecPay',{  //收支样式
@@ -916,6 +948,14 @@ Vue.component('table-StatusStr',{  //单据状态
 export default {
     data(){
         return{
+            transTax:{
+              FrId: 0,
+              Fee: "0.0",
+              loading: false,
+              ClientType:'',
+              ClientID:''
+            },
+            transactionTax: false,
             showID:false,
             active:1,
             userId:0,
@@ -1094,6 +1134,7 @@ export default {
     },components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
+        shouxufei
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
@@ -1126,6 +1167,9 @@ export default {
         that.MsgBus.$on('showhuilv',function(row){
             that.showhuilv(row)
         })
+        that.MsgBus.$on('shouxufei',function(row){
+            that.shouxufei(row)
+        })
     },methods:{
         customCompFunc(params){
         },
@@ -1562,6 +1606,13 @@ export default {
                 }
             }, err => {})
         },
+        shouxufei(row){
+          this.transTax.FrId = row.FrID;
+          this.transactionTax = true
+        },
+        close(){
+          this.transactionTax = false
+        },
         showhuilv(row){
             this.apipost('Financial_get_GetFinanceRate', {FinanceId:row.FrID}, res => {
                 if (res.data.resultCode == 1) {

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -135,6 +135,9 @@
                     RB_Department_Id: -1,//部门ID
                     RB_Branch_Id: -1,//公司ID
                     OutBranchId: -1,//出团公司ID
+                    EmployeeId: -1,
+                    Way: -1,
+                    TCID: '',
                 },
                 dataList:[],
                 outerVisible:false,//提成比例弹窗
@@ -146,6 +149,7 @@
                 handler(val, oldVal) {
                     this.objNew = val
                     this.msg.OrderId = val.id?val.id:val.OrderId?val.OrderId:val.orderId
+                    this.msg.TCID = this.msg.OrderId
                     this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1
                 },
                 deep: true,
@@ -202,25 +206,9 @@
           },
           // op提成
           GetNewOPCommission(){
-            let msg = {
-              pageIndex: 1,
-              pageSize: 5,
-              EmployeeId: -1,
-              PeriodsId: -1,
-              OrderType: -1,
-              Way: -1,
-              TCID: this.objNew.OrderId,
-              TCNUM: '',
-              RB_Department_Id: -1,//部门ID
-              EmBranchId: -1,//公司ID
-              RB_Branch_Id: -1,//出团公司ID
-            }
-            if (msg.TCID == '') {
-              msg.TCID = 0
-            }
             this.apipost(
               "opcommission_GetNewOPCommissionDetailsPageList",
-              msg,
+              this.msg,
               res => {
                 this.loading = false;
                 if (res.data.resultCode == 1) {

src/components/FinancialModule/components/shouxufei.vue

+
+  <template>
+    <div>
+      <el-dialog title="修改单据手续费" width="300px"
+      :visible.sync="transactionTax" center @close="close">
+       <p style="font-size:12px;margin-bottom:10px;">交易手续费：</p>
+        <el-input v-model="ObjData.Fee" placeholder="请输入内容"></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,
+          ClientType:'',
+          ClientID:''
+        }
+      };
+    },
+    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_UpdateFinanceFee",
+          { FrId: this.ObjData.FrId, Fee: this.ObjData.Fee },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.$message.success("修改成功");
+              this.$emit('success')
+            }
+            this.ObjData.loading = false;
+          },
+          err => {
+            this.ObjData.loading = false;
+          }
+        );
+      } else {
+        this.ObjData.loading = false;
+        this.$message.error("请输入手续费");
+      }
+      },
+      close(){
+        this.$emit('close')
+      },
+    },
+    mounted() {
+
+    }
+  };
+  </script>
+
+  <style>
+
+  </style>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -497,7 +497,6 @@
                     {{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
                   <p>
                     <el-popover width="700" trigger="click" popper-class="TC_customerInfo">
-
                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
                         <tr>
                           <td rowspan="2" style="text-align:center" width="60">

src/components/sale/ExpectedCommission.vue

@@ -46,6 +46,11 @@
   .CommissionLadder p {
     padding: 5px 0 0px 0;
     font-size: 15px;
+    display: flex;
+    justify-content: space-between;
+  }
+  .CommissionLadder p span:last-child{
+    color: red;
   }
   .CommissionInfor{
     padding: 0 0 10px 0;
@@ -214,7 +219,7 @@
           </div>
           <div style="display: flex;">
             <div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
-              <p>当月人头奖励(不含门票、包车、国内游)</p>
+              <p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
               <div class="CommissionInfor">
                 <span>
                   人头数量：<span>{{CommissionInfor.PeopleNum}}</span>
@@ -228,7 +233,7 @@
               </div>
             </div>
             <div class="CommissionLadder Line">
-              <p>当月人头奖励(不含门票、包车、国内游)</p>
+              <p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
               <div class="CommissionInfor">
                 <span>
                   人头数量：<span>{{CommissionInfor.EuropePNum}}</span>