页面修改

src/assets/common/lang/en.js

@@ -590,6 +590,7 @@ export const scen = {
   sc_bjts: 'Number of quotes',
   sc_dj: 'Lowest price',
   sc_gj: 'Highest price',
+  sc_sfrbhfgs:"Belonging to Japan Kimono Company",
 }
 //机票库
 export const Airticket = {

src/assets/common/lang/jp.js

@@ -542,6 +542,7 @@ hotel_TravelExpenses:'通行料',
    sc_bjts:'見積個数',
    sc_dj:'最低価格',
    sc_gj:'最高価格',
+   sc_sfrbhfgs:"日本の着物会社に所属しています",
  }
 //机票库
 export const Airticket = {

src/assets/common/lang/zh-tw.js

@@ -587,6 +587,7 @@ export const admin={  //行政
   sc_bjts:'報價條數',
   sc_dj:'最低價格',
   sc_gj:'最高價格',
+  sc_sfrbhfgs:"屬於日本和服公司",
  }
 //机票库
 export const Airticket = {

src/assets/common/lang/zh.js

@@ -590,6 +590,7 @@ export const admin={  //行政
    sc_bjts:'报价条数',
    sc_dj:'最低价格',
    sc_gj:'最高价格',
+   sc_sfrbhfgs:"属于日本和服公司",
  }
 //机票库
 export const Airticket = {

src/components/Hotel/HotelManagement.vue

@@ -447,7 +447,7 @@
               @click="goUrl('HotelProductManage2', item)" class="hotelBtnMan">
               {{ $t("ground.baojiayukucun") }}
             </button>
-            <button v-if="IsHotelPriceStock==1 " style="width: 80px; margin-top: 10px" @click="downloadFile(item)"
+            <button v-if="(IsHotelPriceStock==1||userInfo.RB_Group_id!=2)" style="width: 80px; margin-top: 10px" @click="downloadFile(item)"
               class="hotelBtnMan">
               {{$t('objFill.shangchuanbj')}}
             </button>
@@ -475,7 +475,7 @@
     <el-dialog :title="$t('objFill.shangchuanbjd')" :visible.sync="showUpload">
       <div>
         <el-input style="margin-bottom: 20px" v-model="uploadTitle" :placeholder="$t('objFill.qdtbaojiabt')"></el-input>
-        <el-upload class="upload-demo" :file-list="DownloadMaterialsFileList" :http-request="uploadTest"
+        <el-upload ref="my-upload" class="upload-demo" :file-list="DownloadMaterialsFileList" :http-request="uploadTest"
           :on-remove="handleRemove" :limit="1" action="">
           <el-button :disabled="DownloadMaterialsFileList.length ? true : false" size="small" type="primary">
             {{$t('tips.dianjishanhcuan')}}

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -234,7 +234,7 @@
               <td>
                 {{subItem.PassFee}}
               </td>
-              <td style="width:250px;white-space:nowrap;">
+              <td style="width:250px;">
                 <template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
                   {{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
                 </template>

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -723,7 +723,8 @@
           </el-form-item>
 
           <el-form-item :label="$t('system.table_country')">
-            <el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country" class="multiple_input w300" @change="
+            <el-select :placeholder="$t('visaT.qxzguojia')" filterable v-model="addMsg.Country"
+              class="multiple_input w300" @change="
                 GetSubAreaList(addMsg.Country, 1),
                   (addMsg.Province = 0),
                   (addMsg.City = 0),
@@ -736,7 +737,8 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_province')">
-            <el-select :placeholder="$t('objFill.qxzshen')" filterable class="multiple_input w300" v-model="addMsg.Province" @change="
+            <el-select :placeholder="$t('objFill.qxzshen')" filterable class="multiple_input w300"
+              v-model="addMsg.Province" @change="
                 GetSubAreaList(addMsg.Province, 2),
                   (addMsg.City = 0),
                   (addMsg.District = 0)
@@ -748,8 +750,9 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('hotel.hotel_city')">
-            <el-select :placeholder="$t('objFill.qxzshi')" filterable @change="GetSubAreaList(addMsg.City, 3), (addMsg.District = 0)"
-              class="multiple_input w300" v-model="addMsg.City">
+            <el-select :placeholder="$t('objFill.qxzshi')" filterable
+              @change="GetSubAreaList(addMsg.City, 3), (addMsg.District = 0)" class="multiple_input w300"
+              v-model="addMsg.City">
               <el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
               <el-option v-for="childItem in CityList" :key="childItem.ID" :label="childItem.Name"
                 :value="childItem.ID">
@@ -831,6 +834,17 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="">
+            <font style="color:red;font-weight:bold;">*{{$t('scen.sc_sfrbhfgs')}}</font>
+            <el-select v-model="addMsg.IsJapanHeFu" class="multiple_input" style="width:275px;"
+              :placeholder="$t('pub.pleaseSel')">
+              <el-option :key="0" :label="$t('fnc.fou')" :value="0"></el-option>
+              <el-option :key="1" :label="$t('fnc.yes')" :value="1">
+              </el-option>
+            </el-select>
+            <br />
+            <font style="color:red;padding-left:150px;">景点属于日本和服公司请选择“是”.</font>
+          </el-form-item>
           <div class="toolOne">
             <span class="fanbili">{{$t('scen.sc_etTime')}}</span>
             <div class="RabateDiv clearfix">
@@ -905,8 +919,8 @@
               <el-switch v-model="addMsg.Sure" active-value="1" inactive-value="0"></el-switch>
             </el-form-item>
             <el-form-item>
-              <el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" :active-text="$t('hotel.hotel_Supplier')"
-                :inactive-text="$t('objFill.ziding')"></el-switch>
+              <el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949"
+                :active-text="$t('hotel.hotel_Supplier')" :inactive-text="$t('objFill.ziding')"></el-switch>
             </el-form-item>
             <el-form-item :label="$t('objFill.shifoubhld')">
               <el-switch v-model="addMsg.IsIncludeLeader" :active-value="0" :inactive-value="1"></el-switch>
@@ -1086,6 +1100,7 @@
           PlayTimeMinutes: "", //游玩分钟
           IsIncludeLeader: 0, //是否包含领队:0-包含,1-不包含
           SelffetchAddress: '', //邮寄地址
+          IsJapanHeFu: 0, //是否是日本和服公司
         },
         rules: {
           //表单必填验证