多语言

src/assets/common/lang/zhCN/Ground.js

@@ -269,5 +269,15 @@ export const obj = {
   sfthxzjd: "是否要替换选中的酒店?",
   jiudiangzb: "酒店工作表",
   shifoushancgjd: "是否要删除该酒店?",
+  cantingleixing: "餐厅类型",
+  hezuofangshi: "合作方式",
+  tianjiataocan: "添加套餐",
+  xiugaitaocan: "修改套餐",
+  qingxuanzetczy: "请选择套餐资源",
+  qingxztc: "请选择套餐",
+  yiquxsc: "已取消删除",
+  meicznclygysj: "每次只能处理同一个月数据",
+  tjsjfgyq: "提交新数据，将覆盖以前数据",
+  cantdwmc: "餐厅对外名称",
 }
 export default obj;
\ No newline at end of file

src/assets/common/lang/zhTW/Ground.js

@@ -269,5 +269,15 @@ export const obj = {
   sfthxzjd: "是否要替換選中的飯店?",
   jiudiangzb: "飯店工作表",
   shifoushancgjd: "是否要删除該飯店?",
+  cantingleixing: "餐廳類型",
+  hezuofangshi: "合作方式",
+  tianjiataocan: "添加套餐",
+  xiugaitaocan: "修改套餐",
+  qingxuanzetczy: "請選擇套餐資源",
+  qingxztc: "請選擇套餐",
+  yiquxsc: "已取消删除",
+  meicznclygysj: "每次只能處理同一個月數據",
+  tjsjfgyq: "提交新數據，將覆蓋以前數據",
+  cantdwmc: "餐廳對外名稱",
 }
 export default obj;
\ No newline at end of file

src/components/FinancialModule/FinancialDocuments.vue

@@ -981,6 +981,7 @@ export default {
                         this.loading = false;
                         this.checkList = []; 
                         this.getPageList(1)
+                        this.BOSSDialogText = false;
                     }
                 },err=>{})
             } else {

src/components/Restaurant/RestaurantPackage.vue

@@ -105,7 +105,7 @@
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
             @click="getList(),resetPageIndex()" />
-          <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle='添加套餐'"
+          <input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle=$t('ground.tianjiataocan')"
             :value="$t('pub.addBtn')" />
         </li>
       </ul>
@@ -157,7 +157,7 @@
           <el-button-group>
             <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
               <el-button type="primary" icon="iconfont icon-Edit"
-                @click="outerVisible = true,dialogTitle='修改套餐',updateResturant(item.Id)"></el-button>
+                @click="outerVisible = true,dialogTitle=$t('ground.xiugaitaocan'),updateResturant(item.Id)"></el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
               <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="goUrl('RestaurantPrice',item.Id)">
@@ -236,11 +236,11 @@
           //表单必填验证
           DiningId: [{
             required: true,
-            message: "请选择套餐资源"
+            message: this.$t('ground.qingxuanzetczy')
           }],
           DiningMealType: [{
             required: true,
-            message: "请选择套餐"
+            message: this.$t('ground.qingxztc')
           }]
         }
       };
@@ -287,7 +287,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.getList();
-              this.Success("保存成功！");
+              this.Success(this.$t('tips.saveYes'));
               this.outerVisible = false;
               this.resetForm("addMsg");
             } else {
@@ -319,13 +319,13 @@
         this.addMsg.Id = "0";
       },
       isDelete(ID) {
-        this.$confirm("是否删除?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
+        this.$confirm(this.$t('tips.shifoushanchu'), "提示", {
+            confirmButtonText: this.$t('pub.sureBtn'),
+            cancelButtonText: this.$t('pub.cancelBtn'),
             type: "warning"
           })
           .then(() => {
-            this.Success("删除成功!");
+            this.Success(this.$t('tips.shanchuchenggong'));
             let msg = {
               ID: ID
             };
@@ -344,7 +344,7 @@
             );
           })
           .catch(() => {
-            this.Info("已取消删除");
+            this.Info(this.$t('ground.yiquxsc'));
           });
       },
       goUrl(path, id) {

src/components/Restaurant/RestaurantPrice.vue

@@ -348,18 +348,18 @@
                 <li>
                   <i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">❮</i>
                   <input type="text" v-model="currentYear" class="currentInput"
-                         @input="getDateString(),initCalendar(dateString)"/>年
+                         @input="getDateString(),initCalendar(dateString)"/>{{$t('pub.year')}}
                   <i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">❯</i>
                 </li>
                 <li>
                   <i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">❮</i>
                   <input type="text" v-model="currentMonth" class="currentInput"
-                         @input="getDateString(),initCalendar(dateString)"/>月
+                         @input="getDateString(),initCalendar(dateString)"/>{{$t('pub.month')}}
                   <i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">❯</i>
                 </li>
                 <li>
                   <div class="ckAll">
-                    <el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">全选</el-checkbox>
+                    <el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}</el-checkbox>
                   </div>
                 </li>
               </ul>
