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/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();