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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1485,7 +1485,7 @@ export default {
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
-        
+        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
@@ -1499,7 +1499,12 @@ export default {
         if (this.orderObj && this.orderObj.OtherType) {
             this.ZhuiJiaTK = true
         }
-         
+        this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
+            if(res.data.resultCode == 1) {
+                this.coinGetList = res.data.data;
+                console.log("this.coinGetList 522555",this.coinGetList )
+            }
+        }, err => {})
     },
     mounted(){
         let userInfo = this.getLocalStorage();
@@ -1520,8 +1525,7 @@ export default {
         let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
         let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
         this.timer = hour + ':' + minute + ':' + second;
-        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
-        this.financeinfo_post_GetList(TCID);
+        // this.financeinfo_post_GetList(TCID);
         if(this.$route.query.edit){
             // 编辑
             this.msg.FrID = this.$route.query.FrID;

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -114,7 +114,7 @@
 
           <div class="singlePrice clearfix">
             <CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice" 
-                :dayCostPrice="dayCostPrice" :LineList="LineList"></CostNewPrice>
+                :dayCostPrice="dayCostPrice" :LineList="LineList"       :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList"  :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
           </div>
         </div>
         <div class="DirectRightPrice" style="margin-left:20px;">
@@ -273,7 +273,7 @@
   import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
 
   export default {
-    props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
+    props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList","CostCurrencyList","CostNumberList","CurrencyNumberListExt"],
     data() {
       return {
         CheckedVaule: 2,

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

 <template>
   <div class="DirectQuotation clearfix">
     <DirectQuotation ref="QuotationPrice" :postConfig="postData" :dayCostPrice="dayCostPriceList"
-      :otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList"></DirectQuotation>
+      :otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
+      :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation>
     <div class="btnFixedDiv">
       <div class="toTop">
         <i class="iconfont icon-huidaodingbu"></i>
@@ -33,11 +34,11 @@
           IsSubstitution: 1,
           IsB2B: 1,
           IsB2C: 1,
-          FSeat: "",
-          CSeat: "",
-          YSeat: "",
+          FSeat: 0,
+          CSeat: 0,
+          YSeat: 0,
           //最低成团人数
-          LowNum: "",
+          LowNum: 0,
           //OP备注
           OpRemark: "",
           //产品经理备注
@@ -46,8 +47,8 @@
           PriceIsDirect: 1, //是否直采报价（1-否-2-是）【全部默认非直采】
           PDFAlias: "", //pdf别名
           ImgCover: "", //封面图
-          DayNum: "", //天数
-          NightNum: "", //晚数
+          DayNum: 0, //天数
+          NightNum: 0, //晚数
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
         },
@@ -78,9 +79,10 @@
           SingleRoomShareMoney: 0, //单房差分摊费用
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
-          CostCurrencyList: [], //选择的币种
-          CostNumberList: [], //人数
         },
+        CostCurrencyList: [], //选择的币种
+        CostNumberList: [], //人数
+        CurrencyNumberListExt: [], //币种和人数列表
         //团报价信息
         teamPrice: {
           QuotationId: 0, //主键编号
@@ -120,20 +122,36 @@
       },
       //保存数据
       SaveData() {
+        var nObj = {
+          config: this.postData,
+          dayCostPriceList: this.dayCostPriceList,
+          otherPrice: this.otherPrice,
+          teamPrice: this.teamPrice,
+          CostCurrencyList: this.CostCurrencyList,
+          CostNumberList: this.CostNumberList
+        };
+        console.log("请求参数", nObj);
         this.apipost(
-          "travel_post_SetConfigOffer_V2", {
-            config: postData,
-            dayCostPriceList: dayCostPriceList,
-            otherPrice: otherPrice,
-            teamPrice: teamPrice
-          },
+          "travel_post_SetConfigOffer_V2", nObj,
           res => {
-            console.log(res.data);
-            if (res.data.resultCode == 1) {}
+            if (res.data.resultCode == 1) {
+                this.Success(res.date.message);
+                this.goUrl('newQuotation');
+            } else {
+              this.Error(res.data.message);
+            }
           },
           err => {}
         );
       },
+      goUrl(path) {
+        this.$router.push({
+          path: path,
+          query: {
+            cache: true
+          }
+        });
+      },
       getPostData() {
         let configId = this.$route.query.configId;
         let msg = {
@@ -145,11 +163,19 @@
           res => {
             console.log("res.data.data", res.data);
             if (res.data.resultCode == 1) {
-               var tempData=res.data.data;
-               this.LineList=tempData.LineList;
-               this.dayCostPriceList=tempData.dayCostPriceList;
-               this.otherPrice=tempData.otherPrice;
-               this.teamPrice=tempData.teamPrice;
+              var tempData = res.data.data;
+              this.LineList = tempData.LineList;
+              if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
+                0) {
+                this.dayCostPriceList = tempData.dayCostPriceList;
+              }
+              if (tempData.otherPrice) {
+                this.otherPrice = tempData.otherPrice;
+              }
+              if (tempData.teamPrice) {
+                this.teamPrice = tempData.teamPrice;
+              }
+
             } else {
               this.Error(res.data.message);
             }

src/components/administrative/QzCommissionDetail.vue

@@ -135,7 +135,7 @@ export default {
             RB_Branch_Id:data.RB_Branch_Id,
             IsPublic:6,
             BType:4,
-            AccountId:22,
+            AccountId:23,
             CostTypeID:189,
             WBMoney:data.CommissionMoney,
             Remark:'',
@@ -162,7 +162,7 @@ export default {
                   this.loading = false;
                   if (res.data.resultCode == 1) {
                     this.apipost(
-                    "OPCommission_UpdatePeriodsFrID",
+                    "VisaCommission_UpdatePeriodsFrID",
                     {ID:this.oPComissionPeriods.ID,FrId:res.data.data},
                     res => {
                       if (res.data.resultCode == 1) {
@@ -293,14 +293,14 @@ export default {
         //   单据号：${oPComissionPeriods.FRID}</span>`;
         // }
       };
-      // let opera = {
-      //   title: "操作",
-      //   titleAlign: "left",
-      //   columnAlign: "left",
-      //   width: 80,
-      //   isResize: false,
-      //   componentName: "commission-table-operation"
-      // };
+      let opera = {
+        title: "操作",
+        titleAlign: "left",
+        columnAlign: "left",
+        width: 80,
+        isResize: false,
+        componentName: "commission-table-operation"
+      };
       this.columns = [];
       this.columns.push(company);
       this.columns.push(department);
@@ -313,7 +313,7 @@ export default {
     //   this.columns.push(visaPeopleCount);
       this.columns.push(Zhanbi);
       this.columns.push(remark);
-      // this.columns.push(opera);
+      this.columns.push(opera);
       this.isReady = true;
     },
     sortChange(param) {