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

src/components/FinancialModule/addFinancialDocumentsSPF.vue

@@ -491,13 +491,15 @@
                            </div>
                            <!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
                        </template>
-                       <el-tooltip content="配置手配费" placement="top">
+                       <template v-if="isHandFee">
+                       <el-tooltip content="配置手配费" placement="top"></el-tooltip>
                         <el-switch
-                          v-model="isHandFee" @change="getHandFee">
+                          v-model="is_HandFee" @change="getHandFee">
                         </el-switch>
                       </el-tooltip>
+                      </template>
                    </div>
-                   <template v-if="isHandFee">
+                   <template v-if="isHandFee&&is_HandFee">
                    <div>
                     <p>
                     手配费：
@@ -792,31 +794,35 @@ export default {
             {Name:'车',Id:3,disabled:false},
             {Name:'门票',Id:4,disabled:false},
           ], //类型
-          isHandFee: false
+          isHandFee: false,
+          is_HandFee: true,//是否开启
        }
    },
    methods:{
         // 是否开启手配费
         getHandFee(){
-            if(this.isHandFee){
+            if(this.is_HandFee){
                 this.chooseHandFee()
             }else{
                 this.msg.HandFeeList = null
-                this.msg.KingdeeBranchId = null
+                this.msg.KingdeeBranchId = 0
             }
         },
         // 获取当前手配费选项
         chooseHandFee(){
+            if(!this.is_HandFee) return
             if(this.msg.detailList.length>0){
             let HandFeeObj = this.HandFeeList.map(item=>{if(item.BranchId==this.HandFee.BranchId) return item})
             
             this.HandFeeDetail = HandFeeObj[0]
+            this.HandFeeDetail&&this.HandFeeDetail.DetailList.forEach(x=>{x.show = false})
             let numToFANG = 0
             let numToCAN = 0
             let numToCE = 0
             let numToMEN = 0
+            
             this.msg.detailList.forEach((x,index)=>{
-                let obj = JSON.parse(JSON.stringify(x))
+                let obj = x
                 if(x.CostTypeName.indexOf('房')!=-1
                 ||x.CostTypeName.indexOf('餐')!=-1
                 ||x.CostTypeName.indexOf('车')!=-1
@@ -1046,7 +1052,7 @@ export default {
        },
        AddFinancial(z){  //保存
            //    手配费参数
-            if(this.isHandFee){
+            if(this.is_HandFee){
                 if(!this.HandFee.BranchId){
                    this.Error('请选择手配费')
                    return
@@ -1996,7 +2002,7 @@ export default {
        ||this.$route.query.id==246
        ||this.$route.query.id==247
        ||this.$route.query.id==248){
-        this.GetHandFeeList()//获取手配费配置
+        this.GetHandFeeList()//获取手配费功能权限配置
         this.isHandFee = true
        }
        let userInfo = this.getLocalStorage();

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1347,7 +1347,20 @@
           this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
           this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
           this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
+          this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName?this.orderObj.StandardCurrencyName:'';
         }
+        // 原币总金验证
+        if(this.orderObj&&this.orderObj.Money){
+               let yballPrice = 0
+               this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
+                   yballPrice += Number(yballPrice)+Number(item.UnitPrice)
+               })
+               this.yballPriceTo = yballPrice
+               if(this.orderObj.Money!=this.yballPriceTo){
+                   this.Error(`原币总金额需等于${this.orderObj.Money}！`)
+                   return
+               }
+          }
         // crm自动登陆传过来的参数
         if(this.crmOrderObj){
           this.msg.OtherType = this.crmOrderObj.OtherType
@@ -1897,6 +1910,9 @@
         this.tradeObj = JSON.parse(this.$route.query.tradeObj);
       }else{
         this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
+        if(this.orderObj&&this.orderObj.Money){
+          this.detailList.UnitPrice = this.orderObj.Money
+        }
       }
       
       let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0

src/router/config.js

@@ -3892,6 +3892,14 @@ export default {
                 title: '手配费管理'
               },
             },
+            { //财务 财务单据 手配收入查询
+              path: '/HandFeeStatistics',
+              name: 'HandFeeStatistics',
+              component: resolve => require(['@/components/FinancialModule/HandFee/HandFeeStatistics'], resolve),
+              meta: {
+                title: '手配收入查询'
+              },
+            },
             { //财务 财务单据 费用单据
               path: '/Costdocuments',
               name: 'Costdocuments',