@@ -396,15 +396,15 @@
                       <label>{{$t('hotel.hotel_B2BPrice')}}：{{dayobject.B2BPrice}}</label>
                     </div>
                     <div class="popList">
-                      <label>内部价格：{{dayobject.SalesPrice}}</label>
+                      <label>{{$t('hotel.hotel_SalesPrice')}}：{{dayobject.SalesPrice}}</label>
                       <label>{{$t('hotel.hotel_B2CPrice')}}：{{dayobject.B2CPrice}}</label>
                     </div>
                     <div class="HT_supplier" v-if="IsSelfBook">
                       <label>{{$t('hotel.hotel_Supplier')}}：{{dayobject.SupplierName}}</label>
                     </div>
                   </div>
-                  <input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)" value="删除"/>
-                  <button class="hollowFixedBtn delButton" @click="updateInfo(dayobject.ID,dayobject.date,index)">修改
+                  <input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)" :value="$t('system.table_delete')"/>
+                  <button class="hollowFixedBtn delButton" @click="updateInfo(dayobject.ID,dayobject.date,index)">{{$t('system.table_edit')}}
                   </button>
                 </div>
               </li>
@@ -467,7 +467,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="汇率" prop="Fax">
+            <el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="Fax">
               <el-input class="w210" v-model='addMsg.CurrentRate'
                         @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
             </el-form-item>
@@ -475,7 +475,7 @@
           <div class="resDiv">
             <el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier">
               <el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')">
-                <el-option label='不限' :value='defaultSelect'></el-option>
+                <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>
@@ -488,14 +488,14 @@
         </el-form>
         <div class="noticeInfo">
           <div>{{$t('hotel.hotel_attention')}}：</div>
-          <div>1.每次只能处理同一个月数据。</div>
-          <div>2.提交新数据，将覆盖以前数据</div>
+          <div>1.{{$t('ground.meicznclygysj')}}。</div>
+          <div>2.{{$t('ground.tjsjfgyq')}}</div>
         </div>
         <button type="success" class="subPrice" :class="{'comDisableBtn':isDisable==true,'normalBtn':isDisable==false}"
                 :disabled='isDisable' @click="submitForm('addMsg')">{{comBtnText}}
         </button>
-        <button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">返回</button>
-        <button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>取消</button>
+        <button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">{{$t('pub.returnBack')}}</button>
+        <button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>{{$t('pub.cancelBtn')}}</button>
       </div>
     </div>
   </div>
