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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -204,22 +204,22 @@
                             <el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'></el-option>
                             <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'></el-option>
                             <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43  && msg.TemplateId!==48'></el-option>
-                        
+                            <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12'></el-option>
                         
                         </el-select>
-                        <el-select  filterable  v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
+                        <el-select v-if="!showDisable"  filterable  v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
                             <el-option v-for='item in ClientTypeList'
                                 :label='item.Name'
                                 :value='item.ID'
                                 :key='item.ID'>
                             </el-option>
                         </el-select>
-                        <el-select  filterable v-if="msg.ClientType==7"  v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1">
+                        <el-select  filterable v-if="msg.ClientType==7&&!showDisable"  v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1">
                             <el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option>
                             <el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option>
                         </el-select>
-                        <template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3">
-                            <el-select v-if="msg.IsLeader==1"  filterable  v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
+                        <template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable">
+                            <el-select  v-if="msg.IsLeader==1"  filterable  v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
                                 <el-option v-for='item in ClientAccountList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -227,8 +227,8 @@
                                 </el-option>
                             </el-select>
                         </template>
-                        <template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3">
-                            <el-select filterable  v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
+                        <template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable">
+                            <el-select  filterable  v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
                                 <el-option v-for='item in ClientAccountList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -423,7 +423,7 @@
                 </table>
                 <div class="rb_top_row _r_mt10">
                     <template v-for="(item,index) in newAuditList">
-                        <p>
+                        <p :key="index">
                         {{item.AuditDescription}}:<span class="_r_name" ></span>
                         </p>
                     </template>
@@ -673,6 +673,7 @@ export default {
             EmployeeId:0,
             describeList:[],
             isFrompassenger:false,
+            showDisable:false,
         }
     },
     methods:{
@@ -682,13 +683,16 @@ export default {
             this.msg.detailList.splice(i,1);
             this.$forceUpdate();
         },
-        IsPublicChange(){
-            // if(this.msg.IsPublic==2||this.msg.IsPublic==3){
-            //     this.msg.AccountNumber = '';
-            // }
+        IsPublicChange(val){
+        this.showDisable=false;
+            
           this.msg.ClientType = '';
           this.msg.ClientID = '';
           this.msg.AccountNumber = '';
+          this.ClientAccountListS=[];
+          if(val==8){
+              this.showDisable=true;
+          }
         },
         jumpPage(path,obj,type){  //生成单据时连带信息跳转
             if(type==1){
@@ -864,7 +868,11 @@ export default {
                 if(this.msg.detailList.length<1)return this.$message.error(this.$t('rule.qtxzsyxfyshuoming'));
                 if(this.msg.PayDate==='') return this.$message.error(this.$t('rule.qxzyjfkshijian'));
             }
+            if(this.msg.IsPublic!=8){
             if(this.msg.ClientType==='')return this.$message.error(this.$t('rule.qxzfkduixiang'));
+            }else{
+                this.msg.ClientType=0;
+            }
             // IsPublic 2 现金 IsLeader 0 临时领队
             if(this.msg.IsPublic<2 && this.IsLeader===1){
               if(this.msg.ClientID==='') return this.$message.error(this.$t('rule.qxzkhmingcheng'));

src/components/Hotel/HotelProductManage2.vue

@@ -69,6 +69,7 @@
                           <th width="50">批次</th>
                           <th width="50">价格</th>
                           <th width="50">库存</th>
+                          <th width="50">剩余库存</th>
                         </tr>
                         <tr v-for="(childItem,childIndex) in subItem.data.SubList">
                           <td>
@@ -80,8 +81,12 @@
                           <td>
                             {{childItem.Inventory}}
                           </td>
+                          <td>
+                            {{childItem.RemainingInventory}}
+                          </td>
                         </tr>
                       </table>
+                      <input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
                     </div>
                   </template>
                 </div>
@@ -1601,7 +1606,7 @@
   .hotelProductManage2 .detailInfo {
     display: none;
     position: absolute;
-    left: -52px;
+    left: -70px;
     top: 50px;
     z-index: 999;
   }
@@ -1609,7 +1614,7 @@
   .hotelProductManage2 .triangle_border_up {
     width: 0;
     height: 0;
-    border-width: 0 86px 30px;
+    border-width: 0 103px 30px;
     border-style: solid;
     opacity: 0.75;
     border-color: transparent transparent rgba(233, 82, 82, 1);
@@ -1617,8 +1622,8 @@
   }
 
   .hotelProductManage2 .detailInfo .popContent {
-    width: 170px;
-    height: 80px;
+    width: 205px;
+    min-height: 80px;
     background-color: #e95252;
     text-align: left;
     color: #fff;
@@ -1641,5 +1646,7 @@
     margin: 10px 10px 0 0;
     text-align: right;
   }
-
+  .hotelProductManage2 .Htupbtn{
+    padding:0 10px;height:25px;margin:10px 0 0 75px;
+  }
 </style>

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -256,6 +256,12 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 0;
+              if (!insideItem.Discount) {
+                insideItem.Discount = 0;
+              }
+              if (!insideItem.DiscountPrice) {
+                insideItem.DiscountPrice = 0;
+              }
             })
           })
         }
@@ -263,6 +269,12 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 1;
+              if (!insideItem.Discount) {
+                insideItem.Discount = 0;
+              }
+              if (!insideItem.DiscountPrice) {
+                insideItem.DiscountPrice = 0;
+              }
             })
           })
         }

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -580,7 +580,14 @@
                     <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
                       @keyup.native="checkInteger(priceData,'ClearOrderHour')"
                       @blur="checkInteger(priceData,'ClearOrderHour')">
-                      <template slot="prepend">自动清位</template>
+                      <template slot="prepend">同行清位时间</template>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item >
+                    <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour"
+                      @keyup.native="checkInteger(priceData,'SaleClearOrderHour')"
+                      @blur="checkInteger(priceData,'SaleClearOrderHour')">
+                      <template slot="prepend">销售清位时间</template>
                     </el-input>
                   </el-form-item>
                   <span class="TP_Sendprepend">送签时间</span>
@@ -1095,6 +1102,8 @@
                 IsNew: false,
                 //选中的酒店数组
                 ChooseHotelArray: [],
+                //销售清位时间
+                SaleClearOrderHour:0,
               };
             }
             this.returnPriceList.push(objItem);

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -203,6 +203,10 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
+                 if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
+                }
               });
             })
           })
@@ -215,6 +219,10 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
+                if(!subItem.UsePeopleNum)
+                {
+                  subItem.UsePeopleNum=0;
+                }
               });
             })
           })