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

src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue

@@ -352,7 +352,7 @@
             })
             this.moneyObj = {
               benAllMoney: Math.round(benAllMoney * 100) / 100,
-              OriginalMoney: OriginalMoney,
+              OriginalMoney: Math.round(OriginalMoney * 100) / 100,
             }
             data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
             data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
@@ -362,7 +362,6 @@
             this.GetDetail = data;
             this.loading=false
             this.$set(this.$data,"GetDetail",data);
-            console.log(this.GetDetail)
           }
         }, err => {})
       },

src/components/LeaderManagement/leaderReimbursement.vue

@@ -423,6 +423,7 @@
               <span v-else-if="subItem.PayStyle === 3">预付</span>
               <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
               <span v-else-if="subItem.PayStyle === 11">刷卡</span>
+              <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
               <span v-else></span>
               </br>
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>

src/components/TravelManager/TravelList/PassengerFeedback.vue

 
 <template>
   <div class="Feedback">
-      <ul style="overflow: initial!important">
-        
+      <div class="query-box">
+        <ul>
+          <li>
+            <span>
+              <em>团号</em>
+              <el-input v-model="msg.TCNUM"></el-input>
+            </span>
+          </li>
           <li>
             <span>
               <em>线路</em>
@@ -57,6 +63,7 @@
             <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
           </li>
         </ul>
