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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -33,11 +33,11 @@
           <th width="200">{{$t('restaurant.res_resName')}}</th>
           <th width="150">{{$t('ground.xiugaict')}}</th>
           <th width="80">{{$t('ground.leibie')}}</th>
-          <th width="200" style="display:none;">{{$t('ground.cayinlexing')}}</th>
+ 
           <th width="70">{{$t('ground.zongrenshu')}}</th>
           <th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
           <th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th>
-          <th width="90">{{$t('Operation.Op_price')}}</th>
+          <th width="120">{{$t('Operation.Op_price')}}</th>
           <th width="90">{{$t('ground.mianrenshu')}}</th>
           <th width="80">{{$t('ground.jinexiaoji')}}</th>
           <th width="90">{{$t('hotel.hotel_commission')}}</th>
@@ -123,7 +123,7 @@
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
-                  <el-input class='w135' v-model='childItem.UsePeopleNum' @input='calculationPrice(subItem)'
+                  <el-input class='w50' v-model='childItem.UsePeopleNum' @input='calculationPrice(subItem)'
                     @keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
                 </template>
                 <template v-else>
@@ -132,20 +132,20 @@
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
-                  <el-input class='w135' v-model='childItem.PeoplePrice' @input='calculationPrice(subItem)'
+                  <el-input class='w110' v-model='childItem.PeoplePrice' @input='calculationPrice(subItem)'
                     @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
                 </template>
                 <template v-else>
                   <span class="spanlink" v-if='childItem.PeoplePrice==0'
                     @click="goUrl('RestaurantPackage',subItem,'套餐查询')">{{$t('leader.leader_Set')}}</span>
                   <template v-else>
-                    <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
+                    <el-input class='w110 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
                       @keyup.native="checkPrice(childItem,'PeoplePrice')"></el-input>
                   </template>
                 </template>
               </td>
               <td>
-                <el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
+                <el-input class='w110 tcenter' @input='calculationPrice(subItem)' maxlength='2'
                   v-model='childItem.Discount' @keyup.native="checkPrice(childItem,'Discount')"></el-input>
               </td>
               <td>
@@ -236,12 +236,11 @@
                     <td style="text-align:left;">
                       <el-date-picker class='w135'
                         v-model="subItem.SureTime"
-                        type="datetime"
+                        type="date"
                         placeholder="选择确认时间">
                        </el-date-picker>
                     </td>
                   </tr>
-
                   <tr>
                     <td width="60" style="text-align:right;">
                       预约时间：
@@ -251,7 +250,6 @@
                     </td>
                   </tr>
                 </template>
-                  
                   <tr v-show="subItem.PayStyle==6">
                     <td width="60" style="text-align:right;">
                       {{$t('ground.fukuanth')}}:

src/components/dmc/manager/dmcTotalTable.vue

@@ -286,14 +286,16 @@
                   <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
                     {{$t('ground.peizhilingdui')}}</p>
                   <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
-                    {{item.LeaderName}}{{item.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
+                    {{item.LeaderName}}{{item.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}{{getLeaderTypeStr(item.LeaderGuidClass)}}
+                  </p>
                 </div>
               </td>
               <td>
                 <div class="link">
                   <p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
                     {{$t('ground.daituananpai')}}</p>
-                  <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}{{item.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</p>
+                  <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
+                    {{item.GuideName}}{{item.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</p>
                 </div>
               </td>
               <td>
@@ -373,10 +375,9 @@
                 </div>
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
                   @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a>
-                  <a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息"
+                <a style="text-decoration:underline;cursor:pointer;display:none;" title="点击下载新餐配信息"
                   @click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
               </td>
-
               <td>
                 <div class="fz16 fbold linkspan">
                   <span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')"
@@ -787,7 +788,7 @@
     methods: {
 
       //推送消息
-      PushMessage(obj,item) {
+      PushMessage(obj, item) {
         var pMsg = {
           TCID: item.TCID
         };
@@ -799,7 +800,7 @@
           tipMessage = "取消印象车行订单";
         }
         let that = this;
-          that.$confirm('是否确认'+tipMessage, this.$t('tips.tips'), {
+        that.$confirm('是否确认' + tipMessage, this.$t('tips.tips'), {
           confirmButtonText: this.$t('pub.sureBtn'),
           cancelButtonText: this.$t('pub.cancelBtn'),
           type: 'warning'
@@ -818,22 +819,21 @@
         });
       },
 
-      TipsContent(item){
-        let resultStr='';
-        let dateStr='';
+      TipsContent(item) {
+        let resultStr = '';
+        let dateStr = '';
 
-          if(item.CarIsPush==1){
-            resultStr+= '点击取消印象车行订单'+"<br/>"+''
-            dateStr ='推送时间：';
-          }
-          else if(item.CarIsPush==2||item.CarIsPush==0){
-            resultStr+= '同步车信息到印象车行'+"<br/>"
-            if(item.CarIsPush==2){
-              dateStr ='取消时间：';
+        if (item.CarIsPush == 1) {
+          resultStr += '点击取消印象车行订单' + "<br/>" + ''
+          dateStr = '推送时间：';
+        } else if (item.CarIsPush == 2 || item.CarIsPush == 0) {
+          resultStr += '同步车信息到印象车行' + "<br/>"
+          if (item.CarIsPush == 2) {
+            dateStr = '取消时间：';
           }
         }
-          if(item.CarPushDateStr){
-            resultStr+= dateStr+ item.CarPushDateStr+"<br/>"
+        if (item.CarPushDateStr) {
+          resultStr += dateStr + item.CarPushDateStr + "<br/>"
         }
         return resultStr;
       },
@@ -1461,9 +1461,9 @@
       if (userInfo.RB_Group_id == this.QjGroupId()) {
         // this.msg.LineId = 14;
       }
-      if(this.$route.query.CombinationNum){
+      if (this.$route.query.CombinationNum) {
         this.msg.CombinationNum = this.$route.query.CombinationNum;
-        this.msg.StartDate='';
+        this.msg.StartDate = '';
       }
 
       this.getLineList();