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

src/components/Restaurant/demesticRestaurantPrice.vue

@@ -438,10 +438,10 @@
               <el-input type="text" class="w210" v-model="addMsg.CostPrice"
                         @keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
             </el-form-item>
-            <el-form-item label="原价" prop="SalesPrice">
+            <!-- <el-form-item label="原价" prop="SalesPrice">
               <el-input type="text" class="w210" v-model="addMsg.SalesPrice"
                         @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
-            </el-form-item>
+            </el-form-item> -->
           </div>
           <div class="resDiv">
             <el-form-item :label="$t('hotel.hotel_B2BPrice')" prop="B2BPrice">
@@ -472,14 +472,14 @@
                         @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
             </el-form-item>
           </div>
-          <div class="resDiv">
+          <!-- <div class="resDiv">
             <el-form-item :label="$t('hotel.hotel_Supplier')"   >
               <el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')">
                 <el-option :label='$t("hotel.hotel_inputholder")' :value='defaultSelect'></el-option>
                 <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-          </div>
+          </div> -->
           <div class="resDiv RemarkDiv">
             <el-form-item :label="$t('hotel.hotel_remark')" prop="Remark">
               <el-input type="textarea" class="w300" v-model="addMsg.Remark"></el-input>
@@ -547,11 +547,11 @@
           CostPrice: "",
           B2BPrice: "",
           B2CPrice: "",
-          SalesPrice: "",
+          SalesPrice: 0,
           DateList: "",
           Remark: "",
-          CurrencyId: 0,
-          CurrentRate: 0,
+          CurrencyId: 1,
+          CurrentRate: 1,
           StartDate: '',
           EndDate: ''
         },
