页面修改

src/components/LeaderManagement/leaderArrangement.vue

@@ -131,14 +131,14 @@
     border-radius: 50%;
   }
 
-  .leaderArrangement .Assied > div:first-child {
+  .leaderArrangement .Assied>div:first-child {
     margin-left: 20px;
     text-align: center;
   }
 
   .leaderArrangement .AssList {
     float: left;
-    margin:5px 10px 0 0;
+    margin: 5px 10px 0 0;
     height: 80px;
     line-height: 1;
     text-align: center;
@@ -323,6 +323,7 @@
   .disNone {
     color: #cccccc;
   }
+
 </style>
 <template>
   <div class="flexOne leaderArrangement">
@@ -331,7 +332,8 @@
         <li>
           <span>
             <em>国家</em>
-            <el-select v-model="CountryIDStr" clearable class="w150" filterable :placeholder="$t('hotel.hotel_country')">
+            <el-select v-model="CountryIDStr" clearable class="w150" filterable
+              :placeholder="$t('hotel.hotel_country')">
               <el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
               <el-option v-for='item in countryList' :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
@@ -383,17 +385,19 @@
     <div v-loading="loading" class="commonContent">
       <div class="topList clearfix">
         <span>{{$t('leader.leader_noTask')}}</span>
-        <span class="noWork">可拖拽对（导游）进行设置 <el-input placeholder="请输入姓名" v-model="noTaskLeaderMsg.LeaderName" maxlength="50"
-            @keyup.native.enter="noTaskLeaderMsg.pageIndex=1,getNoTaskLeader()" class="w150"> </el-input> <input type='button'
-            value='查询' class="hollowFixedBtn" @click="noTaskLeaderMsg.pageIndex=1,getNoTaskLeader()" /> </span>
+        <span class="noWork">可拖拽对（导游）进行设置 <el-input placeholder="请输入姓名" v-model="noTaskLeaderMsg.LeaderName"
+            maxlength="50" @keyup.native.enter="noTaskLeaderMsg.pageIndex=1,getNoTaskLeader()" class="w150"> </el-input>
+          <input type='button' value='查询' class="hollowFixedBtn"
+            @click="noTaskLeaderMsg.pageIndex=1,getNoTaskLeader()" /> </span>
         <div class="leaderList clearfix">
           <div class="leftArrow" v-if="this.noTaskLeaderMsg.PageCount>2">
-            <i class="iconfont icon-previewleft" :class="{'disNone':this.noTaskLeaderMsg.pageIndex==1}" @click="LeaderMove(-1)"></i>
+            <i class="iconfont icon-previewleft" :class="{'disNone':this.noTaskLeaderMsg.pageIndex==1}"
+              @click="LeaderMove(-1)"></i>
           </div>
           <div class="fmain">
             <ul class="uu clearfix">
-              <li class="Llist" v-for="leader in LeaderList" draggable="true" @dragstart="drag($event,leader.LeaderId,leader.Type)"
-                :key="leader.subCode">
+              <li class="Llist" v-for="leader in LeaderList" draggable="true"
+                @dragstart="drag($event,leader.LeaderId,leader.Type)" :key="leader.subCode">
                 <div class="headerImg">
                   <img v-if="!leader.EmPhoto" src="../../assets/img/default_head_img.jpg">
                   <img v-else :src="imgBeforeFile+leader.EmPhoto" :onerror='defaultImg' />
@@ -403,25 +407,28 @@
             </ul>
           </div>
           <div class="rightArrow" v-if="this.noTaskLeaderMsg.PageCount>2">
-            <i class="iconfont icon-arrow-right" :class="{'disNone':this.noTaskLeaderMsg.pageIndex==this.noTaskLeaderMsg.PageCount}"
+            <i class="iconfont icon-arrow-right"
+              :class="{'disNone':this.noTaskLeaderMsg.pageIndex==this.noTaskLeaderMsg.PageCount}"
               @click="LeaderMove(1)"></i>
           </div>
         </div>
       </div>
       <ul class="_ol_color clearfix">
-        <li><span class="_red _c2"></span><span class="_red_text">{{$t('Airticket.Air_redType')}}：</span>{{$t('leader.leader_noAssigned')}}
+        <li><span class="_red _c2"></span><span
+            class="_red_text">{{$t('Airticket.Air_redType')}}：</span>{{$t('leader.leader_noAssigned')}}
         </li>
-        <li><span class="_green  _cl"></span><span class="_green_text">{{$t('Airticket.Air_greenType')}}：</span>{{$t('leader.leader_hasAssigned')}}
+        <li><span class="_green  _cl"></span><span
+            class="_green_text">{{$t('Airticket.Air_greenType')}}：</span>{{$t('leader.leader_hasAssigned')}}
         </li>
       </ul>
-      <div class="leaderInfo afterfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)"
-        @dragover="allowDrop($event)">
+      <div class="leaderInfo afterfix" v-for="item in dataList" :key="item.subCode"
+        @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)">
         <el-row :gutter="10">
           <el-col :span="4">
             <div class="_oll_line" v-if="item.LeaderType==0"></div>
             <div class="_oll_line _o_green" v-if="item.LeaderType>0"></div>
             <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
-              <div class="Lleader" @click="getJourney(item.TCID,item.Title)">{{item.Title}}</div>
+              <div class="Lleader" @click="getJourney(0,item.TCID,item.Title)">{{item.Title}}</div>
             </el-tooltip>
           </el-col>
           <el-col :span="2">
@@ -431,15 +438,18 @@
             <div class="LtimeList"><span class="goType">{{$t('leader.leader_back')}}</span>{{item.EndDate}}</div>
           </el-col>
           <el-col :span="2">
-            <div class="expectDay"><i class="iconfont icon-img-rili"></i>行程天数<span class="Arrange_Y1">{{item.DayNum}}</span>{{$t('hotel.hotel_day')}}
+            <div class="expectDay"><i class="iconfont icon-img-rili"></i>行程天数<span
+                class="Arrange_Y1">{{item.DayNum}}</span>{{$t('hotel.hotel_day')}}
             </div>
           </el-col>
           <el-col :span="3">
-            <div class="expectDay">{{$t('leader.leader_planNum')}}<span class="Arrange_Y2">{{item.TotalNumber}}</span>{{$t('hotel.hotel_people')}}
+            <div class="expectDay">{{$t('leader.leader_planNum')}}<span
+                class="Arrange_Y2">{{item.TotalNumber}}</span>{{$t('hotel.hotel_people')}}
             </div>
           </el-col>
           <el-col :span="2">
-            <div class="sxDay">{{$t('leader.leader_registraNum')}}<span class="Arrange_Y1">{{item.FinishedNumber}}</span>{{$t('hotel.hotel_people')}}
+            <div class="sxDay">{{$t('leader.leader_registraNum')}}<span
+                class="Arrange_Y1">{{item.FinishedNumber}}</span>{{$t('hotel.hotel_people')}}
             </div>
           </el-col>
           <el-col :span="2">
@@ -464,7 +474,8 @@
                 </div>
                 <div style="white-space:nowrap;">{{item.GuideName}}/导游</div>
                 <div style="white-space:nowrap;margin:5px 0;">手机号：{{item.GuideMobilePhone}}</div>
-                <div style="white-space:nowrap;" v-if="item.SpareTel!=null&&item.SpareTel!=''">境外号：{{item.SpareTel}}</div>
+                <div style="white-space:nowrap;" v-if="item.SpareTel!=null&&item.SpareTel!=''">境外号：{{item.SpareTel}}
+                </div>
               </div>
             </div>
           </el-col>
@@ -475,8 +486,8 @@
         </el-row>
       </div>
     </div>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-      :page-size="msg.pageSize" :total="total">
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
       <commonTeamInfo ref="comTeam"></commonTeamInfo>
@@ -527,7 +538,6 @@
         defaultImg: 'this.src="' + require("../../assets/img/default_head_img.jpg") + '"',
         imgBeforeFile: this.domainManager().ViittoFileUrl,
         outerVisible: false,
-        leaderAndGuid: "",
         TeamSaleStateList: "",
         loading: false,
         total: 0,
@@ -654,26 +664,16 @@
           err => {}
         );
       },
