Merge branch 'master' into sub-application

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -390,25 +390,13 @@
                 },err=>{})
             },
             goTuanDetails(row) {
-            let name = ''
-            // if (row.IsOneDayOrder == 1) {
-            //   name = 'groupTourOrderByTuanOne'
-            // } else {
-            //   name = 'groupTourOrderByTuan'
-            // }
-            if (row.TravelType == 0) {//正常团
-                name = 'TravelControlList'
-            }else if (row.TravelType == 2) {//当地团
-              name = 'oneDayTrip'
-            } else {//小包团
-              name = 'TravelControlListSale'
-            }
+              if(row.TCNUM=="-"){return;}
               this.$router.push({
-              name: name,
+                path: 'TeamBalancePayment',//TravelControlList
                 query: {
                   id: row.TCID,
-                tcmun: row.TCNUM,
-                blank: "y",
+                  blank: 'y',
+                  tab: '团队收支'//团控列表
                 }
               });
           },

src/components/FinancialModule/RecPayQueryKM.vue

@@ -1122,26 +1122,17 @@
         this.loading = true;
         this.apipost('Financial_post_GetCostTypeAllPageList', this.msg, res => {
           if (res.data.resultCode == 1) {
+            this.loading = false;
             let data = res.data.data.pageData.list;
-            let userInfo = this.getLocalStorage();
-            data.forEach(x => {
-              if (("," + userInfo.ActionMenuCode + ",").indexOf(',Finance_CreateByCareOf,') != -1) {
-                x.isExchange = true
-              } else {
-                x.isExchange = false
-              }
-            })
             this.total = res.data.data.count;
             if (this.total == 0) {
               this.DataList = [];
             } else {
               data.forEach(x => {
-                // this.columns[0].filters.push({label:x.FrID,value:x.FrID})
                 x.modelShow = false;
               })
               this.DataList = data;
             }
-            this.loading = false;
           } else {
             this.loading = false;
             this.$message.error(res.data.message);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1302,6 +1302,7 @@ export default {
       showID: false,
       active: 1,
       userId: 0,
+      empBranchId: -1,
       //是否显示
       isShowType:true,
       isShowGrounding:true,
@@ -2692,6 +2693,7 @@ export default {
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
+    this.empBranchId = userInfo.RB_Branch_id;
     if (this.$route.query.BranchId) {
       this.msg.OutBranchId = this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
     }
@@ -2766,7 +2768,9 @@ export default {
     getChange(val){
       if(this.msg.OutBranchId == -1){
         this.coinGetShow = false
+        if(this.empBranchId==0){
           this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
+        }
       }else{
         this.coinGetShow = true
         this.msg.StandardCurrencyId = -1
@@ -3518,6 +3522,16 @@ export default {
             }
             if(BranchStatus==-1){
               this.BranchStatus=false;
+            }else if(BranchStatus<-2){
+              this.BranchStatus=false;
+              if(this.msg.LineId<=0){
+                this.msg.OutBranchId=0-BranchStatus;
+                this.msg.StandardCurrencyId=-1;
+                this.CompanyList = this.CompanyList.filter(x=>{
+                  if(x.Id==(0-BranchStatus)){return x;}
+                  else{return;}
+                });
+              }
             }else{
                 this.BranchStatus=true;
                 this.msg.OutBranchId=BranchStatus;

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -437,9 +437,6 @@
             } else {
               name = 'VisaProductEditOrder'
             }
-            this.$router.push({
-              name: name,
-            });
           } else if (row.OrderType == 2) { //跟团 一日游
             if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'enrollTotal'

src/components/FinancialModule/platformFinancial.vue

@@ -59,7 +59,8 @@
               <li class="hight_query">
 
                   <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
-                  <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
+                  <button class="normalBtn" @click="method5(0)">{{$t('visa.v_daochu')}}</button>
+                  <button class="normalBtn" @click="method5(1)">汇总{{$t('visa.v_daochu')}}</button>
               </li>
           </ul>
       </div>
@@ -626,7 +627,7 @@ export default {
           this.msg.pageIndex = val;
           this.getPageList();
       },
-      method5: function() {
+      method5: function(ImportType) {
         if(!this.msg.ClientID)this.msg.ClientID="";
           if(!this.msg.ClientType)this.msg.ClientType=0;
           if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
@@ -647,6 +648,7 @@ export default {
           if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
           if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
           let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+          this.msg.ImportType = ImportType;
          // var fileName = `${this.$t('objFill.v101.FinancialModule.pingtztjetj')}${time}.xls`;
          var fileName = this.$t('objFill.v101.FinancialModule.pingtztjetj')+time+'.xls'
           this.GetLocalFile("Financial_post_GetPlatformStatisticsExport", this.msg,fileName);

src/components/LeaderManagement/leaderManagement.vue

@@ -307,8 +307,15 @@
             <em>{{$t('admin.admin_GuideLeibie')}}</em>
             <el-select v-model="msg.LeaderGuidClass" clearable :placeholder="$t('system.ph_choice')">
               <el-option :label="$t('system.ph_buxian')" :value='-1'></el-option>
+              <template v-if="msg.Type==3">
                 <el-option :label="$t('admin.admin_cpGuide')" :value='0'></el-option>
                 <el-option :label="$t('admin.admin_waiGuide')" :value='1'></el-option>
+              </template>
+              <template v-else>
+                <el-option :label="$t('op.CompanyLeader')" :value="0"></el-option>
+                <el-option :label="$t('op.THLeader')" :value="1"></el-option>
+                <el-option :label="$t('op.LXLeader')" :value="2"></el-option>
+              </template>
             </el-select>
           </span>
         </li>
@@ -461,18 +468,25 @@
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie" :close-on-click-modal="false">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
-        <el-form-item>
-          <el-radio-group v-model="addMsg.LeaderGuidClass">
-            <el-radio :label="0">{{$t('admin.admin_waiGuideT')}}</el-radio>
-            <el-radio :label="1">{{$t('admin.admin_GuideLeibieT')}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="$t('system.query_workType')" prop="Type" v-if="addMsg.LeaderGuidClass==0">
+        <el-form-item :label="$t('system.query_workType')" prop="Type">
           <el-select v-model="addMsg.Type" :placeholder="$t('admin.admin_workType')" class="w210">
             <el-option v-for='item in workTypeList' :key="item.Value" :label="item.Key" :value="item.Value">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="addMsg.Type==3?'导游类型':'领队类型'">
+          <el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('system.ph_choice')">
+            <template v-if="addMsg.Type==3">
+              <el-option :key="0" :label="$t('admin.admin_cpGuide')" :value='0'></el-option>
+              <el-option :key="1" :label="$t('admin.admin_waiGuide')" :value='1'></el-option>
+            </template>
+            <template v-else>
+              <el-option :key="0" :label="$t('op.CompanyLeader')" :value="0"></el-option>
+              <el-option :key="1" :label="$t('op.THLeader')" :value="1"></el-option>
+              <el-option :key="2" :label="$t('op.LXLeader')" :value="2"></el-option>
+            </template>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('admin.admin_language')" class='multiple_input LanguageList'
           v-if="addMsg.Type==3&&addMsg.LeaderGuidClass==0">
           <el-select v-model="LanguageIdS" multiple :placeholder="$t('admin.admin_phlanguage')" class="w210">
@@ -946,7 +960,11 @@
           res => {
             if (res.data.resultCode == 1) {
               res.data.data.forEach(item => {
-                this.workTypeList.push(item);
+                var obj = {
+                  Key: item.Key,
+                  Value: Number(item.Value)
+                }
+                this.workTypeList.push(obj);
               });
             }
           });
@@ -1073,7 +1091,7 @@
       },
       initAddMsg() {
         this.addMsg.ID = "0";
-        this.addMsg.Type = "3";
+        this.addMsg.Type = 3;
         this.addMsg.EmployeeId = "";
         this.addMsg.Surname = "";
         this.addMsg.Name = "";
@@ -1120,28 +1138,43 @@
           },
           res => {
             let LanguageIdArr = [];
-            this.addMsg = res.data.data;
-            this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
-            this.addMsg.Type = this.addMsg.Type.toString();
-            this.addMsg.Sex = this.addMsg.Sex.toString();
-            this.addMsg.LeaderGuidType = this.addMsg.LeaderGuidType.toString();
-            this.addMsg.VisaNumber = this.addMsg.VisaNumber.toString();
-            if (this.addMsg.emRB_Department_Id) {
-              this.getPost(this.addMsg.RB_Branch_id, this.addMsg.emRB_Department_Id);
-              this.getDerpartMent(this.addMsg.RB_Branch_id)
-            }
-            if (this.addMsg.LanguageId) {
-              this.addMsg.LanguageId = this.addMsg.LanguageId.substr(
-                0,
-                this.addMsg.LanguageId.length - 1
-              );
-              LanguageIdArr = this.addMsg.LanguageId.split(",");
-              LanguageIdArr.forEach(x => {
-                this.LanguageIdS.push(Number(x));
-              });
-            }
-            this.searchKey(this.addMsg.CityName)
+            var tempData = res.data.data;
+            if (tempData) {
+              this.addMsg.ID = tempData.ID;
+              this.addMsg.Type = tempData.Type;
+              this.addMsg.EmployeeId = tempData.EmployeeId;
+              this.addMsg.RB_Branch_id = tempData.RB_Branch_id;
+              this.addMsg.emRB_Department_Id = tempData.emRB_Department_Id;
+              this.addMsg.emRB_Post_Id = tempData.emRB_Post_Id;
+              this.addMsg.EmAccount = tempData.EmAccount;
+              this.addMsg.Surname = tempData.Surname;
+              this.addMsg.Name = tempData.Name;
+              this.addMsg.EnSurname = tempData.EnSurname;
+              this.addMsg.EnName = tempData.EnName;
+              this.addMsg.IdCard = tempData.IdCard;
+              this.addMsg.BirthDate = tempData.BirthDate;
+              this.addMsg.BirthPlace = tempData.BirthPlace;
+              this.addMsg.Sex = tempData.Sex.toString();
+              this.addMsg.MobilePhone = tempData.MobilePhone;
+              this.addMsg.SpareTel = tempData.SpareTel;
+              this.addMsg.Passport = tempData.Passport;
+              this.addMsg.IssuePlace = tempData.IssuePlace;
+              this.addMsg.IssueDate = tempData.IssueDate;
+              this.addMsg.ExpiryDate = tempData.ExpiryDate;
+              this.addMsg.CountryID = tempData.CountryID;
+              this.addMsg.LanguageId = tempData.LanguageId;
+              this.addMsg.Remarks = tempData.Remarks;
+              this.addMsg.VisaNumber = tempData.VisaNumber.toString();
+              this.addMsg.LeaderGuidType = tempData.LeaderGuidType.toString();
+              this.addMsg.LeaderGuidClass = tempData.LeaderGuidClass;
+              this.addMsg.ValidDate = tempData.ValidDate;
+              this.addMsg.CityName = tempData.CityName;
               this.addMsg.EmPassword = "";
+              this.LanguageIdS = tempData.LanguageIdList;
+              if (this.addMsg.CityName && this.addMsg.CityName != '') {
+                this.searchKey(this.addMsg.CityName)
+              }
+            }
           });
       },
       //弹出框关闭初始化弹框内表单
@@ -1151,7 +1184,6 @@
       },
       //弹出框取消 初始化谈框内表单
       resetForm(formName) {
-        // this.$refs[formName].resetFields();
         this.initAddMsg();
         this.LanguageIdS = [];
       }

src/components/SalesModule/addPassenger.vue

@@ -188,8 +188,7 @@
           </li>
           <li>
             <el-form-item :label="$t('admin.admin_EnSurname')" prop="EName">
-              <el-input v-model='addMsg.EName' type="text" size=mini class="w230"
-                :placeholder="$t('visaT.peEnglish')">
+              <el-input v-model='addMsg.EName' type="text" size=mini class="w230" :placeholder="$t('visaT.peEnglish')">
               </el-input>
             </el-form-item>
           </li>
@@ -721,6 +720,7 @@
           EmergencyContact: "",
           EmergencyAddress: "",
           EmergencyTel: "",
+          EmergencyRelation: "",
           IsCriminalRecord: "2",
           TravelCost: "",
           TravelName: "",
@@ -1110,11 +1110,11 @@
               this.savePassenger(type);
             } else {
               this.btnState = true
-              if (this.addMsg.SurName == '') {
+              if (this.addMsg.Nationality == 2 && this.addMsg.SurName == '') {
                 this.Error(this.$t('objFill.v101.Rest.qingtxgrxx')[0]);
                 return false;
               }
-              if (this.addMsg.Name == '') {
+              if (this.addMsg.Nationality == 2 && this.addMsg.Name == '') {
                 this.Error(this.$t('objFill.v101.Rest.qingtxgrxx')[1]);
                 return false;
               }
@@ -1506,6 +1506,7 @@
         this.addMsg.EmergencyContact = "";
         this.addMsg.EmergencyAddress = "";
         this.addMsg.EmergencyTel = "";
+        this.addMsg.EmergencyRelation = "";
         this.addMsg.IsCriminalRecord = "2";
         this.addMsg.TravelCost = "";
         this.addMsg.TravelName = "";

src/components/SalesVisa/components/visaOrderList.vue

@@ -536,6 +536,11 @@
                   {{$t('objFill.uncompleted')}}
                 </template>
               </div>
+               <div class="orderType cf fz12" v-if="scope.row.isChargeLossOrders == 1"
+                 >
+                  {{$t('fnc.sun')}}
+                </div>
+             
               <div class="c9e fz12">
                 <span>{{$t('fnc.danhao')}}：</span>
                 <span>{{scope.row.visaTCNUM}}({{scope.row.id}})</span>
@@ -800,7 +805,10 @@
                         v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)">
                         <span class="cF1416C">{{ $t('pub.cancelBtn') }}</span>
                       </div>
-
+                      <div class="row-c cursor-pointer radius5 cancel py5" @click='orderMsg.OrderId=scope.row.id;outerVisible=true'
+                          v-if="scope.row.income>0&&scope.row.visaOrderStatus==1&&scope.row.isChargeLossOrders==0">
+                          <span class="cF1416C">{{$t('objFill.shezhishoushunje')}}</span>
+                      </div>
                       <div class="row-c cursor-pointer radius5 change py5" @click='goUrlT(scope.row)'
                         v-if="(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&pagesTitle=='销售'">
                         <span class="c059FF6">{{ $t('salesModule.LKMD') }}</span>
@@ -982,6 +990,45 @@
         <el-button size="mini" @click="EditOPVisible = false">{{$t('pub.cancelBtn')}}</el-button>
         <el-button size="mini" type="danger" @click="sureOPEmp">{{$t('pub.sureBtn')}}</el-button>
       </span>
+    </el-dialog>
+     <el-dialog
+      custom-class="w400"
+      :title="$t('objFill.shezhishoushunje')"
+      :visible.sync="outerVisible"
+    >
+      <div>
+        <el-form label-width="80px" :model="orderMsg" :rules="rules2" ref="orderMsg">
+          <el-row :gutter="20">
+           
+            <el-col :span="20">
+              <el-form-item :label="$t('salesModule.SSJE')" prop="LossMoney">
+                <el-input-number
+                  class="w200"
+                  v-model="orderMsg.LossMoney"
+                  :min="0"
+                  :max="10000000"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" style="margin-top: 20px; margin-bottom: 20px">
+            <el-col :span="24" style="text-align: right">
+              <input
+                type="button"
+                class="normalBtn"
+                :value="$t('pub.saveBtn')"
+                @click="submitForm('orderMsg')"
+              />
+              <input
+                type="button"
+                class="hollowFixedBtn"
+                :value="$t('pub.cancelBtn')"
+                @click="(outerVisible = false), $refs['orderMsg'].resetFields()"
+              />
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </el-dialog>
     <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
     <TransferOrder v-if="showTransferOrder" :isShow="showTransferOrder" :obj="queryObj"
@@ -1005,6 +1052,7 @@
         CompletedLoading: false,
         multipleSelection: [],
         isCommissionDialog: false,
+        outerVisible:false,
         objNew: {},
         queryObj: null,
         cdState: false,
@@ -1031,6 +1079,10 @@
           SendEndDate: '',
           Name: '',
           VisaTCNUM: ''
+        },
+          orderMsg: {
+        OrderId: "",
+        LossMoney: 0,
       },
         addMsg: {
           Id: 0,
@@ -1067,6 +1119,15 @@
             message: this.$t('rule.EnterCJRQ'),
             trigger: "blur"
           }]
+        },
+         rules2: {
+        LossMoney: [
+          {
+            required: true,
+            message: this.$t('objFill.qinshurushoushunje'),
+            trigger: "blur",
+          },
+        ],
       },
         updateRemarksStatus: false,
         SendStartDate: '',
@@ -1108,6 +1169,52 @@
       }
     },
     methods: {
+        //提交
+    submitForm(msg) {
+      //提交创建、修改表单
+      this.$refs[msg].validate((valid) => {
+        if (valid) {
+          if (!this.loading2) {
+            this.saveUpdate();
+          }
+        } else {
+          // this.Error("请完成必填项");
+          return false;
+        }
+      });
+    },
+     saveUpdate() {
+      let text = this.$t('objFill.shifouquedinss');
+      this.$confirm(text, this.$t('tips.tips'), {
+        confirmButtonText: this.$t('pub.sureBtn'),
+        cancelButtonText: this.$t('pub.cancelBtn'),
+        type: "warning",
+      })
+        .then(() => {
+          this.loading2 = true;
+          this.apipost(
+            "dmc_post_SetVisaOrderRevenueLoss",
+            {
+              OrderId: this.orderMsg.OrderId,
+              LossMoney: this.orderMsg.LossMoney,
+            },
+            (res) => {
+              if (res.data.resultCode == 1) {
+                this.Success(res.data.message);
+                this.$emit("success");
+              } else {
+                this.Error(res.data.message);
+              }
+              this.loading2 = false;
+              this.outerVisible = false;
+            },
+            (err) => {
+              (this.loading2 = false), (this.outerVisible = false);
+            }
+          );
+        })
+        .catch(() => {});
+    },
       clickCorrelation(item, ) {
         this.CorrelationObj = JSON.parse(JSON.stringify(item));
         this.CorrelationObj.TypeNum = 7;

src/components/TravelManager/TravelLeader/Leader.vue

@@ -259,10 +259,11 @@
         <li>
           <span>
             <em>{{$t('system.query_workType')}}</em>
-            <el-select v-model="msg.Type" clearable :placeholder="$t('system.ph_choice')">
+            <el-select v-model="msg.LeaderGuidClass" clearable :placeholder="$t('system.ph_choice')">
               <el-option :label="$t('system.ph_buxian')" :value='DefaultSelectValue'></el-option>
-              <el-option v-for="item in workTypeList" :key="item.Key" :label="item.Key" :value="item.Value">
-              </el-option>
+              <el-option key="0" :label="$t('op.CompanyLeader')" :value="0"></el-option>
+              <el-option key="1" :label="$t('op.THLeader')" :value="1"></el-option>
+              <el-option key="2" :label="$t('op.LXLeader')" :value="2"></el-option>
             </el-select>
           </span>
         </li>
@@ -328,7 +329,7 @@
       </div>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
-      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total="msg.total">
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
     </el-pagination>
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie">
@@ -383,7 +384,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('admin.admin_IDcard')" class="other_input">
           <el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
           </el-input>
@@ -476,7 +476,7 @@
         //默认图片
         defaultImg: 'this.src="' + require("../../../assets/img/default_head_img.jpg") + '"',
         //下拉框默认值
-        DefaultSelectValue: 0,
+        DefaultSelectValue: -1,
         //分公司默认值
         BranchDefaultValue: -1,
         //请求数据参数
@@ -489,7 +489,8 @@
           total: 0,
           currentPage: 1,
           // 查询类型【1-地接查询(领兼地和导游),2-操作查询领队】
-          QueryType: 2
+          QueryType: 2,
+          LeaderGuidClass: -1,
         },
         addMsg: {
           ID: "0",

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -721,16 +721,20 @@
                     <span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
                   </p>
                   <p>
-                    <span>{{$t('leader.leader_Leader')}}</span>
-                    <span v-if="item.LeaderName==null" class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
+                    <span>{{ $t("leader.leader_Leader") }}</span>
+                    <span v-if="item.LeaderName" class="TCL-greenType">{{
+                      item.LeaderName
+                    }}</span>
                     <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
                       @click="setLeaderOrGuide(item,0)">
                       {{ $t("ground.szlindui") }}
                     </span>
                   </p>
                   <p>
-                    <span>{{$t('leader.leader_Guide')}}</span>
-                    <span v-if="item.GuideName" class="TCL-greenType">{{item.GuideName}}</span>
+                    <span>{{ $t("leader.leader_Guide") }}</span>
+                    <span v-if="item.GuideName" class="TCL-greenType">{{
+                      item.GuideName
+                    }}</span>
                     <span v-else class="TCL-redType" style="cursor:pointer;text-decoration: underline;"
                       @click="setLeaderOrGuide(item,1)">{{$t('objFill.v101.shezhidaoy')}}</span>
                   </p>

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -113,6 +113,12 @@
                     </template>
                   </el-select>
                 </template>
+                <!-- <template v-if="postData.TeamType==2" >
+                  &nbsp;&nbsp;&nbsp;&nbsp;
+                  <el-tooltip content="勾选此项,团队报满后,自动生成新团期,新报价单。">
+                    <el-checkbox v-model="postData.IsRoll" :true-label="1" :false-label="0">滚动发团</el-checkbox>
+                  </el-tooltip>
+                </template> -->
               </td>
               <td width="80" class="txtRightCost">{{$t('advmanager.v_line')}}</td>
               <td>
@@ -179,6 +185,7 @@
                   :disabled="rParams.TCID>0">
                 </el-date-picker>
               </td>
+
             </tr>
             <tr>
               <td colspan="8" style="height:20px;">
@@ -284,6 +291,7 @@
           OutDateTimeList: [], //出发时间
           OfferPayType: 0, //报价单付款方式
           SaleOfferPayType: 0, //售价付款方式
+          IsRoll: 0, //团期报满后是否自动生成新团期,新报价单
           OPId: "", //主OP
           AssistantId: "", //助理OP[格式:1,2,3]
           AssistantList: [], //助理OP数组
@@ -646,6 +654,9 @@
               if (tempData.OutBranchName && tempData.OutBranchName != '') {
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
+              if (tempData.IsRoll) {
+                this.postData.IsRoll = tempData.IsRoll;
+              }
               this.postData.TeamType = tempData.TeamType;
               this.postData.PriceTeamType = tempData.PriceTeamType;
               this.postData.TravelState = tempData.TravelState;

src/components/orderCommon/productOrderList.vue

@@ -470,7 +470,7 @@
             <div v-if="item.IsB2B === 0" class="product_nei"></div>
             <div v-if="item.IsUnionTravel === 1" class="product_union"></div>
             <div v-if="item.IsWarning === 1" class="product_warning"></div>
-            <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'200px':'auto'}">
+            <div class="d12" style="float: none; margin: auto" :style="{'width': pagesTitle=='跟团游产品'?'300px':'auto'}">
               <p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
               <p class="d12TC">{{ item.TCNUM }}（{{ item.TCID }}）</p>
               <p>{{ item.LtName }}</p>
@@ -485,6 +485,11 @@
                 </span>
               </p>
             </div>
+            <div v-if="item.SalePlatList&&item.SalePlatList.length>0" style="margin-top:5px;">
+              <span class="TC_neibu"  style="margin-right:5px;"
+                :class="{TCneibu: plat == 3, TCb2b: plat == 1,TCb2c: plat == 2, AppPlat: plat == 4, otherPlat: plat == 5,}"
+                v-for="plat in item.SalePlatList" :key="plat.subCode">{{ $tripUtils.getPlatName(plat) }}</span>
+            </div>
           </div>
           <div class="d2" v-if="pagesTitle=='跟团游产品'">
             <p style="text-align: left; text-indent: 50px">
@@ -702,7 +707,7 @@
                             )
                         }}
                       </td> -->
-                      <td >
+                      <td>
                         {{
                           (item.B2BPrice - item.ChildNoNeedPrice)
                             | priceFormat(item.B2BPrice - item.ChildNoNeedPrice)

src/components/systemManagement/airportManagement.vue

@@ -77,6 +77,7 @@
         <th>{{$t('system.table_ENname')}}</th>
         <th>{{$t('system.query_IATA')}}</th>
         <th>{{$t('system.query_ICAO')}}</th>
+        <th>所属时区</th>
         <th>{{$t('system.table_city')}}</th>
         <th>{{$t('hotel.table_operater')}}</th>
         <th>{{$t('hotel.table_operattime')}}</th>
@@ -87,6 +88,7 @@
         <td>{{item.En_name}}</td>
         <td>{{item.IATA}}</td>
         <td>{{item.ICAO}}</td>
+        <td>{{item.UTCZone}}</td>
         <td>{{item.CityName}}</td>
         <td>{{item.EmName}}</td>
         <td>{{item.UpdateDate}}</td>
@@ -149,7 +151,8 @@
           <el-input type="text" v-model="addMsg.En_name" :placeholder="$t('system.ph_ENname')" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_IATA')" prop="IATA">
-          <el-input type="text" v-model="addMsg.IATA" :placeholder="$t('system.ph_IATA')" maxlength="3" class="w210">
+          <el-input type="text" v-model="addMsg.IATA" :placeholder="$t('system.ph_IATA')" maxlength="3" class="w210"
+            @blur="getAirportConfig()">
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_ICAO')" prop="ICAO">
@@ -160,6 +163,9 @@
           <el-input type="text" v-model="addMsg.RankNum" :placeholder="$t('system.table_rankNum')" class="w210"
             @keyup.native="checkInteger(addMsg,'RankNum')"></el-input>
         </el-form-item>
+        <el-form-item label="所属时区">
+          <el-input type="text" v-model="addMsg.UTCZone" class="w210"></el-input>
+        </el-form-item>
         <el-form-item :label="$t('objFill.jingdu')">
           <el-input type="text" v-model="addMsg.Lng" class="w210"></el-input>
         </el-form-item>
@@ -209,6 +215,7 @@
           //纬
           Lat: '',
           TrafficType: 1, //机场
+          UTCZone: 0, //时区
         },
         DataList: [],
         BranchGetList: [],
@@ -231,44 +238,32 @@
             required: true,
             message: this.$t('visaT.qxzguojia'),
             trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           Province_id: [{
             required: true,
             message: this.$t('ground.qxzs'),
             trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           City_id: [{
             required: true,
             message: this.$t('objFill.qxzshi'),
             trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           District_id: [{
             required: true,
             message: this.$t('objFill.qxzquxian'),
             trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           Name: [{
             required: true,
             message: this.$t('system.ph_name'),
             trigger: 'blur'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           En_name: [{
             required: true,
             message: this.$t('system.ph_ENname'),
             trigger: 'blur'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+          }],
           IATA: [{
               required: true,
               message: this.$t('system.ph_IATA'),
@@ -297,6 +292,29 @@
       }
     },
     methods: {
+      getAirportConfig() {
+        var pMsg = {
+          IATA: this.addMsg.IATA,
+        };
+        if (pMsg.IATA && pMsg.IATA != '') {
+          this.apipost('airport_post_GetAirportConfig', pMsg, res => {
+            if (res.data.resultCode == 1) {
+              var tempData = res.data.data;
+              if (tempData) {
+                if (tempData.UTCZone) {
+                  this.addMsg.UTCZone = tempData.UTCZone;
+                }
+                if (tempData.Lat) {
+                  this.addMsg.Lat = tempData.Lat;
+                }
+                if (tempData.Lng) {
+                  this.addMsg.Lng = tempData.Lng;
+                }
+              }
+            }
+          }, err => {})
+        }
+      },
       getList() { //获取列表
         this.loading = true;
         if (this.msg.Country_id == '') {
@@ -507,6 +525,7 @@
         this.addMsg.Lng = '';
         this.addMsg.Lat = '';
         this.addMsg.TrafficType = 1;
+        this.addMsg.UTCZone = 0;
       },
       resetPageIndex() { //查询初始化页码
         this.msg.pageIndex = 1;

src/router/config.js

@@ -5321,7 +5321,7 @@ export default {
               name: 'leaderSelf',
               component: resolve => require(['@/components/LeaderManagement/leaderSelf'], resolve),
               meta: {
-                title: '新报价单' //OP今日订单
+                title: '领队导游基础资料' //OP今日订单
               }
             },
             {