@@ -618,7 +618,7 @@
           Date: this.nowDate
         };
         this.apipost(
-          "price_post_GetList",
+          "appletsprice_post_GetList",
           msg,
           res => {
             if (res.data.resultCode == 1) {
@@ -665,7 +665,7 @@
         );
       },
       hotelOfferSet() {
-        //提交酒店报价
+        //提交餐厅报价
         this.addMsg.DateList = this.DateArr;
         this.addMsg.DiningId = this.Did;
         this.addMsg.MealId = this.Mid;
@@ -676,7 +676,7 @@
         this.isDisable = true;
         this.comBtnText = this.$t('ground.zhengzaitijiao');
         this.apipost(
-          "price_post_Set",
+          "appletsprice_post_Set",
           this.addMsg,
           res => {
             this.isDisable = false;
@@ -710,7 +710,7 @@
               ID: ID
             };
             this.apipost(
-              "price_post_Remove",
+              "appletsprice_post_Remove",
               msg,
               res => {
                 if (res.data.resultCode == 1) {
@@ -739,7 +739,7 @@
         let formatDate = date.split("-");
         this.setCheck(index);
         this.updateDay = formatDate[formatDate.length - 1];
-        this.apipost("price_post_Get", msg, res => {
+        this.apipost("appletsprice_post_Get", msg, res => {
           if (res.data.resultCode == 1) {
             this.addMsg = res.data.data;
             this.DateArr = [date];

src/components/scenicSpot/domesticScenicSpotInfoManage.vue

@@ -1022,7 +1022,7 @@
               <div class="footabs">
                 <el-tag :key="tag" v-for="tag in Geographic" closable :disable-transitions="false"
                   @close="handleClose2(tag)">{{tag}}</el-tag>
-                <el-input class="input-new-tag" v-if="inputVisible2" v-model="inputValue2" maxlength="6"
+                <el-input class="input-new-tag" v-if="inputVisible2" v-model="inputValue2" 
                   ref="saveTagInput" size="small" @keyup.enter.native="handleInputConfirm2" @blur="handleInputConfirm2">
                 </el-input>
                 <el-button v-else class="button-new-tag" size="small" @click="showInput2">+ {{$t('pub.addBtn')}}

src/components/scenicSpot/domesticScenicSpotPackagePrice.vue

 <style>
-.lineMG .query_box {
+.domesticScenicSpotPackagePrice .query_box {
   font-size: 12px;
   padding: 29px 0;
   padding-right: 30px;
@@ -7,22 +7,22 @@
   justify-content: space-between;
 }
 
-.lineMG .el-switch.is-checked .el-switch__core {
+.domesticScenicSpotPackagePrice .el-switch.is-checked .el-switch__core {
   border-color: #4bca81;
   background-color: #4bca81;
 }
 
-.lineMG .addCompany {
+.domesticScenicSpotPackagePrice .addCompany {
   width: 440px;
   max-height: 600px;
 }
 
-.lineMG .addCompany .el-dialog__body {
+.domesticScenicSpotPackagePrice .addCompany .el-dialog__body {
   height: 486px;
   overflow: auto;
 }
 
-.lineMG .query_box div label {
+.domesticScenicSpotPackagePrice .query_box div label {
   display: inline-block;
   min-width: 80px;
   text-align: right;
@@ -51,7 +51,7 @@ input[type="number"] {
   color: #ffffff;
 }
 
-.lineMG .LMTable tr {
+.domesticScenicSpotPackagePrice .LMTable tr {
   height: 70px;
   text-align: center !important;
   background-color: #fff;
@@ -127,7 +127,7 @@ input[type="number"] {
   text-align: left;
 }
 
-.lineMG .LM_Back {
+.domesticScenicSpotPackagePrice .LM_Back {
   background-color: #f2f2f2;
 }
 
@@ -135,7 +135,7 @@ input[type="number"] {
   color: #e95252;
 }
 
-.lineMG .tbDiv {
+.domesticScenicSpotPackagePrice .tbDiv {
   overflow-y: auto;
 }
 
@@ -145,18 +145,18 @@ input[type="number"] {
   overflow-y: auto;
 }
 
-.lineMG .tbDiv::-webkit-scrollbar {
+.domesticScenicSpotPackagePrice .tbDiv::-webkit-scrollbar {
   width: 4px;
   height: 8px;
 }
 
-.lineMG .tbDiv::-webkit-scrollbar-track {
+.domesticScenicSpotPackagePrice .tbDiv::-webkit-scrollbar-track {
   -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
   border-radius: 4px;
   background: #ededed;
 }
 
-.lineMG .tbDiv::-webkit-scrollbar-thumb {
+.domesticScenicSpotPackagePrice .tbDiv::-webkit-scrollbar-thumb {
   border-radius: 4px;
   -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
   background: #c9c9c9;
@@ -184,11 +184,11 @@ input[type="number"] {
   font-size: 12px;
 }
 
-.lineMG .LMTable tr th {
+.domesticScenicSpotPackagePrice .LMTable tr th {
   border-bottom: 1px solid #d1d1d1;
 }
 
-.lineMG .tbDiv .LMTable td {
+.domesticScenicSpotPackagePrice .tbDiv .LMTable td {
   border-bottom: 1px solid #d1d1d1;
   border-right: 1px solid #d1d1d1;
   position: relative;
@@ -197,7 +197,7 @@ input[type="number"] {
   min-width: 250px;
 }
 
-.lineMG .tbDiv table {
+.domesticScenicSpotPackagePrice .tbDiv table {
   padding-right: 80px;
   margin-top: 10px;
   border-top: 1px solid #d1d1d1;
@@ -224,7 +224,7 @@ input[type="number"] {
   top: 3px;
 }
 
-.lineMG ._addLineTB tr {
+.domesticScenicSpotPackagePrice ._addLineTB tr {
   height: 40px !important;
 }
 
@@ -258,7 +258,7 @@ input[type="number"] {
   margin: 15px auto 5px;
 }
 
-.lineMG .joinDepart {
+.domesticScenicSpotPackagePrice .joinDepart {
   display: inline-block;
   margin-right: 50px;
   text-align: left;
@@ -266,7 +266,7 @@ input[type="number"] {
   width: 180px;
 }
 
-.lineMG .LM_Rank {
+.domesticScenicSpotPackagePrice .LM_Rank {
   text-align: center;
 }
 
@@ -294,15 +294,15 @@ input[type="number"] {
   margin-top: 25px;
 }
 
-.lineMG .el-button-group .el-button {
+.domesticScenicSpotPackagePrice .el-button-group .el-button {
   padding: 5px;
 }
 
-.lineMG .LM_ul > li:hover {
+.domesticScenicSpotPackagePrice .LM_ul > li:hover {
   box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
   transition: all linear 0.5s;
 }
-.lineMG .el-date-editor.el-input,
+.domesticScenicSpotPackagePrice .el-date-editor.el-input,
 .el-date-editor.el-input__inner {
   width: auto;
 }
@@ -314,7 +314,7 @@ input[type="number"] {
 }
 </style>
 <template>
-  <div class="flexOne lineMG">
+  <div class="flexOne domesticScenicSpotPackagePrice">
     <div class="query-box">
       <ul>
         <li>
@@ -361,18 +361,18 @@ input[type="number"] {
                 <div>{{item.B2CPrice}}</div>
               </div>
             </el-col>
-            <el-col :span="2">
+            <!-- <el-col :span="2">
               <div class="_LowDisMoney">
                 <div>原价</div>
                 <div>{{item.SalesPrice}}</div>
               </div>
-            </el-col>
-            <el-col :span="3">
+            </el-col> -->
+            <!-- <el-col :span="3">
               <div class="_LowDisMoney">
                 <div>供应商</div>
                 <div>{{item.SupplierName}}</div>
               </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="2">
               <div class="_LowDisMoney">
                 <div>备注</div>
@@ -446,19 +446,19 @@ input[type="number"] {
               <el-input type="text" v-model="addMsg.B2CPrice" @keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item label="原价" prop="SalesPrice">
               <el-input type="text" v-model="addMsg.SalesPrice" @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="4">
+          </el-col> -->
+          <!-- <el-col :span="4">
             <el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier">
               <el-select v-model="addMsg.Supplier" filterable :placeholder="$t('hotel.hotel_inputholder')">
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
                 <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="4">
             <el-form-item :label="$t('hotel.hotel_Currency')" prop="CurrencyId">
               <el-select placeholder="请选币种" filterable @change="getCurrentRate(addMsg.CurrencyId)" v-model="addMsg.CurrencyId">
@@ -523,7 +523,7 @@ export default {
         CostPrice: 0.0,
         StartDate: "",
         EndDate: "",
-        CurrencyId: 0,
+        CurrencyId: 1,
         CurrentRate: 0.0
       },
       rules: {
@@ -682,13 +682,13 @@ export default {
       this.addMsg.Inventory = "";
       this.addMsg.B2BPrice = "";
       this.addMsg.B2CPrice = "";
-      this.addMsg.SalesPrice = "";
+      this.addMsg.SalesPrice = 0;
       this.addMsg.Remark = "";
       this.addMsg.CostPrice = "";
       this.addMsg.StartDate = "";
       this.addMsg.EndDate = "";
-      this.addMsg.CurrencyId = 0;
-      this.addMsg.CurrentRate = "";
+      this.addMsg.CurrencyId = 1;
+      this.addMsg.CurrentRate = 1;
     },
     //修改报价信息
     updateData(ID) {

src/components/scenicSpot/domesticTicketManagement.vue

@@ -309,12 +309,12 @@
             maxlength="200"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item :label="$t('scen.sc_type_name')" prop="TicketCouponsType">
+        <el-form-item :label="$t('scen.sc_type_name')" prop="TicketCouponsType">
           <el-select filterable v-model='addMsg.TicketCouponsType' :placeholder="$t('pub.pleaseSel')" class="w300">
             <el-option v-for='item in TickettTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
             </el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="是否上架" prop="IsShelves">
           <el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
           <el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
@@ -751,12 +751,12 @@ export default {
             message: "请输入门票副标题",
           },
         ],
-        TicketCouponsType: [
-          {
-            required: true,
-            message: "请选择门票类型",
-          },
-        ],
+        // TicketCouponsType: [
+        //   {
+        //     required: true,
+        //     message: "请选择门票类型",
+        //   },
+        // ],
       },
       allCurrencyList: [],
     };