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

src/components/TravelContractDetail.vue

@@ -793,7 +793,7 @@
             <h3>第二十六条 争议的解决方式</h3>
             <p>本合同履行过程中发生争议，由双方协商解决，亦可向合同签订地的旅游质监执法机构、消费者协会、有关的调解组织等有关部门或者机构申请调解。协商或者调解不成的，按下列第<span>2</span>种方式解决：</p>
             <p>1.提交<span>{{dataList.arbitrationCommission}}</span>仲裁委员会仲裁；</p>
-            <p>2.依法向人民法院起诉。</p>
+            <p>2.依法向<span>{{dataList.court}}</span>人民法院起诉。</p>
             <h3>第二十七条 其他约定事项</h3>
             <p>未尽事宜，经旅游者和出境社双方协商一致，可以列入补充条款。（如合同空间不够，可以另附纸张，由双方签字或者盖章确认。）</p>
             <div class="userDiv">

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1052,13 +1052,16 @@
                     style="background:#67c23a; border-color:#67c23a">
                     {{$t('Operation.Op_advertising')}} {{item.AdvertCount}}
                   </el-button>
-
                   <template v-if="item.LineID==14||item.LineID==118">
                     <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">推送消息
                     </el-button>
-                    <el-button v-else @click.native='PushMessage(item)' type="primary"
-                      style="background:red !important;   ">已推送
+                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
+                      <el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
+                      </el-button>
+                    </el-tooltip>
+                    <el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
+                      style="background:#00C6FF; border-color:#00C6FF;">重新推送
                     </el-button>
                   </template>
                   <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
@@ -1660,19 +1663,24 @@
       },
       //推送消息
       PushMessage(item) {
+        this.queryCommonData.loading = true;
         var pMsg = {
           TCID: item.TCID
         };
-        this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => {
-            if (res.data.resultCode == 1) {
-              this.Success(res.data.message);
-              this.getControlList();
-            } else {
-              this.Error(res.data.message);
-            }
-          },
-          err => {}
-        );
+        var tipMessage = "推送消息";
+        var cmdStr = "travel_post_PushTravelPriceToQYWork"; //推送消息
+        if (item.IsPush == 1) {
+          cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
+          tipMessage = "【取消】推送";
+        }
+        this.apipost(cmdStr, pMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(tipMessage + '成功!');
+            this.getControlList();
+          } else {
+            this.Error(tipMessage + '失败!');
+          }
+        });
       },
       showDialog(ConfigId, OfferId) {
         this.dialog = {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -800,9 +800,19 @@
                   </el-dropdown>
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
                     style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
-                  <el-button v-if="item.LineID==14||item.LineID==118" @click.native='PushMessage(item)' type="primary"
-                    style="background:#00C6FF; border-color:#00C6FF;">推送消息
-                  </el-button>
+
+                  <template v-if="item.LineID==14||item.LineID==118">
+                    <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
+                      style="background:#00C6FF; border-color:#00C6FF;">推送消息
+                    </el-button>
+                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
+                      <el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
+                      </el-button>
+                    </el-tooltip>
+                    <el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
+                      style="background:#00C6FF; border-color:#00C6FF;">重新推送
+                    </el-button>
+                  </template>
                   <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
                     {{$t('Operation.Op_remark')}}</el-button>
                   <el-dropdown trigger="click">
@@ -1257,18 +1267,24 @@
       },
       //消息推送
       PushMessage(item) {
+        this.queryCommonData.loading = true;
         var pMsg = {
           TCID: item.TCID
         };
-        this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => {
-            if (res.data.resultCode == 1) {
-              this.Success(res.data.message);
-            } else {
-              this.Error(res.data.message);
-            }
-          },
-          err => {}
-        );
+        var tipMessage = "推送消息";
+        var cmdStr = "travel_post_PushTravelPriceToQYWork"; //推送消息
+        if (item.IsPush == 1) {
+          cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
+          tipMessage = "【取消】推送";
+        }
+        this.apipost(cmdStr, pMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(tipMessage + '成功!');
+            this.getControlList();
+          } else {
+            this.Error(tipMessage + '失败!');
+          }
+        });
       },
       showDialog(ConfigId, OfferId) {
         this.dialog = {

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -680,9 +680,18 @@
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
                     style="background:#67c23a; border-color:#67c23a;">广告&nbsp;{{item.AdvertCount}}
                   </el-button>
-                  <el-button v-if="item.LineID==14||item.LineID==118" @click.native='PushMessage(item)' type="primary"
-                    style="background:#00C6FF; border-color:#00C6FF;">推送消息
-                  </el-button>
+                  <template v-if="item.LineID==14||item.LineID==118">
+                    <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
+                      style="background:#00C6FF; border-color:#00C6FF;">推送消息
+                    </el-button>
+                    <el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
+                      <el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
+                      </el-button>
+                    </el-tooltip>
+                    <el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
+                      style="background:#00C6FF; border-color:#00C6FF;">重新推送
+                    </el-button>
+                  </template>
                   <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
                     {{$t('Operation.Op_remark')}}
                   </el-button>
@@ -1149,18 +1158,24 @@
       },
       //消息推送
       PushMessage(item) {
+        this.queryCommonData.loading = true;
         var pMsg = {
           TCID: item.TCID
         };
-        this.apipost("travel_post_PushTravelPriceToQYWork", pMsg, res => {
-            if (res.data.resultCode == 1) {
-              this.Success(res.data.message);
-            } else {
-              this.Error(res.data.message);
-            }
-          },
-          err => {}
-        );
+        var tipMessage = "推送消息";
+        var cmdStr = "travel_post_PushTravelPriceToQYWork"; //推送消息
+        if (item.IsPush == 1) {
+          cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
+          tipMessage = "【取消】推送";
+        }
+        this.apipost(cmdStr, pMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(tipMessage + '成功!');
+            this.getControlList();
+          } else {
+            this.Error(tipMessage + '失败!');
+          }
+        });
       },
       //显示报价单弹窗
       showDialog(ConfigId, OfferId) {
@@ -1290,7 +1305,6 @@
           err => {}
         )
       },