@@ -505,7 +505,8 @@
     data() {
       var SupperValidate = (rule, value, callback) => {
         if (value === 0) {
-          callback(new Error("请选择供应商"));
+          let tips = this.$t('ground.qingxuanzegys')
+          callback(new Error(tips));
         } else {
           callback();
         }
@@ -527,7 +528,7 @@
         isCheckAll: false,
         IsSelfBook: "",
         //提交报价中
-        comBtnText: '提交报价',
+        comBtnText: this.$t('ground.tijiaobaojia'),
         isDisable: false,
         dateString: "2016-01-02",
         num: -1,
@@ -557,31 +558,31 @@
         rules: {
           //表单必填验证
           CostPrice: [
-            {required: true, message: "请输入成本价", trigger: "change"},
+            {required: true, message: this.$t('ground.qingshurcbj'), trigger: "change"},
             {
               pattern: this.$commonUtils.Regex.el_Isdecimal,
-              message: "请输入两位小数"
+              message: this.$t('ground.qingshurlwxs')
             }
           ],
           B2BPrice: [
-            {required: true, message: "请输入内部价", trigger: "change"},
+            {required: true, message: this.$t('ground.qingshurnbjg'), trigger: "change"},
             {
               pattern: this.$commonUtils.Regex.el_Isdecimal,
-              message: "请输入两位小数"
+              message: this.$t('ground.qingshurlwxs')
             }
           ],
           B2CPrice: [
             {required: true, message: "请输入B2B价格", trigger: "change"},
             {
               pattern: this.$commonUtils.Regex.el_Isdecimal,
-              message: "请输入两位小数"
+              message: this.$t('ground.qingshurlwxs')
             }
           ],
           SalesPrice: [
-            {required: true, message: "请输入B2C价格", trigger: "change"},
+            {required: true, message: this.$t('ground.qingshuruB2Bjg'), trigger: "change"},
             {
               pattern: this.$commonUtils.Regex.el_Isdecimal,
-              message: "请输入两位小数"
+              message: this.$t('ground.qingshurlwxs')
             }
           ],
           Supplier: [
@@ -669,21 +670,21 @@
         this.addMsg.DiningId = this.Did;
         this.addMsg.MealId = this.Mid;
         if (this.addMsg.DateList == "" && (this.addMsg.StartDate == "" || this.addMsg.EndDate == "")) {
-          this.Error("请选择日期");
+          this.Error(this.$t('ground.qingxuanzeriq'));
           return;
         }
         this.isDisable = true;
-        this.comBtnText = '正在提交';
+        this.comBtnText = this.$t('ground.zhengzaitijiao');
         this.apipost(
           "price_post_Set",
           this.addMsg,
           res => {
             this.isDisable = false;
-            this.comBtnText = '提交报价'
+            this.comBtnText = this.$t('ground.tijiaobaojia')
             if (res.data.resultCode == 1) {
               this.initDataTable();
               this.addMsg = {};
-              this.Success("保存成功！");
+              this.Success(this.$t('tips.saveYes'));
               this.DateArr.length = 0;
               this.addMsg.ID = 0;
               this.resetForm("addMsg");
@@ -695,15 +696,15 @@
         );
       },
       isdelete(ID) {
-        this.$confirm("是否删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
+        this.$confirm(this.$t('tips.shifoushanchu'), "提示", {
+          confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
           type: "warning"
         })
           .then(() => {
             this.$message({
               type: "success",
-              message: "删除成功!"
+              message: this.$t('tips.shanchuchenggong')
             });
             let msg = {
               ID: ID
@@ -713,7 +714,7 @@
               msg,
               res => {
                 if (res.data.resultCode == 1) {
-                  this.Success("删除成功！");
+                  this.Success(this.$t('tips.shanchuchenggong'));
                   this.initDataTable();
                   this.initCalendar();
                 } else {
@@ -726,7 +727,7 @@
           .catch(() => {
             this.$message({
               type: "info",
-              message: "已取消删除"
+              message: this.$t('ground.yiquxsc')
             });
           });
       },

src/components/Restaurant/restaurantInfoManage.vue

@@ -684,7 +684,7 @@
       <el-form :model="addMsg" :rules="rules" ref="addMsg">
         <div class="resource-baseinfo">
           <span class="resource-lititle">{{$t('hotel.hotel_baseinfo')}}</span>
-          <el-form-item label="餐厅对外名称" prop="Name">
+          <el-form-item :label="$t('ground.cantdwmc')" prop="Name">
             <el-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
           </el-form-item>
           <el-form-item label="餐厅真实名称" prop="RealName">

src/components/Restaurant/restaurantList.vue

@@ -266,7 +266,7 @@
         </li>
           <li>
           <span>
-            <em>餐厅类型</em>
+            <em>{{$t('ground.cantingleixing')}}</em>
             <el-select v-model="msg.DiningType" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
               <el-option v-for="item in DiningTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -275,7 +275,7 @@
         </li>
            <li>
           <span>
-            <em>价格</em>
+            <em>{{$t('Operation.Op_price')}}</em>
             <el-select v-model="msg.DiningPriceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
               <el-option v-for="item in DiningPriceTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -284,7 +284,7 @@
         </li>
           <li>
           <span>
-            <em>合作方式</em>
+            <em>{{$t('ground.hezuofangshi')}}</em>
             <el-select v-model="msg.CooperationType" class="w210" :placeholder="$t('pub.unlimitedSel')">
               <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
               <el-option v-for="item in CooperationTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -321,7 +321,7 @@
           <div class="hotelTitle fz12">{{item.Name}}</div>
         </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="item.RealName" placement="top-start" popper-class="max-w250">
-            <div class="hotelTitle fz12">真实名称: {{item.RealName}}</div>
+            <div class="hotelTitle fz12">{{$t('ground.zhenshimingcheng')}}: {{item.RealName}}</div>
          </el-tooltip>
         <div class="brandList clearfix">
           <div class="brand">
@@ -366,11 +366,11 @@
         CooperationTypeList:[],
         status: [{
             value: "0",
-            label: "正常"
+            label: this.$t('pub.normalSel')
           },
           {
             value: "1",
-            label: "删除"
+            label: this.$t('system.table_delete')
           }
         ],
         isDeleteNote: true,
@@ -405,7 +405,7 @@
       },
       isdelete(ID) {
         var that = this;
-        that.Confirm("是否删除?", function () {
+        that.Confirm(that.$t('tips.shifoushanchu'), function () {
           that.apipost(
             "dining_post_Remove", {
               ID: ID