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

src/components/Hotel/singleProduct/components/ListCar.vue

@@ -70,7 +70,7 @@
                     <div v-if="crmOrderObj" style="margin-bottom: 10px;">
                         <span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
                         <span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
-                      </div>
+                    </div>
                     <el-form label-width="60px" :model="parameters" :rules="rules" ref="parameters">
                         <el-row :gutter="20">
                             <el-col :span="12">

src/components/TravelManager/TravelTeam/chooseCustomer.vue

+<style>
+
+</style>
+<template>
+  <el-card class="box-card">
+    <div slot="header" class="clearfix">
+      <span>选择同行</span>
+      <el-button style="float: right; padding: 3px 0" type="text" @click="sureData">确认选择</el-button>
+    </div>
+    <div class="chooseCustomerInfo">
+      <el-table :data="dataList" style="width:100%" border v-loading='loading'
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55">
+        </el-table-column>
+        <el-table-column fixed label="同行名称" min-width="180">
+          <template slot-scope="scope">
+            {{scope.row.CustomerName}}
+          </template>
+        </el-table-column>
+        <el-table-column fixed label="联系电话" min-width="180">
+          <template slot-scope="scope">
+            {{scope.row.ContactNumber}}
+          </template>
+        </el-table-column>
+        <el-table-column fixed label="关联销售" min-width="180">
+          <template slot-scope="scope">
+            {{scope.row.EmName}}
+          </template>
+        </el-table-column>
+        <el-table-column fixed label="地址" min-width="180">
+          <template slot-scope="scope">
+            {{scope.row.Address}}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="qMsg.currentPage"
+        layout="total,prev, pager, next, jumper" :page-size="qMsg.pageSize" :total="qMsg.total">
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        loading: false,
+        dataList: [], //数据列表
+        qMsg: {
+          pageIndex: 1,
+          currentPage: 1,
+          pageSize: 8,
+          total: 0,
+        },
+        saveLoading: false, //保存loading
+        selectData: [],
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      this.getCustomerList();
+    },
+    methods: {
+      //确认选择
+      sureData() {
+        this.$emit("success", this.selectData);
+      },
+      handleSelectionChange(val) {
+        var selectRow = JSON.parse(JSON.stringify(val));
+        this.selectData = selectRow;
+      },
+      //翻页
+      handleCurrentChange(val) {
+        this.qMsg.pageIndex = val;
+        this.getCustomerList();
+      },
+      // 获取合作伙伴列表
+      getCustomerList() {
+        this.loading = true;
+        this.apipost(
+          "app_customer_GetCustomerListForCareOf",
+          this.qMsg,
+          (res) => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data.pages.pageData;
+              this.qMsg.total = res.data.data.pages.count;
+            } else {
+              this.$message.error(res.data.message);
+            }
+          },
+          (err) => {
+            this.loading = false;
+          }
+        );
+      },
+
+    },
+  };
+
+</script>

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -65,7 +65,7 @@
           layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
         </el-pagination>
         <ul>
-          <li v-for="(item,index) in queryDataObj.dataList" :key="index"
+          <li v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId"
             :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
             <div class="TC_remarkContent">
               <div class="el-col w_20">
@@ -88,7 +88,7 @@
               </div>
               <div class="el-col w_10">
                 <div class="p20">
-                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>仓位信息</span></div>
+                  <div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
                   <div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
                   <div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
                   <div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
@@ -107,7 +107,7 @@
                 <div class="p20">
                   <div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
                   <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
-                    <el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag>
+                    <el-tag :key="subIndex+10000" style="margin-right:10px;">{{subItem.CustomerName}}</el-tag>
                   </template>
                 </div>
               </div>
@@ -156,28 +156,29 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog class="app-attachment-dialog" style="width:1000px;height:800px;margin:0 auto;z-index:99999"
-      :title="dialogTitle" :visible.sync="isShowEditTeamDialog" :close-on-click-modal="false">
-      <editTeamInfo :id="ID"></editTeamInfo>
+    <el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
+      :close-on-click-modal="false"  >
+      <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
     </el-dialog>
   </div>
 </template>
 <script>