-
       //新获取列表数据
       getControlList() {
         var msg = JSON.parse(JSON.stringify(this.queryMsg))

src/components/busManagement/busHandBook.vue

@@ -109,7 +109,7 @@
           <el-date-picker v-model="subItem.UseDate" class="w135" value-format="yyyy-MM-dd" type="date"></el-date-picker>
         </td>
         <td>
-          <el-input type="text" v-model="subItem.BusType" />
+          <el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.BusType" />
         </td>
         <td>
           <el-input type="text" v-model="subItem.FlightNum" />

src/components/clientConfirm.vue

@@ -1165,11 +1165,11 @@
                 <el-row style="padding:6px 0">
                   <el-col :span="12">
                     <el-col :span="8" style="text-align:right">证件类型：</el-col>
-                    <el-col :span="16" style="text-align:left">{{item.passportNo}}</el-col>
+                    <el-col :span="16" style="text-align:left">护照</el-col>
                   </el-col>
                   <el-col :span="12">
                     <el-col :span="8" style="text-align:right">证件号码</el-col>
-                    <el-col :span="16" style="text-align:left">{{item.idCard}}</el-col>
+                    <el-col :span="16" style="text-align:left">{{item.passportNo}}</el-col>
                   </el-col>
                 </el-row>
                 <el-row>

src/components/index.vue

@@ -1967,9 +1967,14 @@
             (localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
           )) {
           this.GetChangeThePrice()
-          this.ExamineThePriceMsg.ApplyType=2;
+        }
+        if ((!localStorage.getItem("ExamineThePriceDataTime") ||
+            (localStorage.getItem("ExamineThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
+          )) {
+            this.ExamineThePriceMsg.ApplyType=2;
           this.GetExaminePriceOrderPageList()
         }
+        
       }
     },
     created() {