单地接儿童不占床

src/components/SalesModule/groupTourOrder.vue

@@ -869,7 +869,7 @@
           <el-col :span="4">
             <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
               本团不支持儿童出游!</p>
-            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
+            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum">
               <el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
             </el-form-item>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1296,7 +1296,7 @@
           <el-col :span="4">
             <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
               本团不支持儿童出游!</p>
-            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" v-show="addMsg.GroupType !== '4'">
+            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床">
               <el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
             </el-form-item>
@@ -4061,8 +4061,8 @@
               (Number(this.stratPrice) + Number(this.returnPrice));
             let dandijie
             if (this.addMsg.GroupType == 4) {
-              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
-
+              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
 
@@ -4120,7 +4120,8 @@
               (Number(this.stratPrice) + Number(this.returnPrice));
             let dandijie
             if (this.addMsg.GroupType == 4) {
-              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
+              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
 

src/components/SalesModule/productQuery.vue

@@ -278,6 +278,11 @@
         </el-row>
         <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
         <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
+              <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
               <el-input v-model='addMsg.ManNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ManNum')"
@@ -286,8 +291,8 @@
           </el-col>
           <el-col :span="4">
             <p v-if='addObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">本团不支持儿童出游!</p>
-            <el-form-item v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" label="儿童不占床" prop="ChirdNoNeedBedNum">
-              <el-input v-model='addMsg.ChirdNoNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
+            <el-form-item v-if='addObj.IsSupportChildren==1'  label="儿童不占床" prop="ChirdNoNeedBedNum">
+              <el-input v-model='addMsg.ChirdNoNeedBedNum'  @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童不占床");'></el-input>
             </el-form-item>
           </el-col>
@@ -308,12 +313,7 @@
               <el-input v-model='addMsg.OldPeopleNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("OldPeopleNum","老人人数");'></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
-              <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
-            </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
         <el-row :gutter="20">
           <el-col :span="4">
@@ -1423,6 +1423,11 @@
         let _this = this;
         let newRemark = '';
         _this.addMsg.Remarks = '';
+        if (this.addMsg.GroupType == 4) {
+          newRemark = _this.addMsg.Remarks + _this.otherRemark;
+        } else{
+          newRemark = _this.addMsg.Remarks;
+        }
         newRemark = _this.addMsg.Remarks + _this.otherRemark;
         Object.keys(_this.remarkMsg).forEach(function (key) {
           newRemark = newRemark + _this.remarkMsg[key];
@@ -1749,7 +1754,8 @@
             (Number(this.stratPrice) + Number(this.returnPrice))
           let dandijie
           if(this.addMsg.GroupType == 4){
-            dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum)
+            dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
           }else {
              dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
           }
@@ -1773,14 +1779,15 @@
             (Number(this.stratPrice) + Number(this.returnPrice))
           let dandijie
           if(this.addMsg.GroupType == 4){
-             dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum)
+            dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
+            console.log(dandijie,this.addObj.ChildNeedPrice,this.addObj.ChildNoNeedPrice)
           }else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum)
           }
           this.addMsg.PreferPrice = dandijie + lianyun + chengren + ertong + yinger + laoren + zafeiqianzhen + danfang +
             ertongbed - this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(
               this.addMsg.OldPeopleNum));
-
         }
         this.getTicheng();
         if (!t) {
@@ -1980,12 +1987,12 @@
         this.getScenicRefund(obj.TCID);
         this.getPlatformAccount(obj.PlatformAccountTypeId);
         this.clearMsg()
-        let str = ''
-        if (obj.OtherPrice > 0) {
-          str += '杂费' + obj.OtherPrice + '/人;'
-        }
-        this.addMsg.Remarks = str
-        this.otherRemark = str;
+        // let str = ''
+        // if (obj.OtherPrice > 0 ) {
+        //   str += '杂费' + obj.OtherPrice + '/人;'
+        // }
+        // this.addMsg.Remarks = str
+        // this.otherRemark = str;
         this.SingleDMCPrice = obj.SingleDMCPrice;
         this.SingleDMCPricex = obj.SingleDMCPrice;
       },

src/components/SalesModule/productQueryOne.vue

@@ -283,8 +283,8 @@
               <el-input v-model='addMsg.ChirdNoNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童不占床");'></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
+          </el-col> -->
+          <!-- <el-col :span="4" v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'">
             <el-form-item label="儿童占床" prop="ChirdNeedBedNum">
               <el-input v-model='addMsg.ChirdNeedBedNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNeedBedNum","儿童占床");'></el-input>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1250,8 +1250,7 @@
           <el-col :span="4">
             <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
               本团不支持儿童出游!</p>
-            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum"
-              v-show="addMsg.GroupType !== '4'">
+            <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" >
               <el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
                 @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
             </el-form-item>
@@ -4014,7 +4013,8 @@
               (Number(this.stratPrice) + Number(this.returnPrice));
             let dandijie
             if (this.addMsg.GroupType == 4) {
-              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
+              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             }
@@ -4074,7 +4074,8 @@
               (Number(this.stratPrice) + Number(this.returnPrice));
             let dandijie
             if (this.addMsg.GroupType == 4) {
-              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
+              dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum) - this.addObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNoNeedBedNum))
+            ertong = 0
             } else {
               dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
             }

src/components/systemManagement/AccountType.vue

@@ -112,7 +112,7 @@
                         <p class="_t"><span>{{$t('fnc.xnleixing')}}</span><span v-if="item.IsVirtual==0">{{$t('fnc.fou')}}</span><span v-if="item.IsVirtual==1">{{$t('fnc.yes')}}</span></p>
                         <p class="_btn">
                             <span class="_e" @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true">{{$t('pub.updateMsg')}}</span>
-                            <span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('sysytem.table_delete')}}</span>
+                            <span class="_d" @click="financeinfoRemove(item.ID,item.Name)">{{$t('system.table_delete')}}</span>
                         </p>
                     </div>
                 </div>
@@ -127,7 +127,7 @@
                     <th>{{$t('fnc.glzhangu')}}</th>
                     <th>{{$t('fnc.sfduigong')}}</th>
                     <th>{{$t('fnc.xnleixing')}}</th>
-                    <th>{{$t('sysytem.table_operation')}}</th>
+                    <th>{{$t('system.table_operation')}}</th>
                 </tr>
                 <tr v-for="(item,index) in tableInfo" :key="index">
                     <td>{{item.Name}}</td>
@@ -145,7 +145,7 @@
                             <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
                                 <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true"></el-button>
                             </el-tooltip>
-                            <el-tooltip class="item" effect="dark" :content="$t('sysytem.table_delete')" placement="top-start">
+                            <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
                                 <el-button type="danger" class="iconfont icon-img_delete_small" circle @click="financeinfoRemove(item.ID,item.Name)"></el-button>
                             </el-tooltip>
                         </el-row>