页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -610,6 +610,10 @@
                         v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
                     </span>
                   </p>
+              
+                  <p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
+                  </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
                     <span>手配费</span>
                     <span class="go_date">
@@ -682,9 +686,7 @@
                   <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
-                  <p class="travelnowrap" v-if="item.Config_OfferId">
-                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
-                  </p>
+      
                 </div>
               </div>
               <div class="el-col" style="width:190px;">
@@ -924,12 +926,6 @@
                       </el-popover>
                     </template>
                   </div>
-                  <div class="TC_SeatList">
-                    <template v-if="item.Config_OfferId>0">
-                      <a style="cursor:pointer;color:rgb(71,191,140);text-decoration: underline;"
-                        @click="gotoOffer(item)">查看报价单</a>
-                    </template>
-                  </div>
                 </div>
               </div>
               <div class="el-col" style="width:200px;">
@@ -1229,8 +1225,8 @@
       </el-form>
     </div>
     <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
-                    <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
-                    </el-dialog>
+      <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1246,7 +1242,8 @@
       return {
         dialog: {
           show: false,
-          ConfigId: '',OfferId: ''
+          ConfigId: '',
+          OfferId: ''
         },
         isCommissionDetails: false, //团控提成详情权限
         QSendCommissionStateList: [{
@@ -1386,7 +1383,7 @@
           HotelUseTime: "", //酒店使用时间
           QBusNumber: "",
           PriceTeamType: "", //团队类型
-          Title:"",//团名
+          Title: "", //团名
         },
         TeamListArr: [], //团队类型
         //报价单查询条件
@@ -1505,10 +1502,11 @@
       },
     },
     methods: {
-      showDialog(ConfigId,OfferId) {
+      showDialog(ConfigId, OfferId) {
         this.dialog = {
           show: true,
-          ConfigId,OfferId
+          ConfigId,
+          OfferId
         }
         this.$nextTick(() => {
           this.$refs.dialog.getPostData()

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -436,7 +436,7 @@
                     {{item.OutBranchName}}
                   </p>
                   <p class="travelnowrap" v-if="item.Config_OfferId">
-                    <span style="cursor:pointer;text-decoration:underline;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
                   </p>
                 </div>
               </div>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -285,17 +285,11 @@
                   <span style="display: flex;align-items: center;flex-wrap: wrap;">
                     <el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
                       <el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
-                  :key="item.LineID"></el-option>
+                        :key="item.LineID"></el-option>
                     </el-select>
                     <a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
-                    <el-switch
-                    v-model="queryMsg.QOutGroupAuditReject"
-                    active-text=""
-                    inactive-text=""
-                    active-color="#409eff"
-                    inactive-color="#dcdfe6"
-                    active-value="1"
-                    inactive-value="0"/>
+                    <el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
+                      active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
                     <div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
                       <span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
                       <span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
@@ -372,7 +366,7 @@
           </li>
         </ul>
       </div>
-      
+
       <div class="TravelTclList" v-loading="queryCommonData.loading">
         <ul>
           <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
@@ -419,15 +413,16 @@
                     <span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
                     <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
                   </div>
-                  <div class="TC_TravelSalePlat clearfix"
-                   v-if="item.Royalty" style="display: flex;flex-wrap: wrap;align-items: baseline;">
-                      <span class="TC_neibu" style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}} 期</span>
-                      <span style="cursor: pointer;"  v-for="x in item.Royalty.List"
-                      @click="goRoyaltyUrl(item,item.Royalty,x)" 
-                      class="TC_neibu"
+                  <div class="TC_TravelSalePlat clearfix" v-if="item.Royalty"
+                    style="display: flex;flex-wrap: wrap;align-items: baseline;">
+                    <span class="TC_neibu"
+                      style="color: red;font-size: 11px;line-height: 25px;">{{item.Royalty?item.Royalty.Periods:''}}
+                      期</span>
+                    <span style="cursor: pointer;" v-for="x in item.Royalty.List"
+                      @click="goRoyaltyUrl(item,item.Royalty,x)" class="TC_neibu"
                       :style="{'background-color':item.Royalty.Type==1?'#ff99cc':item.Royalty.Type==2?'#bcd6ee':'#DDDDDD','color':'#000000','margin-top':'3px'}">
-                        {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
-                      </span>
+                      {{x.UserName}}<span>¥{{x.CommissionMoney}}</span>
+                    </span>
                   </div>
                 </div>
               </div>
@@ -455,7 +450,7 @@
                     <a style="corsor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a>
                   </p>
-                                    <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
+                  <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
                     <span>报价单</span>
                     <span class="go_date">
                       <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
@@ -475,7 +470,7 @@
                     </span>
                   </p>
                   <p class="travelnowrap" v-if="item.Config_OfferId">
-                    <span style="cursor: pointer;" @click="showDialog(item.ID, item.OfferId)">报价详情</span>
+                    <span style="cursor:pointer;text-decoration:underline;color:blue;" @click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
                   </p>
                 </div>
               </div>
@@ -689,7 +684,8 @@
                 </div>
               </div>
             </div>
-            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
+            <div class="TC_remarkContent"
+              v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
               <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
@@ -792,8 +788,8 @@
       </el-form>
     </div>
     <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
-                    <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
-                    </el-dialog>
+      <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -806,13 +802,22 @@
       return {
         dialog: {
           show: false,
-          ConfigId: '',OfferId: ''
+          ConfigId: '',
+          OfferId: ''
         },
-        isCommissionDetails: false,//团控提成详情权限
-        QSendCommissionStateList:[
-          {Name:'不限',ID: 0},
-          {Name:'已发放',ID: 1},
-          {Name:'未发放',ID: 2},
+        isCommissionDetails: false, //团控提成详情权限
+        QSendCommissionStateList: [{
+            Name: '不限',
+            ID: 0
+          },
+          {
+            Name: '已发放',
+            ID: 1
+          },
+          {
+            Name: '未发放',
+            ID: 2
+          },
         ],
         LookAllTeam: false, //查看所有团控
         //查询数据列表
@@ -885,8 +890,8 @@
         },
         //查询参数
         queryMsg: {
-          QOutGroupAuditReject: 0,//只查看审核驳回 1
-          QSendCommissionState: 0,//提成状态 0不限， 1已发放， 2未发放
+          QOutGroupAuditReject: 0, //只查看审核驳回 1
+          QSendCommissionState: 0, //提成状态 0不限， 1已发放， 2未发放
           //出团公司集合
           OutBranchIds: [],
           pageIndex: 1,
@@ -908,7 +913,7 @@
           DayNum: '',
           OnlyShowOverTeam: false,
           TCState: [3], //去掉默认显示
-          GroupState: [1,2,5],
+          GroupState: [1, 2, 5],
           SalePlat: [1, 2, 3, 4, 5],
           UnionCityId: 0,
           SaleBranchId: [],
@@ -969,31 +974,33 @@
       }
     },
     methods: {
-      showDialog(ConfigId,OfferId) {
+      //显示报价单弹窗
+      showDialog(ConfigId, OfferId) {
         this.dialog = {
           show: true,
-          ConfigId,OfferId
+          ConfigId,
+          OfferId
         }
         this.$nextTick(() => {
           this.$refs.dialog.getPostData()
         })
       },
       // 查看团详情
-      goRoyaltyUrl(row,Royalty,item){
-        let name 
+      goRoyaltyUrl(row, Royalty, item) {
+        let name
         let obj = {
           isSearch: true,
           blank: "y"
         }
-        if(Royalty.Type==3){
+        if (Royalty.Type == 3) {
           name = 'OpComPersonDetails'
           obj.EmployeeId = item.UserId
           obj.TCNUM = row.TCNUM
-        }else if(Royalty.Type==2){
+        } else if (Royalty.Type == 2) {
           name = 'OPsalesCommissiondetails'
           obj.UserId = item.UserId
           obj.TCNUM = row.TCNUM
-        }else{
+        } else {
           name = 'ServiceCommissiondetails'
           obj.UserId = item.UserId
           obj.TCNUM = row.TCNUM
@@ -1139,28 +1146,29 @@
                   })
                 }
               })
-              if(!this.isCommissionDetails) return
+              if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
             }
           },
           err => {}
         )
       },
-      getDetailsOfRoyalty(){
-        let Ids = this.queryCommonData.dataList.map(x=> {return x.TCID})
+      getDetailsOfRoyalty() {
+        let Ids = this.queryCommonData.dataList.map(x => {
+          return x.TCID
+        })
         let msg = [...new Set(Ids)]
         this.apipost(
-          "commission_get_GetTravelOPCommissionList",
-          {
+          "commission_get_GetTravelOPCommissionList", {
             TCIDStr: msg.join(',')
           },
           res => {
             if (res.data.resultCode == 1) {
               let RoyaltyList = []
               RoyaltyList = res.data.data
-              this.queryCommonData.dataList.forEach(x=>{
-                RoyaltyList.forEach(y=>{
-                  if(x.TCID==y.TCID){
+              this.queryCommonData.dataList.forEach(x => {
+                RoyaltyList.forEach(y => {
+                  if (x.TCID == y.TCID) {
                     x.Royalty = y
                   }
                 })
@@ -1170,7 +1178,7 @@
           }
         )
       },
-      
+
       //验证大小
       checkTeamNum(queryMsg) {
         var TeamMinNum = parseInt(queryMsg.TeamMinNum)
@@ -1762,7 +1770,7 @@
           this.queryMsg = this.$store.state.pageCondition
         }
       }
-      if(this.$route.query.id){
+      if (this.$route.query.id) {
         this.queryMsg.TCID = this.$route.query.id
       }
       var myDate = new Date()

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -91,13 +91,13 @@
         </li>
         <li>
           <span>
-                      <span>{{$t('visa.v_czuser')}}</span>
-                      <el-select class="w150" v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
-                        <el-option :label="$t('pub.unlimitedSel')" :value="0">
-                        </el-option>
-                        <el-option v-for="(item,index) in EmployeeList" :label="item.EmName"
-                          :value="item.EmployeeId" :key="index"></el-option>
-                      </el-select>
+            <span>{{$t('visa.v_czuser')}}</span>
+            <el-select class="w150" v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0">
+              </el-option>
+              <el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                :key="index"></el-option>
+            </el-select>
           </span>
         </li>
         <li>
@@ -339,7 +339,7 @@
     data() {
       return {
         EmployeeList: [],
-        EditBtn:false,//报价单修改权限
+        EditBtn: false, //报价单修改权限
         userInfo: {},
         queryData: {
           CreateBy: '',
@@ -412,7 +412,7 @@
           IsShowLeaderFenTan: false, //领队分摊
           IsShowCost: false, //成本统计
           IsShowOtherPrice: false, //其他定价
-          IsCostRebate:false,//成本回扣
+          IsCostRebate: false, //成本回扣
         },
       };
     },
@@ -612,44 +612,40 @@
         that.outerVisible = true;
       },
       //报价单跳转
-      goMakeQuo(path, configId,TeamType) {
-        if(configId) {
-        this.$router.push({
-          path: path,
-          query: {
-            TeamType: TeamType,
-            configId: configId,
-            blank: 'y',
-            tab: '报价单'
-          }
-        });
+      goMakeQuo(path, configId, TeamType) {
+        if (configId) {
+          this.$router.push({
+            path: path,
+            query: {
+              TeamType: TeamType,
+              configId: configId,
+              blank: 'y',
+              tab: '报价单'
+            }
+          });
         } else {
-        this.$router.push({
-          path: path,
-          query: {
-            configId: configId,
-            blank: 'y',
-            tab: '报价单'
-          }
-        });
+          this.$router.push({
+            path: path,
+            query: {
+              configId: configId,
+              blank: 'y',
+              tab: '报价单'
+            }
+          });
         }
       },
       //开团或修改
       goToOpenTravel(item) {
-        // TeamType 0常规,1-小包团,2-一日游,3-地接团
+        // TeamType 0常规,1-小包团,2-当地游,3-地接团
         var routeName = this.$route.name;
-        var path = 'TravelManager5';
-        if(item.TeamType === 0) {
+        var path = 'TravelManager2';
+        if (item.TeamType === 0) {
           path = 'TravelManager2'
-        } else if(item.TeamType === 1) {
+        } else if (item.TeamType === 1) {
           path = 'TravelManager3'
+        } else if (item.TeamType === 2) {
+          path = 'TravelManager5'
         }
-        // if (routeName == 'newQuotation') {
-        //   path = 'TravelManager6'
-        // }
-        // if (routeName == 'newQuotation2') {
-        //   path = 'TravelManager5'
-        // }
         if (item.ID > 0) {
           this.$router.push({
             name: path,
@@ -690,7 +686,7 @@
           this.loading = false;
         });
       },
-       GetAuth() {
+      GetAuth() {
         var actionCode = this.$AuthCode.EditQuotation;
         this.CheckUserAuth(actionCode, res => {
           if (res.data.resultCode == 1 && res.data.data == 1) {