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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1448,8 +1448,8 @@
       <div class="RL_rightBtn" v-if="isShow===true">
        <!--item.TCID,item.OutBranchId-->
         <input type="button" class="normalBtn" @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)"  value="团报" />
+ 
         <input type="button" class="normalBtn" @click="getOrderInfo()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'"  />
-        <input type="button" class="normalBtn" @click="SetOutNotice()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" style="display:none;" />
         <input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0" class="normalBtn"
           value="重选领队" />
         <input type="button" class="normalBtn" v-else @click="showSetLeader=true,isShowLayerRemarks = false,isShowLayer = false"
@@ -2289,7 +2289,7 @@
           </tbody>
         </table>
         <div slot="footer" class="dialog-footer">
-          <input type="button" class="normalBtn" @click="SetOutNotice()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
+          <input type="button" class="normalBtn" @click="SetOutNotice()" :value="SetNoticeMsg.OutNotice==1?'暂定':'确定'" />
           <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
         </div>
       </el-dialog>
@@ -3903,7 +3903,6 @@ submitYSZEForm(){
           msg,
           res => {
             this.loading = false;
-            console.log("数据列表",res)
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;
               this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
@@ -3945,7 +3944,6 @@ submitYSZEForm(){
               this.ConfigData.Config = res.data.data.config;
               this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
               this.ConfigData.Leader = res.data.data.leader;
-              console.log(this.ConfigData,'ConfigData');
             }
           }
         );
@@ -4205,39 +4203,31 @@ submitYSZEForm(){
         }
       },
       //出团通知书
-      getOrderInfo() {
-        this.$confirm("是否确认出团通知书?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-        .then(() => {
-            this.getFlightInfo();
-            this.getCombinTeam();
-        })
-        .catch(() => {
-          this.$message.info("已取消！");
-        });
+      getOrderInfo() { 
+         this.getFlightInfo();
+         this.getCombinTeam();
       },
       SetOutNotice(){
-          if (this.SetNoticeMsg.OutNotice == 0) {
-            this.SetNoticeMsg.OutNotice = 1;
-          } else if (this.SetNoticeMsg.OutNotice == 1) {
-            this.SetNoticeMsg.OutNotice = 0;
-          }
-          this.apipost('travel_post_SetOutNotice', this.SetNoticeMsg, res => {
-              if (res.data.resultCode === 1) {
-                  this.getList();
-                  this.getConfig();
-                  this.Success(res.data.message);
-                  this.outerVisible=false;
-                } else {
-                  this.Error(res.data.message);
-                }
-              }, err => {
-
-              })
-      },
+        var that=this;
+        this.Confirm("是否【"+(that.SetNoticeMsg.OutNotice==1?"暂定":"确定")+"】出团通知书?",function(){
+             if (that.SetNoticeMsg.OutNotice == 0) {
+                that.SetNoticeMsg.OutNotice = 1;
+              } else if (that.SetNoticeMsg.OutNotice == 1) {
+                that.SetNoticeMsg.OutNotice = 0;
+              }
+            that.apipost('travel_post_SetOutNotice', that.SetNoticeMsg, res => {
+                if (res.data.resultCode === 1) {
+                    that.getList();
+                    that.getConfig();
+                    that.Success(res.data.message);
+                    that.outerVisible=false;
+                  } else {
+                    that.Error(res.data.message);
+                  }
+                }, err => {
+                })
+        });
+     },
       //关闭修改业务员
       closeSalseDiv(){
         this.showChangeSales=false;
@@ -4306,4 +4296,4 @@ submitYSZEForm(){
     }
   };
 
-</script>
+</script>
\ No newline at end of file