-      submitForm(addMsg) {
-        //提交创建、修改表单
-        let that = this;
-        that.$refs[addMsg].validate(valid => {
-          if (valid) {
-            that.setLeaderNeed();
-          } else {
-            return false;
-          }
-        });
-      },
+
       resetForm(formName) {
         this.$refs[formName].resetFields();
       },
-      getJourney(id, title) {
+      getJourney(id,TCID, title) {
         //根据ID 获取行程内容
         var that = this;
         this.tripTitle = title;
         this.$nextTick(() => {
-          that.$refs.comTeam.GetTrip(id);
+          that.$refs.comTeam.GetTrip(id,TCID);
         });
         that.outerVisible = true;
       },
@@ -702,6 +702,9 @@
         if (this.addMsg.LeaderType === 2) {
           this.addMsg.LeaderId = this.dragId;
         }
+        if (this.addMsg.GuideId == "") {
+          this.addMsg.GuideId = "0";
+        }
         this.addMsg.TCID = TCID;
         this.addMsg.Id = Id;
         var that = this;
@@ -736,86 +739,33 @@
           err => {}
         );
       },
-      setLeaderNeed() {
-        if (this.addMsg.LeaderType == 2) {
-          this.addMsg.LeaderId = this.leaderAndGuid;
-          this.addMsg.GuideId = this.leaderAndGuid;
-        }
-        if (this.addMsg.GuideId == "") {
-          this.addMsg.GuideId = "0";
-        }
-        this.apipost(
-          "LeaderSchedule_post_Set",
-          this.addMsg,
-          res => {
-            if (res.data.resultCode == 1) {
-              this.getList();
-              this.Success('设置成功');
-              this.isShow = false;
-            } else {
-              this.$confirm("该领队档期冲突，是否确认继续设置?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning"
-                })
-                .then(() => {
-                  this.apipost("LeaderSchedule_post_Set", this.addMsg, res => {
-                    if (res.data.resultCode == 1) {
-                      this.Success('设置成功');
-                      this.getList();
-                    }
-                  });
-                })
-                .catch(() => {
-                  this.$message({
-                    type: "info",
-                    message: "已取消设置"
-                  });
-                });
-            }
-          },
-          err => {}
-        );
-      },
       //取消领队安排
       cancelLeader(ID) {
-        this.$confirm("确定取消设置?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
+        var that = this;
+        this.Confirm("确定取消设置??", function () {
           let msg = {
             ID: ID
           };
-            this.apipost("LeaderSchedule_Post_Remove", msg, res => {
+          that.apipost("LeaderSchedule_Post_Remove", msg, res => {
             if (res.data.resultCode == 1) {
-                this.Success('设置成功');
-                this.getList();
+              that.Success('取消成功');
+              that.getList();
             } else {
-                this.Error(res.data.message);
+              that.Error(res.data.message);
             }
           });
-          })
-          .catch(() => {
-            this.$message({
-              type: "info",
-              message: "已取消"
-            });
         });
       }
     },
-
     mounted() {
       this.msg.QTCID = this.$route.query.id;
-      if(this.msg.QTCID!=undefined){
-        this.msg.QStartDateStr='';
-        this.msg.QEndDateStr='';
+      if (this.msg.QTCID != undefined) {
+        this.msg.QStartDateStr = '';
+        this.msg.QEndDateStr = '';
       }
       this.getCountryList();
       this.GetTeamSaleStateList();
       this.getList();
     }
   };
-
 </script>
\ No newline at end of file

src/components/busManagement/busArrangement.vue

@@ -565,7 +565,7 @@ export default {
       var that = this;
       this.tripTitle = title;
       this.$nextTick(() => {
-        that.$refs.comTeam.GetTrip(id);
+        that.$refs.comTeam.GetTrip(0,id);
       });
       that.outerVisible = true;
     },