no message

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

@@ -7518,7 +7518,7 @@ export const obj = {
     tianxctmccyjg: '填写餐厅名称才能带出价格',
     tianxjqcaiyjg: '填写景点名称才能带出价格',
     hancan: '含餐',
-    guolfqcfei: '过路费、请车费"',
+    guolfqcfei: '过路费、停车费',
     zaocanmc: '早餐名称',
     wucanmc: '午餐名称',
     wancaimc: '晚餐名称',

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -335,19 +335,19 @@
     <template v-if="isFinance_ExpenseType">
     <div class="border-b"></div>
       <div class="OrderReceivablesAccount-title" style="display: flex;flex-direction: row;justify-content: space-between;">
-        <span>{{$t('objFill.v101.caiwnbubeiz')}}/{{$t('objFill.fj')}}</span>
+        <span>{{$t('objFill.v101.caiwnbubeiz')}}</span>
         <div>
-          <el-button v-if="!idEditFinNote" size="mini" round @click="idEditFinNote=true">{{$t('objFill.v101.xinzbji')}}</el-button>
+          <el-button v-if="!idEditFinNote" size="mini" type="success" icon="el-icon-edit" circle round @click="idEditFinNote=true"></el-button>
           <template v-else>
             <el-button size="mini" round icon="el-icon-close" @click="closeFinNote"></el-button>
             <el-button type="primary" size="mini" round @click="saveFinNote">{{$t('pub.saveBtn')}}</el-button>
           </template>
-
         </div>
       </div>
       <div class="OrderReceivablesAccount-center" style="margin-bottom: 10px;">
         <div v-if="!idEditFinNote">
-          {{$t('fnc.beizhu')}}{{saveMsg.Remark}}
+          <template v-if="saveMsg.Remark">{{saveMsg.Remark}}</template>
+          <template v-else>{{$t('pub.noMsg')}}</template>
         </div>
         <div v-else>
           <el-input
@@ -370,15 +370,15 @@
           </el-upload>
         </div>
         <div class="_pic_upload" v-for="(item,index) in saveMsg.Voucher" style="display: flex;flex-direction: row;flex-wrap: wrap;">
-          <div style="margin-left: 5px;width: 80px;height: 80px;border-radius: 3px; overflow: hidden;position: relative;">
+          <div style="margin-left: 5px;width: 60px;height: 50px;border-radius: 3px; overflow: hidden;position: relative;">
             <el-image v-if="item.Type==3"
-            style="width: 80px; height: 80px"
+            style="width: 60px; height: 50px"
             :src="item.Content"
             :initial-index="index"
             :preview-src-list="srcList"
             fit="cover">
           </el-image>
-          <div v-if="item.Type==1" style="width: 80px; height: 80px;text-align: center;line-height: 80px;background: #eee;">
+          <div v-if="item.Type==1" style="width: 60px; height: 50px;text-align: center;line-height: 60px;background: #eee;">
             <div class="iconfont _wenjian_P"
               :class="item.Content.substring(item.Content.lastIndexOf('.')+1,item.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
               @click="showUpLoadFile(item.Content)">
@@ -453,7 +453,7 @@
       if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
         this.IsExpensesMonthlyShare=true;
       }
-      if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
+      if (ActionMenuCode.indexOf('Finance_Inner') != -1) {
         this.isFinance_ExpenseType=true;
       }
 
@@ -490,7 +490,7 @@
           if (res.data.resultCode == 1) {
             this.idEditFinNote = false
             this.$message.success(res.data.message);
-            this.$emit('success')
+            //this.$emit('success')
           } else {
             this.$message.error(res.data.message);
           }

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -68,7 +68,7 @@
         <table class="CostNewTable" style="width:1600px;">
           <thead>
             <tr>
-              <td colspan="13" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="13" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.baojiaxinxi')}}</td>
             </tr>
             <tr>
               <td class="CP_ComTitle2 CostcomCenter" style="width:120px">{{$t('hotel.hotel_Currency')}}</td>
@@ -116,7 +116,8 @@
                     <el-button slot="append" class="iconfont icon-img_haha" @click="addPeoNunber"></el-button>
                   </el-input>
                 </el-form-item>