+      </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>发团日期</th>
@@ -119,6 +126,7 @@ export default {
             msg:{
                 pageSize:10,
                 pageIndex:1,
+                TCNUM: '',
                 lineID:0,
                 LineteamId:0,
                 reStartDate:'',

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
 
-  .singlePrice .el-form-item__content,
-  .el-form-item__label {
+  .CostNewPrice .el-form-item__content,
+  .CostNewPrice .el-form-item__label {
     line-height: 30px;
   }
 
-  .CP_halfWi {
+  .CostNewPrice .CP_halfWi {
     width: 45%;
   }
 
@@ -14,7 +14,7 @@
 
 <template>
   <div>
-    <div class="singlePrice clearfix CP_Div">
+    <div class="CostNewPrice clearfix CP_Div">
       <el-form>
         <div class="QuotationFirstDiv">
           <el-row :gutter="40">
@@ -30,8 +30,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="系列">
-                <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')"
-                  @change="getCountryId(postConfig.LineteamId)" filterable>
+                <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                   <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
                   </el-option>
@@ -92,7 +91,7 @@
                 <el-col :span="6">
                   <el-form-item>
                     <el-input class="w120 LowNum" v-model="postConfig.DayNum"
-                      @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()">
+                      @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
                       <template slot="append">天</template>
                     </el-input>
                   </el-form-item>
@@ -100,7 +99,7 @@
                 <el-col :span="6">
                   <el-form-item>
                     <el-input class="w120 LowNum" v-model="postConfig.NightNum"
-                      @keyup.native="checkInteger(postConfig,'NightNum')">
+                      @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
                       <template slot="append">晚</template>
                     </el-input>
                   </el-form-item>
@@ -142,7 +141,7 @@
         <table class="CP_comTable">
           <tr>
             <td class="CP_comBack" width="170">人数</td>
-            <td v-for="(item,index) in OfferCostPriceObj.CostNumberList" :key='item.subCode'>
+            <td v-for="(item,index) in OtherPrice.CostNumberList" :key='item.subCode'>
               <el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
               </el-input>
               <span>
@@ -159,7 +158,7 @@
               </div>
             </td>
           </tr>
-          <tr v-for="item in OfferCostPriceObj.CostCurrencyList">
+          <tr v-for="item in OtherPrice.CostCurrencyList">
             <td class="CP_comBack">地接报价（{{item.CurrencyName}}）</td>
             <td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)">
               <el-form-item>
@@ -188,48 +187,47 @@
             <th width="90">中</th>
             <th width="90">晚</th>
           </tr>
-          <!-- <tr v-for="subItem in OfferCostPriceObj.CostLocalList" :key="subItem.subCode">
+          <tr v-for="subItem in dayCostPrice" :key="subItem.subCode">
             <td align="center">{{subItem.DayNum}}</td>
             <td>
-              <el-input type="textarea" resize="none"></el-input>
+              <el-input type="textarea" resize="none" v-model="subItem.Title"></el-input>
             </td>
             <td>
               <el-form-item>
                 <el-select v-model='subItem.CurrencyId'>
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                  <el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
+                  <el-option v-for="items in OtherPrice.CostCurrencyList" :label='items.CurrencyName'
                     :value='items.CurrencyId' :key='items.CurrencyId'>
                   </el-option>
                 </el-select>
               </el-form-item>
             </td>
             <td>
-              <el-input v-if="!showHotel" type='text' v-model="subItem.HotelMoney"
-                @keyup.native="checkPrice(subItem,'HotelMoney')"></el-input>
+              <el-input type='text' v-model="subItem.HotelCostPrice"
+                @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
             </td>
             <td>
-              <span v-if="showCar">{{subItem.CarName}}</span>
-              <el-input type='text' v-model="subItem.CarMoney" @keyup.native="checkPrice(subItem,'CarMoney')"
-                v-if="!showCar"></el-input>
+              <el-input type='text' v-model="subItem.BusCostPrice" @keyup.native="checkPrice(subItem,'BusCostPrice')">
+              </el-input>
             </td>
             <td>
-              <span v-if="showTicket" class="QD_DetailName">{{subItem.TicketName}}</span>
-              <el-input type='text' v-model="subItem.TicketMoney" @keyup.native="checkPrice(subItem,'TicketMoney')"
-                v-if="!showTicket"></el-input>
+              <el-input type='text' v-model="subItem.ScenicCostPrice"
+                @keyup.native="checkPrice(subItem,'ScenicCostPrice')"></el-input>
             </td>
             <td>
-              <el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[0].money'
-                @keyup.native="checkPrice(subItem.FoodItem[0],'money')"></el-input>
+              <el-input type="text" v-model='subItem.BreakfastCostPrice'
+                @keyup.native="checkPrice(subItem,'BreakfastCostPrice')">
+                </el-input>
             </td>
             <td>
-              <el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[1].money'
-                @keyup.native="checkPrice(subItem.FoodItem[1],'money')"></el-input>
+              <el-input type="text" v-model='subItem.LunchCostPrice'
+                @keyup.native="checkPrice(subItem,'LunchCostPrice')"></el-input>
             </td>
             <td>
-              <el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[2].money'
-                @keyup.native="checkPrice(subItem.FoodItem[2],'money')"></el-input>
+              <el-input type="text" v-model='subItem.DinnerCostPrice'
+                @keyup.native="checkPrice(subItem,'DinnerCostPrice')"></el-input>
             </td>
-          </tr> -->
+          </tr>
         </table>
         <div class="CP_ComTitle">内陆段交通部分</div>
         <table class="CostPriceTable">
@@ -492,31 +490,122 @@
           </tr>
         </table>
       </el-form>
+    
     </div>
   </div>
 </template>
 <script>
   export default {
-    props: ["postConfig", "OtherPrice", "dayCostPrice","LineList"],
+    props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList"],
     data() {
       return {
+        //下拉框默认值
+        defaultSelect:0,
         queryMsg: {
           //汇率输入
           RateInput: "",
           //人数
           PeopleNumber: ""
         },
+        //币种下拉
+        currencyType: "",
         checkedPei: [],
-        currencyTypeArr: [], //币种
-        LineTeamList:[],//系列列表
+        currencyTypeArr: [], //币种下拉列表
+        LineTeamList: [], //系列下拉列表
       }
 
     },
     methods: {
+      //获取系列列表
+      getLineTeamList(lineId) {
+        this.postConfig.LineteamId = 0;
+        let msg = {
+          lineID: lineId,
+          isTOOP: 1
+        };
+        var that = this;
+        //获取当前选中的对象
+        let obj = {};
+        obj = that.LineList.find(item => {
+          return item.LineID === lineId;
+        });
+        this.apipost("team_post_GetList", msg, res => {
+          if (res.data.resultCode == 1) {
+            this.LineTeamList = res.data.data;
+          }
+        });
+      },
       //生成行程报价
       createDayTripPrice() {
 
-
+        if (this.postConfig.DayNum > this.dayCostPrice.length) {
+          for (var i = this.dayCostPrice.length; i < this.postConfig.DayNum; i++) {
+            //去掉以前默认的交通
+            var dayItem = {
+              Id: 0, //主键编号
+              OfferId: 0, //报价单编号
+              ConfigId: 0, //配置编号
+              Title: "", //行程大点
+              DayNum: i + 1, //行程天数
+              CurrencyId: 0, //币种
+              HotelCostPrice: 0, //酒店报价
+              BusCostPrice: 0, //车辆报价
+              ScenicCostPrice: 0, //景点报价
+              BreakfastCostPrice: 0, //早餐报价
+              LunchCostPrice: 0, //午餐报价
+              DinnerCostPrice: 0, //晚餐报价
+            };
+            this.dayCostPrice.push(dayItem);
+          }
+        } else {
+          //删除多余的项
+          for (var i = this.postConfig.DayNum; i < this.dayCostPrice.length; i++) {
+            this.dayCostPrice.splice(i, 1);
+          }
+          this.dayCostPrice.length = this.postConfig.DayNum;
+        }
+        console.log(" this.dayCostPrice", this.dayCostPrice);
+      },
+      //添加人数费用
+      addPeoNunber() {
+        var PeopleNumber = this.queryMsg.PeopleNumber;
+        if (PeopleNumber == "") {
+          this.Info("请输入人数");
+          return;
+        }
+        if (
+          this.$tripUtils.isInObjArr(
+            this.OfferCostPriceObj.CostNumberList,
+            "PeopleNumber",
+            PeopleNumber
+          )
+        ) {
+          this.Info("人数已经存在");
+          return;
+        }
+        var CostNumberObj = this.$tripUtils.CostNumber();
+        CostNumberObj.PeopleNumber = PeopleNumber;
+        this.OfferCostPriceObj.CostNumberList.push(CostNumberObj);
+        this.OfferCostPriceObj.CurrencyNumberListExt.forEach(x => {
+          var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
+          CurrencyNumberObj.CurrencyId = x.Key;
+          CurrencyNumberObj.PeopleNumber = PeopleNumber;
+          x.currencyNumberList.push(CurrencyNumberObj);
+        });
+        this.queryMsg.PeopleNumber = "";
+        this.queryMsg.Money = "";
+        this.shortPeopleNumber();
+      },
+      //人数排序
+      shortPeopleNumber() {
+        // this.OfferCostPriceObj.CurrencyNumberListExt.forEach(x => {
+        //   x.currencyNumberList.sort(
+        //     this.$commonUtils.createComprisonFunction("PeopleNumber")
+        //   );
+        // });
+        // this.OfferCostPriceObj.CostNumberList.sort(
+        //   this.$commonUtils.createComprisonFunction("PeopleNumber")
+        // );
       },
       //币种下拉获取汇率
       getRate(ID) {
@@ -541,12 +630,9 @@
     },
     mounted() {
       this.getAllCurrency();
-
     },
     watch: {
 
-
-
     }
   };
 

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -107,14 +107,14 @@
 </style>
 
 <template>
-  <div class="DirectQuotation clearfix">
+  <div class="DirectNewQuotation clearfix">
     <el-form label-width="100px" ref="currentOfferFrom">
       <div class="switchDiv clearfix" style="width:98%;">
         <div class="DirectPriceCenter">
 
           <div class="singlePrice clearfix">
-            <CostPrice ref="CostPrice" :postConfig="postConfig" :OtherPrice="otherPrice" 
-                :dayCostPrice="dayCostPrice" :LineList="LineList"></CostPrice>
+            <CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice" 
+                :dayCostPrice="dayCostPrice" :LineList="LineList"></CostNewPrice>
           </div>
         </div>
         <div class="DirectRightPrice" style="margin-left:20px;">
@@ -270,7 +270,7 @@
   </div>
 </template>
 <script>
-  import CostPrice from "../TravelNewQuotation/CostNewPrice";
+  import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
 
   export default {
     props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
@@ -287,7 +287,7 @@
 
     },
     components: {
-      CostPrice: CostPrice
+      CostNewPrice: CostNewPrice
     }
   };
 

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -21,6 +21,7 @@
   export default {
     data() {
       return {
+        ConfigID: 0,
         //基本配置
         postData: {
           ID: 0,
@@ -51,7 +52,7 @@
           ReturnArriveCityId: 0, //返回抵达城市
         },
         dayCostPriceList: [], //报价列表
-        isSubmit:false,
+        isSubmit: true,
         otherPrice: {
           CostId: 0, //主键编号
           ConfigID: 0, //配置编号
@@ -77,39 +78,39 @@
           SingleRoomShareMoney: 0, //单房差分摊费用
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
-          CostCurrencyList:[],//选择的币种
-          CostNumberList:[],//人数
+          CostCurrencyList: [], //选择的币种
+          CostNumberList: [], //人数
         },
         //团报价信息
-        teamPrice:{
-          QuotationId:0,//主键编号
-          TeamId:0,//团期编号
-          ConfigID:0,//团队配置编号
-          OfferId:0,//报价编号
-          B2BMemberPrice:0,//同业会员价
-          B2BPrice:0,//同业价格
-          B2CMemberPrice:0,//直客会员价,
-          B2CPrice:0,//直客价格
-          ChildNeedPrice:0,//小孩占床价格,
-          ChildNoNeedPrice:0,//小孩不占床价格
-          BabyPrice:0,//婴儿价格
-          BabyChargePrice:0,//婴儿附加费
-          OldManChargePrice:0,//老人附加费
-          VisaPrice:0,//签证
-          OtherPrice:0,//杂费
-          SingleRoomPrice:0,//单房差
-          SingleDMCPrice:0,//单地接
-          RebatePrice:0,//同行返佣
-          DiscountPrice:0,//早鸟优惠
-          IsSupportChildren:1,//是否支持儿童出游（1-支持，2-不支持）
-          SafeMoney:0,//保险费
-          PeopleNumber:0,//人数
-          AirticketMoney:0,//机票费用
-          BackVisaPrice:0,//退签证费
-          BackSafeMoney:0,//退保险费
-          ContractUrl:"",//合同地址
+        teamPrice: {
+          QuotationId: 0, //主键编号
+          TeamId: 0, //团期编号
+          ConfigID: 0, //团队配置编号
+          OfferId: 0, //报价编号
+          B2BMemberPrice: 0, //同业会员价
+          B2BPrice: 0, //同业价格
+          B2CMemberPrice: 0, //直客会员价,
+          B2CPrice: 0, //直客价格
+          ChildNeedPrice: 0, //小孩占床价格,
+          ChildNoNeedPrice: 0, //小孩不占床价格
+          BabyPrice: 0, //婴儿价格
+          BabyChargePrice: 0, //婴儿附加费
+          OldManChargePrice: 0, //老人附加费
+          VisaPrice: 0, //签证
+          OtherPrice: 0, //杂费
+          SingleRoomPrice: 0, //单房差
+          SingleDMCPrice: 0, //单地接
+          RebatePrice: 0, //同行返佣
+          DiscountPrice: 0, //早鸟优惠
+          IsSupportChildren: 1, //是否支持儿童出游（1-支持，2-不支持）
+          SafeMoney: 0, //保险费
+          PeopleNumber: 0, //人数
+          AirticketMoney: 0, //机票费用
+          BackVisaPrice: 0, //退签证费
+          BackSafeMoney: 0, //退保险费
+          ContractUrl: "", //合同地址
         },
-        LineList:[],//线路列表
+        LineList: [], //线路列表
       };
     },
     methods: {
@@ -124,7 +125,7 @@
             config: postData,
             dayCostPriceList: dayCostPriceList,
             otherPrice: otherPrice,
-            teamPrice:teamPrice
+            teamPrice: teamPrice
           },
           res => {
             console.log(res.data);
@@ -135,7 +136,6 @@
       },
       getPostData() {
         let configId = this.$route.query.configId;
-        if (configId > 0) {
         let msg = {
           ID: configId
         };
@@ -143,25 +143,19 @@
           "travel_get_GetMyTravelInfo_V2",
           msg,
           res => {
+            console.log("res.data.data", res.data);
             if (res.data.resultCode == 1) {
-                console.log("res.data.data",res.data);
-                this.postData = res.data.data;
-                
+               var tempData=res.data.data;
+               this.LineList=tempData.LineList;
+               this.dayCostPriceList=tempData.dayCostPriceList;
+               this.otherPrice=tempData.otherPrice;
+               this.teamPrice=tempData.teamPrice;
             } else {
               this.Error(res.data.message);
             }
           },
           err => {}
         );
-        } else {
-          let params = {
-            isNoOffer: false
-          };
-          this.$router.push({
-            name: "quoTation",
-            params: params
-          });
-        }
       }
     },
     created() {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -26,16 +26,7 @@
             </el-select>
           </span>
         </li>
-        <li>
-          <span>
-            <em>报价单状态</em>
-            <el-select v-model="queryData.TravelState" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
-              <el-option v-for='item in TravelStateList' :key="item.Id" :label="item.label" :value="item.Id">
-              </el-option>
-            </el-select>
-          </span>
-        </li>
+ 
         <li>
           <span>
             <em>开团状态</em>
@@ -148,14 +139,7 @@
                 <div>{{item.CreateUserName}}</div>
               </div>
             </div>
-            <div>
-              <span>报价单状态</span>
-              <span v-if="item.TravelState==1">草稿</span>
-              <span v-else-if="item.TravelState==2">待审核</span>
-              <span v-else-if="item.TravelState==3">审核通过</span>
-              <span v-else-if="item.TravelState==4">审核拒绝</span>
-              <span v-else-if="item.TravelState==5">已撤销</span>
-            </div>
+ 
             <div>
               <span v-if="item.TravelState==2" class="retract opbd" @click="revokeInfo(item.ID)">
                 <el-tooltip class="item" effect="dark" content="待审核" placement="top-start" popper-class="max-w250">
@@ -460,7 +444,7 @@
         this.$router.push({
           path: path,
           query: {
-            configId: 4288,
+            configId: 0,
             blank:'y',
             tab:'报价单'
           }

src/components/TravelManager/TravelQuotationCenter/GroupStageSetting.vue

@@ -470,7 +470,6 @@
       }
     },
     mounted() {
-      console.log("获取值",this.postConfig);
       var dateObj = this.$calendarUtils.getCurrentDate();
       this.yearInput = dateObj.CurrentYear;
       this.monthInput = dateObj.CurrentMonth;

src/components/administrative/Survey.vue

@@ -77,7 +77,7 @@
       <tr v-for="(item,i) in dataList" :key="i">
         <td>{{item.start}}</td>
         <!-- <td>{{item.orderId}}</td> -->
-        <td>{{item.tCNUM}}</td>
+        <td @click='goUrl("RegistrationList", item.tcid,"报名清单")' class="go_regis">{{item.tCNUM}}</td>
         <td>{{item.number}}</td>
         <td>
           <span v-if="fields.length>0">
@@ -235,6 +235,16 @@ export default {
       this.GetSurveyShowList();
     },
     methods:{
+      goUrl(path, id, name) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            blank: 'y',
+            tab: name
+          }
+        })
+      },
       getOrderID(id){
         this.ppList.map(x=>{
           if (id === x.GuestId){
@@ -317,9 +327,6 @@ export default {
       chaKan(item){
      	  this.$router.push({ name:'NewSurvey',query:{"TCID":item.tcid, "OrderId": item.orderId,blank: 'y'} })
       },
-      goUrl(){
-     	   this.$router.push({ name:'FeedbackChart',query:{"msg":JSON.stringify(this.msg),blank: 'y'} })
-    	},
       getLineList() {
         this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
           if (res.data.resultCode == 1) {
@@ -503,4 +510,8 @@ export default {
     .NewSurveyList #table td._name,.NewSurveyList .qianming label{
       color: #5d5d5d;
     }
+    .go_regis{
+      text-decoration: underline;
+      cursor: pointer;
+    }
 </style>

src/components/index.vue

@@ -1704,7 +1704,7 @@ export default {
         { LogId: s.ID },
         r => {
           if (s.Link) {
-            this.goUrl(s.Link + '&MsgUrl=1');
+            this.goUrl(s.Link);
           }
           this.IM_bodyIsShow = false;
           this.refreshSysNoteDate();