单地接

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -4362,7 +4362,8 @@
         this.addMsg.CommissionShareMoney = "0";
       },
       saveOrder() {
-        //验证人数和机位数
+        //验证人数和机位数 20190807 修改 如果是不是单地接才判断
+        if (this.addMsg.GroupType !== '4') {
           if (
             Number(this.addMsg.ManNum) +
             Number(this.addMsg.ChirdNum) +
@@ -4401,6 +4402,7 @@
             this.$message.warning("保险数量不能大于人数总和！");
             return;
           }
+        } 
 
         if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
           this.$message.warning("儿童占床不能大于儿童数！");

src/components/SalesModule/productQuery.vue

@@ -1936,7 +1936,9 @@
             return;
           }
         }
-        //验证人数和机位数
+        //验证人数和机位数 20190807 修改 如果是不是单地接才判断
+        alert(this.addMsg.GroupType)
+        if (this.addMsg.GroupType !== '4') {
           if ((Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) != Number(
             this.addMsg.YSeatNum) + Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)) {
             this.$message.warning('人数和机位数不相等！')
@@ -1953,7 +1955,7 @@
             this.$message.warning('保险数量不能大于人数总和！')
             return
           }
-
+        } 
         // if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
         //   <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
         // {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2795,6 +2795,22 @@
         </el-row>
       </el-form>
     </div>
+    <el-dialog custom-class='w350' title="追加团款" :visible.sync="zhuijiaShow" center>
+      <el-form label-width="110px">
+        <el-form-item label="追加团款金额：" class="w280">
+          <el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice')"
+            v-model="zhuijiaMsg.ChangePrice">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注：" class="w280">
+          <el-input placeholder="请输入" type="textarea" v-model="zhuijiaMsg.OP_Remarks"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="normalBtn" type="primary" @click="submitZhuiJiaTuanKuan">{{$t('pub.saveBtn')}}</button>
+        <button class="hollowFixedBtn" @click="zhuijiaShow=false">{{$t('pub.cancelBtn')}}</button>
+      </div>
+    </el-dialog>
     <a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
   </div>
 </template>
@@ -3226,6 +3242,17 @@
       commonShouSun: commonShouSun
     },
     methods: {
+       // 20190807 新增追加团款 提交按钮
+      submitZhuiJiaTuanKuan(){
+        this.apipost('sellorder_get_SetOrderOPTotalPrice',msg, res => {
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.date.message)
+            this.zhuijiaShow = false
+          } else {
+            this.$message.error(res.date.message)
+          }
+        }, err => {})
+      },
       // 20190807 新增追加团款
       ZhuiJiaTuanKuan(orderID){
         this.zhuijiaShow = true
@@ -4289,7 +4316,8 @@
         this.addMsg.CommissionShareMoney = "0";
       },
       saveOrder() {
-        //验证人数和机位数
+        //验证人数和机位数 20190807 修改 如果是不是单地接才判断
+        if (this.addMsg.GroupType !== '4') {
           if (
             Number(this.addMsg.ManNum) +
             Number(this.addMsg.ChirdNum) +
@@ -4328,6 +4356,7 @@
             this.$message.warning("保险数量不能大于人数总和！");
             return;
           }
+        } 
 
         if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
           this.$message.warning("儿童占床不能大于儿童数！");