-  import editTeamInfo from "./editTeamInfo"; //新增修改包机团
+  import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
+
   export default {
-    components: {
-      editTeamInfo
-    },
     provide() {
       return {
         reload: this.reload
       }
     },
+    components: {
+      editTeamInfo
+    },
     data() {
       return {
         isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
         dialogTitle: "添加包机信息", //弹窗名称
-        ID: '',
+        GTeamId: 0, //包机团队Id
         //查询参数
         queryMsg: {
           pageIndex: 1,
@@ -216,9 +217,6 @@
           }
         },
       };
-    },
-    components: {
-
     },
     //监听器
     watch: {
@@ -228,16 +226,23 @@
       },
     },
     methods: {
+ 
       //新增修改包机团
       editTeam(item) {
         if (item) {
           this.dialogTitle = "修改包机信息";
+          this.GTeamId = item.GTeamId;
         } else {
           this.dialogTitle = "添加包机信息";
+          this.GTeamId = 0;
         }
         this.isShowEditTeamDialog = true;
       },
-
+      //刷新页面
+      refreshPage() {
+        this.isShowEditTeamDialog = false;
+        this.getTravelTeamList();
+      },
       //翻页
       handleCurrentChange(val) {
         this.queryMsg.pageIndex = val;

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -628,7 +628,8 @@
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
                 <span class="fz12 c9e">订单总金额</span>
                 <div class="ml">
-                  <span class="fz15 fbold">{{ item.totalMoney.toFixed(2) }}</span>
+                  <!-- totalMoney -->
+                  <span class="fz15 fbold">{{ item.TotalPrice.toFixed(2) }}</span>
                   <span class="fz12 ml">
                     {{item.CurrencyName}}
                   </span>
@@ -814,7 +815,7 @@
               <el-table-column prop="UnitPrice" label="价格" min-width="150">
                 <template slot-scope="scope">
                   <el-input-number v-if="priceType == 1" v-model="scope.row.UnitPrice" @change="calcPrice()"
-                  :min="1" style="width:auto;"></el-input-number>
+                  :min="0" style="width:auto;"></el-input-number>
                   <span v-if="priceType != 1">
                     {{ scope.row.UnitPrice }}
                   </span>
@@ -1340,9 +1341,9 @@
         var tempRoomPrice = 0;
         var tempTotalPrice = 0;
         this.postMsg.details&&this.postMsg.details.forEach(item=>{
-          if(!item.UnitPrice){
-            item.UnitPrice = 1
-          }
+          // if(!item.UnitPrice){
+          //   item.UnitPrice = 1
+          // }
           item.Money = item.UnitPrice+item.StopBusPrice+item.RoomPrice
           if (item.UnitPrice) {
             tempUnitPrice += Number(item.UnitPrice);

src/components/busManagement/BookAcar/list.vue

@@ -449,9 +449,9 @@
       },
       mounted() {
         // crm自动登陆传过来的参数
-      if(this.$route.query.crmOrderObj){
-           this.crmOrderObj = this.$route.query.crmOrderObj
-       }
+        if(this.$route.query.crmOrderObj){
+            this.crmOrderObj = this.$route.query.crmOrderObj
+        }
       },
       created() {
         this.getProvinceList();

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -45,16 +45,19 @@
         <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
           :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
           v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
-
+         <!--常规团-->
         <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
+        <!--小包团-->
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice2>
+        <!--一日游-->
         <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice3>
+        <!--地接团-->
         <TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :PostDaysTrip="PostDaysTrip" v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
           :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice4>

src/components/platformModule/menuManagement.vue

@@ -360,10 +360,12 @@
           this.addMsg.Sort = updateList.Sort
           this.addMsg.GroupingCode = updateList.GroupingCode
           this.addMsg.MenuUrl = updateList.MenuUrl
+          this.addMsg.menutype = updateList.MenuType
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
+          // this.addMsg.MenuStyleIcon = style.icon
+          console.log(style,'----')
           this.addMsg.MenuStyleIcon = style.icon
-          this.addMsg.MenuStyleIcon = style.menutype
           this.addMsg.MenuStyleColor = style.color
           
           this.currentUpdateIndex = index
@@ -390,7 +392,8 @@
           'MenuStyle': '',
           'MenuStatus': '0',
           MenuStyleIcon: '',
-          MenuStyleColor: ''
+          MenuStyleColor: '',
+          Sort: null
         }
       },
       resetPageIndex() {