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

src/assets/utils/tripUtils.js

@@ -381,7 +381,6 @@ var tripUtils = {
       CityId: "0",
       CityName: "",
       ScenicImg: "",
-      ImaArray: [],
       Rank: 0,
       //景点名称
       CouponsName: "",

src/components/FinancialModule/addFinancialDocuments.vue

@@ -521,7 +521,7 @@
                     </div>
                     <div class="_submit">
                         <div class="chosenNextBox">
-                            <div v-if='resultCode==11019'>
+                            <div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
                                 <label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
                                 <el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
                                     <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
@@ -652,6 +652,7 @@ export default {
             timer:'',
             leaderType:1,
             resultCode:null,
+            EmployeeId:0
         }
     },methods:{
         deleteRow(i,obj){
@@ -1254,6 +1255,7 @@ export default {
     },mounted(){
         let userInfo = this.getLocalStorage();
         this.department = userInfo.DepartName;
+        this.EmployeeId=userInfo.EmployeeId;
         this.emplyeeName=userInfo.emName;
         this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;

src/components/LeaderManagement/leaderManagement.vue

@@ -289,7 +289,7 @@
         </li>
         <li>
           <span>
-            <em>电话</em>
+            <em>境外电话</em>
             <el-input v-model="msg.SpareTel" clearable></el-input>
           </span>
         </li> 
@@ -505,7 +505,7 @@
         <el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input">
           <el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input>
         </el-form-item>
-        <el-form-item label="电话" prop="SpareTel" class="other_input">
+        <el-form-item label="境外电话" prop="SpareTel" class="other_input">
           <el-input type="text" v-model="addMsg.SpareTel" :placeholder="$t('admin.admin_SpareTel')" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.table_Passport')" v-if="addMsg.LeaderGuidClass==0" prop="Passport" class="other_input">

src/components/SalesModule/SalesFinancialDetail.vue

@@ -367,7 +367,7 @@ export default {
       this.loading = true;
       this.apipost('Financial_post_GetALLPageList', this.msg, res=>{
         if (res.data.resultCode == 1) {
-          let data = res.data.data.pageData;
+          let data = res.data.data.pageData.list;
           if (type===1) {
             this.allMoney = 0;
             this.shiMoney = 0;

src/components/SalesModule/groupTourOrder.vue

@@ -1529,7 +1529,7 @@
                            icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
-                <el-button v-if="item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
+                <el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
                            style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
                            @click='getRemarks(item)'></el-button>
               </el-tooltip>
@@ -2382,6 +2382,7 @@
         this.showID = data
       },
       getRemarks (obj) {
+        console.log(obj,'ssss');
         this.isShowLayerRemarks = true
         this.isShowLayer = false
         this.$refs['addMsg'].resetFields()

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -625,7 +625,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)" style="display:none">结团
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">结团
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)" style="display:none">正常
                       </el-dropdown-item>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -299,16 +299,31 @@
         this.FeatureData.IsSave = true;
         this.submitText = "保存中";
         //团队配置
-        var basicData = this.PostConfig;
+        var basicData ={};
         basicData.PriceList = this.PostPrice;
         //配置编号
         basicData.ID = this.ConfigId;
+        basicData.LineId=this.PostConfig.LineId;
+        basicData.LineteamId=this.PostConfig.LineteamId;
+        basicData.Title=this.PostConfig.Title;
+        basicData.OpRemark=this.PostConfig.OpRemark;
+        basicData.ProductRecommend=this.PostConfig.ProductRecommend;
+        basicData.VideoStr=this.PostConfig.VideoStr;
+        basicData.PDFAlias=this.PostConfig.PDFAlias;
+        basicData.ImgCover=this.PostConfig.ImgCover;
+        basicData.PriceIsDirect=this.PostConfig.PriceIsDirect;
+        basicData.IsDirect=this.PostConfig.IsDirect;
+        basicData.RemoveChild=this.PostConfig.RemoveChild;
 
+        basicData.TeamType=this.PostConfig.TeamType;
 
         basicData.DayNum = this.PostDaysTrip.DayNum;
         basicData.NightNum = this.PostDaysTrip.NightNum;
         basicData.StartCityId = this.PostDaysTrip.StartCityId;
         basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
+        basicData.SelfpayingList=this.PostConfig.SelfpayingList;
+        basicData.ShopList=this.PostConfig.ShopList;
+
         basicData.DinnerList = this.PostDaysTrip.DinnerList;
         basicData.FreedomList = this.PostDaysTrip.FreedomList;
         basicData.HotelList = this.PostDaysTrip.HotelList;
@@ -359,7 +374,6 @@
         } else {
           basicData.TeamType = 0;
         }
- 
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,