-                <div colspan="13" style="color: #f12121;font-weigth: bold;">填入人数后请点击"+"</div>
+                <div colspan="13" style="color: #f12121;font-weigth: bold;">{{$t('objFill.v101.tianrrshqindj')}}"+"
+                </div>
               </td>
             </tr>
           </thead>
@@ -125,23 +126,26 @@
             <td rowspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_Currency')}}</td>
             <td rowspan="2" style="width:180px" class="CP_ComTitle2 CostcomCenter">{{$t('Airticket.Air_Trip')}}</td>
             <td colspan="2" style="width:220px;" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel')}}</td>
-            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车/天</td>
+            <td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
             <td colspan="2" style="width:200px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
             <td colspan="2" style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
-            <td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
+            <td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">
+              {{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
           </tr>
           <tr>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.table_hotelname')}}</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/天</td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
+            </td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">
+              {{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
             <td style="width:110px" class="CP_ComTitle2 CostcomCenter">{{$t('restaurant.res_resName')}}<br /><span
-                style="color:red;">填写餐厅名称才能带出价格</span></td>
-            <td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
+                style="color:red;">{{$t('objFill.v101.tianxctmccyjg')}}</span></td>
+            <td style="width:90px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiagecan')}}</td>
             <td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('visaT.jdname')}}<br />
-              <span style="color:red;">填写景点名称才能带出价格</span>
+              <span style="color:red;">{{$t('objFill.v101.tianxjqcaiyjg')}}</span>
             </td>
-            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
+            <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('system.query_airName')}}</td>
             <td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('Operation.Op_price')}}</td>
           </tr>
@@ -151,7 +155,7 @@
                 {{$t('tips.di')}}{{subItem.DayNum}}{{$t('hotel.hotel_day')}}
                 <br />
                 {{GetDayStr(subItem.DayNum-1)}}
-               
+
               </td>
               <td>
                 <el-form-item>
@@ -174,18 +178,18 @@
                   </el-option>
                 </el-select>
                 <el-form-item label="含餐:">
-                  <el-select v-model='subItem.ContainDinnerType' style="width:100px;" placeholder="含餐类型"
+                  <el-select v-model='subItem.ContainDinnerType' style="width:100px;" :placeholder="$t('objFill.v101.hancanlxin')"
                     @change="DinnerTypeChange(subItem)">
-                    <el-option label="含餐类型" :value='0'></el-option>
-                    <el-option label="含早餐" :value='1'></el-option>
-                    <el-option label="含晚餐" :value='2'></el-option>
-                    <el-option label="含早晚餐" :value='3'></el-option>
+                    <el-option :label="$t('objFill.v101.hancanlxin')" :value='0'></el-option>
+                    <el-option :label="$t('objFill.hanzaocan')" :value='1'></el-option>
+                    <el-option :label="$t('objFill.hanwancan')" :value='2'></el-option>
+                    <el-option :label="$t('objFill.v101.hanzaowanc')" :value='3'></el-option>
                   </el-select>
                 </el-form-item>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
-                  @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" placeholder="酒店价格"></el-input>
+                  @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" :placeholder="$t('objFill.v101.jiudianjge')"></el-input>
                 <template v-if="subItem.IsHotelChange">
                   <font style="color:red;">
                     <template v-if="subItem.HotelChangeValue>0">
@@ -639,7 +643,7 @@
 </template>
 <script>
   import travelDinner from '@/components/commonPage/travelDinner'
- 
+
   export default {
     props: ["postConfig", "AllCurrencyList"],
     watch: {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -79,7 +79,9 @@
                 {{$t('objFill.v101.kaituants')}}
               </th>
               <th colspan="7" style="text-align:left;line-height:40px;">
-                <p style="color:red;font-weight:bold;"> 1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp; 2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
+                <p style="color:red;font-weight:bold;">
+                  1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp;
+                  2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
                   3.{{$t('objFill.v101.dangdybxyjp')}}
                 </p>
               </th>
@@ -152,7 +154,8 @@
               </td>
               <td width="80" class="txtRightCost">{{$t('fnc.khmingcheng')}}</td>
               <td>
-                <el-input v-model="postData.CustomerName" type="text" placeholder="客户名称" maxlength="200">
+                <el-input v-model="postData.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')"
+                  maxlength="200">
                 </el-input>
               </td>
             </tr>