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

build/webpack.prod.conf.js

@@ -64,7 +64,6 @@ const webpackConfig = merge(baseWebpackConfig, {
       filename: config.build.index,
       template: 'index.html',
       inject: true,
-      hash: new Date().getTime(),
       minify: {
         removeComments: true,
         collapseWhitespace: true,

src/components/SalesModule/groupTourOrder.vue

@@ -750,7 +750,7 @@
 					 <input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')"/>
 				</span>
       </p>
-      <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
+      <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="客户类型" prop="CustomerType">
@@ -856,13 +856,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="成交单价" prop="Unit_Price">
+            <el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
                  <el-select v-model='addMsg.Unit_Price'
                 filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
                 <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
                 </el-option>
               </el-select>
               <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
+            </el-form-item>
+            <el-form-item label="成交单价" prop="Unit_Price" v-else>
+                <el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
+              </el-form-item>
+              <el-form-item label="高于本团单价">
+              <el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
             </el-form-item>
               <el-form-item>
                <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
@@ -1948,6 +1954,7 @@ import moment from "moment";
         customerId: '',
         createByInfo: '',
         isUpdateSharePeople: false,
+        HightUnitPrice: '2',
         starTime: '',
         endTime: '',
         stratPrice: '',
@@ -2934,7 +2941,19 @@ import moment from "moment";
                     (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
         this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
       },
-      getTotalPrice () {
+      getTotalPrice (t) {
+        if (t === 3) {
+          if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
+            this.$message.error('请输入正确的价格！')
+            this.addMsg.Unit_Price = this.addMsg.TC_Price
+            return
+          }
+          if (parseFloat(this.addMsg.Unit_Price) < this.addMsg.TC_Price) {
+            this.$message.error('成交单价必须大于等于本团单价！')
+            this.addMsg.Unit_Price = this.addMsg.TC_Price
+            return
+          }
+        }
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
         if (this.addObj.IsBirdDiscount == 1) {
           //早鸟优惠