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

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

@@ -636,6 +636,46 @@ export const obj = {
   lduiwubi:'领队务必当场确认护照、签证和机票行程单，请仔细核对上面信息，若有错误，请及时将OP票务联系。',
   ruyoukeren:'如有客人出发当天没到机场（NO SHOW）一定要当日马上回去线控/OP',
   lduichutuan:'领队出团带出的领队旗和手配旗，结束后需带回，押金50元。',
-  chahewuwu:'查核无误后，请在以下栏位签名及压日期',
+  chahewuwu: '查核无误后，请在以下栏位签名及压日期',
+  guanggaolianjie: '广告链接',
+  shifoushancgg: '是否删除此广告',
+  shangpinfl: '商品分类',
+  xiaoshoujia: '销售价',
+  lingduifyje: '领队返佣金额',
+  gongsifyje: '公司返佣金额',
+  tonghangfyje: '同行返佣金额',
+  weitufyje: '微途返佣金额',
+  shangpintp: '商品图片',
+  zuiduoscwz: '最多上传5张图片',
+  shangpinms: '商品描述',
+  shangpinsm: '商品说明',
+  shangpinxq: '商品详情',
+  qingsrspmc: '请输入商品名称',
+  qingsrjg: '请输入价格',
+  qingsrscjg: '请输入市场价格',
+  qingxzsplx: '请选择商品类型',
+  qingxzspfl: '请选择商品分类',
+  fenleimc: '分类名称',
+  leixingmc: '类型名称',
+  lingduifany: '领队返佣',
+  gongsifany: '公司返佣',
+  tonghangfy: '同行返佣',
+  weitufany: '微途返佣',
+  xinzengjg: '新增价格',
+  chengbenjg: '成本价格',
+  jiageyouxkssh: '价格有效开始时间',
+  jiageyouxjssj: '价格有效结束时间',
+  qingsrmsxx: '请输入描述信息',
+  qingsrcbjg: '请输入成本价格',
+  qingsrxsjg: '请输入销售价格',
+  jieshusjbxdyks: '结束时间必须大于开始时间',
+  kaishisjbxxyjs: '开始时间必须小于结束时间',
+  fenlei: '分类',
+  shangjimingc: '上级名称',
+  shifousyzs: '首页展示',
+  xiugaishangplx: '修改商品类型',
+  suoshusj: '所属上级',
+  shangpinlxmc: '商品类型名称',
+  qingshangctp: '请上传图片',
 }
 export default obj;
\ No newline at end of file

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

@@ -636,6 +636,46 @@ LDHUIGUO:'領隊回國請務必提供所有消費明細憑據報帳。',
 lduiwubi:'領隊務必當場確認護照、簽證和機票行程單，請仔細核對上面資訊，若有錯誤，請及時將OP票務聯系。',
 ruyoukeren:'如有客人出發當天沒到機場（NO SHOW）一定要當日馬上回去線控/OP',
 lduichutuan:'領隊出團帶出的領隊旗和手配旗，結束後需帶回，押金50元。',
-chahewuwu:'查核無誤後，請在以下欄比特簽名及壓日期',
+chahewuwu: '查核無誤後，請在以下欄比特簽名及壓日期',
+guanggaolianjie: '廣告連結',
+shifoushancgg: '是否删除此廣告',
+shangpinfl: '商品分類',
+xiaoshoujia: '銷售價',
+lingduifyje: '領隊返傭金額',
+gongsifyje: '公司返傭金額',
+tonghangfyje: '同行返傭金額',
+weitufyje: '微途返傭金額',
+shangpintp: '商品圖片',
+zuiduoscwz: '最多上傳5張圖片',
+shangpinms: '商品描述',
+shangpinsm: '商品說明',
+shangpinxq: '商品詳情',
+qingsrspmc: '請輸入商品名稱',
+qingsrjg: '請輸入價格',
+qingsrscjg: '請輸入市場價格',
+qingxzsplx: '請選擇商品類型',
+qingxzspfl: '請選擇商品分類',
+fenleimc: '分類名稱',
+leixingmc: '類型名稱',
+lingduifany: '領隊返傭',
+gongsifany: '公司返傭',
+tonghangfy: '同行返傭',
+weitufany: '微途返傭',
+xinzengjg: '新增價格',
+chengbenjg: '成本價格',
+jiageyouxkssh: '價格有效開始時間',
+jiageyouxjssj: '價格有效結束時間',
+qingsrmsxx: '請輸入描述資訊',
+qingsrcbjg: '請輸入成本價格',
+qingsrxsjg: '請輸入銷售價格',
+jieshusjbxdyks: '結束時間必須大於開始時間',
+kaishisjbxxyjs: '開始時間必須小於結束時間',
+fenlei: '分類',
+shangjimingc: '上級名稱',
+shifousyzs: '首頁展示',
+xiugaishangplx: '修改商品類型',
+suoshusj: '所屬上級',
+shangpinlxmc: '商品類型名稱',
+qingshangctp: '請上傳圖片',
 }
 export default obj;
\ No newline at end of file

src/components/Buying/AdManageList.vue

@@ -70,16 +70,16 @@
     <div class="query-box">
       <ul>
         <li>
-          <input type="button" class="normalBtn" value="新增" @click="IsShowBtm=true" />
+          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="IsShowBtm=true" />
         </li>
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th>编号</th>
-        <th>广告图</th>
-        <th>广告链接</th>
-        <th>状态</th>
+        <th>{{$t('hotel.hotel_SerialNumber')}}</th>
+        <th>{{$t('salesModule.AdvPic')}}</th>
+        <th>{{$t('ground.guanggaolianjie')}}</th>
+        <th>{{$t('admin.admin_status')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="item in dataList">
@@ -92,12 +92,12 @@
         <td>{{item.StatusStr}}</td>
         <td>
           <el-button-group>
-            <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
               <el-button type="primary" size="mini" icon="el-icon-edit" @click="getAdManage(item.Id)">
               </el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
-              <el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)">
+            <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
+              <el-button type="danger" style="font-size: 14px;" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)">
               </el-button>
             </el-tooltip>
           </el-button-group>
@@ -112,17 +112,17 @@
     <div class="combottomDiv" v-if="IsShowBtm" style="left:0;">
       <el-row>
         <el-col :span="20">
-          <p class="combottomTitle">广告图</p>
+          <p class="combottomTitle">{{$t('salesModule.AdvPic')}}</p>
         </el-col>
         <el-col :span="4">
-          <input type="button" class="normalBtn" @click="SetAdmanage()" value="保存" />
-          <input type="button" class="hollowFixedBtn" @click="clearAdManage(),IsShowBtm=false" value="取消" />
+          <input type="button" class="normalBtn" @click="SetAdmanage()" :value="$t('pub.saveBtn')" />
+          <input type="button" class="hollowFixedBtn" @click="clearAdManage(),IsShowBtm=false" :value="$t('pub.cancelBtn')"/>
         </el-col>
       </el-row>
       <el-form label-width="80px">
         <ul class="changeMsg">
           <li>
-            <el-form-item label="图片">
+            <el-form-item :label="$t('system.label_img')">
               <div class="TFimgList">
                 <img v-if="!ShowImgUrl" src="../../assets/img/bg_c3@3x.png">
                 <img v-else :src='ShowImgUrl'>
@@ -138,7 +138,7 @@
             </el-form-item>
           </li>
           <li>
-            <el-form-item label="广告链接">
+            <el-form-item :label="$t('ground.guanggaolianjie')">
               <el-input v-model="addMsg.AdLink" class="w210"></el-input>
             </el-form-item>
           </li>
@@ -222,7 +222,7 @@
       //根据编号删除广告详情
       removeAdManage(Id) {
         var that = this;
-        this.Confirm("是否删除此广告?", function () {
+        this.Confirm(this.$t('ground.shifoushancgg'), function () {
           that.apipost("ShopAd_post_RemoveAdManageService", {
             Id: Id
           }, res => {

src/components/Buying/BuyingAdd.vue

@@ -205,11 +205,11 @@
   <el-row class="addIntegralMall">
     <el-col :span="9">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
-        <span class="resource-lititle">基本信息</span>
-        <el-form-item label="商品名称" prop="Name">
+        <span class="resource-lititle">{{$t('salesModule.BaseInfo')}}</span>
+        <el-form-item :label="$t('MarketingActi.commName')" prop="Name">
           <el-input v-model="addMsg.Name" class="w217"/>
         </el-form-item>
-        <el-form-item label="商品类型" prop="SellType">
+        <el-form-item :label="$t('MarketingActi.commType')" prop="SellType">
           <el-select filterable v-model="addMsg.SellType">
             <el-option
               v-for="item in CommodityTypeList"
@@ -217,7 +217,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类" >
+        <el-form-item :label="$t('ground.shangpinfl')" >
           <el-select filterable v-model="addMsg.ParentCategoryId" @change="getGoodsTypeManager(2)">
             <el-option
               v-for="item in GoodsTypeList"
@@ -231,28 +231,28 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="成本价" prop="CostPrice">
+        <el-form-item :label="$t('ground.cbenjia')" prop="CostPrice">
           <el-input v-model="addMsg.CostPrice" class="w217"/>
         </el-form-item>
-        <el-form-item label="销售价" prop="SellPrice">
+        <el-form-item :label="$t('ground.xiaoshoujia')" prop="SellPrice">
           <el-input v-model="addMsg.SellPrice" class="w217"/>
         </el-form-item>
-        <el-form-item label="领队返佣金额" prop="LeaderRebate">
+        <el-form-item :label="$t('ground.lingduifyje')" prop="LeaderRebate">
           <el-input v-model="addMsg.LeaderRebate" class="w217"/>
         </el-form-item>
-        <el-form-item label="公司返佣金额" prop="CompanyRebate">
+        <el-form-item :label="$t('ground.gongsifyje')" prop="CompanyRebate">
           <el-input v-model="addMsg.CompanyRebate" class="w217"/>
         </el-form-item>
-         <el-form-item label="同行返佣金额" prop="ClientRebate">
+         <el-form-item :label="$t('ground.tonghangfyje')" prop="ClientRebate">
           <el-input v-model="addMsg.ClientRebate" class="w217"/>
         </el-form-item>
-        <el-form-item label="微途返佣金额" prop="WeiTuRebate">
+        <el-form-item :label="$t('ground.weitufyje')" prop="WeiTuRebate">
           <el-input v-model="addMsg.WeiTuRebate" class="w217"/>
         </el-form-item>
       </el-form>
     </el-col>
     <el-col :span="9">
-      <span class="resource-lititle">商品图片</span>
+      <span class="resource-lititle">{{$t('ground.shangpintp')}}</span>
       <div class="resource-list">
         <div class="resource-imglist clearfix">
           <div class="re-img" v-for="(item,index) in DiningImageArray" :key="index">
@@ -301,11 +301,11 @@
             </div>
           </div>
         </div>
-        <p class="tips tips2">最多上传5张图片</p>
-        <span class="resource-lititle resource-lititle2">商品描述</span>
+        <p class="tips tips2">{{$t('ground.zuiduoscwz')}}</p>
+        <span class="resource-lititle resource-lititle2">{{$t('ground.shangpinms')}}</span>
         <el-input type="textarea" :rows="2" v-model="addMsg.Description" class="w217"/>
-        <span class="resource-lititle resource-lititle2">商品说明</span>
-        <el-select v-model="addMsg.ExplainList" multiple placeholder="请选择" class="heightauto">
+        <span class="resource-lititle resource-lititle2">{{$t('ground.shangpinsm')}}</span>
+        <el-select v-model="addMsg.ExplainList" multiple :placeholder="$t('pub.pleaseSel')" class="heightauto">
           <el-option
             v-for="item in CommodityExplainList"
             :key="item.Id"
@@ -313,9 +313,9 @@
             :value="item.Id">
           </el-option>
         </el-select>
-        <span class="resource-lititle resource-lititle2">商品详情</span>
+        <span class="resource-lititle resource-lititle2">{{$t('ground.shangpinxq')}}</span>
         <my-edit v-on:edit-value="addMsg.Content = arguments[0]" v-bind:editValue="addMsg.Content"
-          v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
+          v-bind:toolbarShow="toolbar" v-bind:placeholder="$t('pub.pleaseSel')"></my-edit>
           
       </div>
       <div class="bottom_sub">
@@ -349,7 +349,6 @@ export default {
         fontColor: true, //字体颜色
         fontBackgroundColor: true, //背景颜色
       },
-      placeholder: "请输入内容",
       editorOption: {
         modules: {
           toolbar: [
@@ -378,32 +377,21 @@ export default {
         LeaderRebate: 1,
         CompanyRebate: 0,
         ClientRebate: 0,
-        WeiTuRebate: '',
+        WeiTuRebate: 0,
         ParentCategoryId: ""
       },
       MenberList: [],
       GoodsTypeList: [],
       CommodityTypeList: [],
       rules: {
-        memberLevel: [
-          { required: true, message: "请输入会员等级", trigger: "blur" }
-        ],
-        name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
-        price: [{ required: true, message: "请输入价格", trigger: "blur" }],
+        Name: [{ required: true, message: this.$t('ground.qingsrspmc'), trigger: "blur" }],
+        CostPrice: [{ required: true, message: this.$t('ground.qingsrjg'), trigger: "blur" }],
         marketPrice: [
-          { required: true, message: "请输入市场价格", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingsrscjg'), trigger: "blur" }
         ],
         state: [
-          { required: true, message: "请选择商品类型", trigger: "change" }
-        ],
-        tradeMoneyReq: [
-          { required: true, message: "交易金额要求", trigger: "blur" }
-        ],
-        tradePeopleReq: [
-          { required: true, message: "交易人头数要求", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingxzsplx'), trigger: "change" }
         ],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
-        storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
       },
       //上传的文件数组
       DiningImageArray: [],
@@ -478,7 +466,7 @@ export default {
       this.UploadSelfFileT(path, newArr, x => {
         //统一图片处理
         if (this.DiningImageArray.length === 5) {
-          return this.$message.error('最多上传5张图片')
+          return this.$message.error(this.$t('ground.zuiduoscwz'))
         }
         var obj = {}
         var str = x.data.FilePath;
@@ -541,7 +529,7 @@ export default {
       });
     },
     addIntegralMall: function() {
-      if (this.addMsg.CategoryId == '') return  this.$message.error('请选择商品分类')
+      if (this.addMsg.CategoryId == '') return  this.$message.error(this.$t('ground.qingxzspfl'))
       this.addMsg.FlowImgList = this.DiningImageArray
       this.apipost("Shop_post_SetCommodityInfo", this.addMsg,
         res => { 

src/components/Buying/BuyingList.vue

@@ -22,7 +22,7 @@
         </li>
         <li>
           <span>
-            <em>商品类型</em>
+            <em>{{$t('MarketingActi.commType')}}</em>
             <el-select filterable v-model="msg.SellType">
               <el-option :label="$t('pub.unlimitedSel')" :value="0" key="0"></el-option>
               <el-option v-for="item in CommodityTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
@@ -31,7 +31,7 @@
         </li>
         <li>
           <span>
-            <em>商品分类</em>
+            <em>{{$t('ground.shangpinfl')}}</em>
             <el-select filterable v-model="msg.CategoryId">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
               <el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
@@ -43,10 +43,10 @@
             <em>{{$t('admin.admin_status')}}</em>
             <el-select filterable v-model="msg.Status">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></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="取消" :value="4"></el-option>
+              <el-option :label="$t('visa.v_dwanshan')" :value="1"></el-option>
+              <el-option :label="$t('Operation.Op_shangjia')" :value="2"></el-option>
+              <el-option :label="$t('Operation.Op_xiajia')" :value="3"></el-option>
+              <el-option :label="$t('pub.cancelBtn')" :value="4"></el-option>
             </el-select>
           </span>
         </li>
@@ -62,17 +62,17 @@
       <tr>
         <th width='80'>{{$t('MarketingActi.commNum')}}</th>
         <th>{{$t('MarketingActi.commName')}}</th>
-        <th>分类名称</th>
-        <th>类型名称</th>
-        <th>成本价</th>
-        <th>销售价</th>
-        <th>领队返佣</th>
-        <th>公司返佣</th>
-        <th>同行返佣</th>
-        <th>微途返佣</th>
-        <th>状态</th>
-        <th>操作人</th>
-        <th>操作时间</th>
+        <th>{{$t('ground.fenleimc')}}</th>
+        <th>{{$t('ground.leixingmc')}}</th>
+        <th>{{$t('ground.cbenjia')}}</th>
+        <th>{{$t('ground.xiaoshoujia')}}</th>
+        <th>{{$t('ground.lingduifany')}}</th>
+        <th>{{$t('ground.gongsifany')}}</th>
+        <th>{{$t('ground.tonghangfy')}}</th>
+        <th>{{$t('ground.weitufany')}}</th>
+        <th>{{$t('admin.admin_status')}}</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th>{{$t('hotel.table_operattime')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="item in dataList">
@@ -91,19 +91,19 @@
          <td>{{item.UpdateDate}}</td>
          <td  class="BuyingList">
           <el-button-group size="mini">
-            <el-tooltip class="item" effect="dark" content="修改" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
               <el-button type="primary" size="mini" class="iconfont icon-xiugai" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="上架" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('Operation.Op_shangjia')" placement="top">
               <el-button type="success" size="mini" class="iconfont icon-shangjia1" @click="setProS(3, item.Id)" v-if="item.Status === 2 || item.Status === 1"></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="下架" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('Operation.Op_shangjia')" placement="top">
               <el-button type="warning" size="mini" class="iconfont icon-xiajia1" @click="setProS(2, item.Id)" v-if="item.Status === 3"></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="价格" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('Operation.Op_price')" placement="top">
               <el-button type="warning" size="mini" class="iconfont icon-jiage" @click="setPrice(item.Id)"></el-button>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="取消" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top">
               <el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
             </el-tooltip>
           </el-button-group>

src/components/Buying/BuyingPrice.vue

@@ -31,13 +31,13 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>{{$t('MarketingActi.commName')}}</th>
-        <th>成本价</th>
-        <th>销售价</th>
-        <th>开始时间</th>
-        <th>结束时间</th>
-        <th>描述</th>
-        <th>操作人</th>
-        <th>操作时间</th>
+        <th>{{$t('ground.cbenjia')}}</th>
+        <th>{{$t('ground.xiaoshoujia')}}</th>
+        <th>{{$t('system.table_begTime')}}</th>
+        <th>{{$t('MarketingActi.endTime')}}</th>
+        <th>{{$t('system.label_info')}}</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th>{{$t('hotel.table_operattime')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="item in dataList">
@@ -51,7 +51,7 @@
          <td>{{item.UpdateDate}}</td>
          <td  class="BuyingList">
           <el-button-group size="mini">
-            <el-tooltip class="item" effect="dark" content="修改" placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
               <el-button type="primary" size="mini" class="iconfont icon-xiugai" @click="editPrice(item)"></el-button>
             </el-tooltip>
           </el-button-group>
@@ -60,39 +60,39 @@
     </table>
     <el-dialog
       custom-class="w400"
-      title="新增价格"
+      :title="$t('ground.xinzengjg')"
       :visible.sync="outerVisible"
       center
       :before-close="closeChangeMachie"
     >
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="140px">
-        <el-form-item label="成本价格" prop="CostPrice">
+        <el-form-item :label="$t('ground.chengbenjg')" prop="CostPrice">
           <el-input v-model="addMsg.CostPrice" class="w217"/>
         </el-form-item>
-        <el-form-item label="销售价格" prop="SellPrice">
+        <el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SellPrice">
           <el-input v-model="addMsg.SellPrice" class="w217"/>
         </el-form-item>
-        <el-form-item label="价格有效开始时间" prop="StartDate">
+        <el-form-item :label="$t('ground.jiageyouxkssh')" prop="StartDate">
           <el-date-picker
             v-model="addMsg.StartDate"
             type="date"
             value-format="yyyy-MM-dd"
             @change="regDate()"
             :picker-options="pickerOptions"
-            placeholder="选择日期">
+            :placeholder="$t('admin.admin_choDate')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="价格有效结束时间" prop="EndDate">
+        <el-form-item :label="$t('ground.jiageyouxjssj')" prop="EndDate">
           <el-date-picker
             v-model="addMsg.EndDate"
             type="date"
             :picker-options="pickerOptions"
             value-format="yyyy-MM-dd"
             @change="regDate(1)"
-            placeholder="选择日期">
+            :placeholder="$t('admin.admin_choDate')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="描述" prop="Description">
+        <el-form-item :label="$t('system.label_info')" prop="Description">
           <el-input v-model="addMsg.Description" class="w217"/>
         </el-form-item>
       </el-form>
@@ -135,19 +135,19 @@ export default {
       },
       rules: {
         Description: [
-          { required: true, message: "请输入描述信息", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingsrmsxx'), trigger: "blur" }
         ],
         CostPrice: [
-          { required: true, message: "请输入成本价格", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingsrcbjg'), trigger: "blur" }
         ],
         SellPrice: [
-          { required: true, message: "请输入销售价格", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingsrxsjg'), trigger: "blur" }
         ],
         StartDate: [
-          { required: true, message: "请选择开始时间", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingxuanzekssjs'), trigger: "blur" }
         ],
         EndDate: [
-          { required: true, message: "请选择结束时间", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingxuanzejssjs'), trigger: "blur" }
         ]
       },
       loading:false,
@@ -175,14 +175,14 @@ export default {
         if (this.addMsg.StartDate == '') return
         if (this.addMsg.StartDate > this.addMsg.EndDate) {
           this.addMsg.EndDate = ''
-          this.$message.error('结束时间必须大于开始时间')
+          this.$message.error(this.$t('ground.jieshusjbxdyks'))
         }
         return
       }
       if (this.addMsg.EndDate == '') return
       if (this.addMsg.StartDate > this.addMsg.EndDate) {
         this.addMsg.StartDate = ''
-        this.$message.error('开始时间必须小于结束时间')
+        this.$message.error(this.$t('ground.kaishisjbxxyjs'))
       }
     },
     handleCurrentChange(val){

src/components/Buying/BuyingType.vue

@@ -64,13 +64,13 @@
       <ul class>
         <li>
           <span>
-            <em>分类名称</em>
+            <em>{{$t('ground.fenleimc')}}</em>
             <el-input v-model="msg.Name" @keyup.enter.native="getList"></el-input>
           </span>
         </li>
         <li>
           <span>
-            <em>分类</em>
+            <em>{{$t('ground.fenlei')}}</em>
             <el-select filterable v-model="msg.ParentId">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1" :key="-1"></el-option>
               <el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
@@ -93,12 +93,12 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th width="120px">{{$t('MarketingActi.typeNum')}}</th>
-        <th>分类名称</th>
-        <th>图片</th>
-        <th>上级名称</th>
-        <th>是否首页展示</th>
-        <th>操作人</th>
-        <th>操作时间</th>
+        <th>{{$t('ground.fenleimc')}}</th>
+        <th>{{$t('system.label_img')}}</th>
+        <th>{{$t('ground.shangjimingc')}}</th>
+        <th>{{$t('ground.shifousyzs')}}</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th>{{$t('hotel.table_operattime')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="item in dataList">
@@ -111,7 +111,7 @@
           {{item.ParentName}}
         </td>
         <td>
-          {{item.IsShowIndex === 1 ? "是" : "否"}}
+          {{item.IsShowIndex === 1 ? $t('fnc.yes') : $t('fnc.yes')}}
         </td>
         <td>{{item.UpdateBy}}</td>
         <td>{{item.UpdateDate}}</td>
@@ -119,17 +119,17 @@
           <el-tooltip
             class="item"
             effect="dark"
-            content="修改"
+            :content="$t('pub.updateMsg')"
             placement="top"
           >
             <el-button
               type="primary"
               icon="el-icon-edit"
               circle
-              @click="outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
+              @click="outerVisible=true,dialogTitle=$t('ground.xiugaishangplx'),updateData(item)"
             ></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
 						<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
 					</el-tooltip>
         </td>
@@ -152,16 +152,16 @@
         <el-form-item :label="$t('MarketingActi.commTypename')" prop="Name">
           <el-input v-model="addMsg.Name" class="w217"/>
         </el-form-item>
-        <el-form-item label="所属上级" prop="state">
+        <el-form-item :label="$t('ground.suoshusj')" prop="state">
           <el-select filterable v-model="addMsg.ParentId" prop="ParentId" @change="changeParentId">
-          <el-option label="一级" :value="0"></el-option>
+          <el-option :label="$t('fnc.yiji')" :value="0"></el-option>
             <el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="排序" prop="name">
+        <el-form-item :label="$t('ground.table_rank')" prop="name">
           <el-input v-model="addMsg.Sort" class="w217"/>
         </el-form-item>
-        <el-form-item label="首页显示" prop="state" v-if="addMsg.ParentId == 0">
+        <el-form-item :label="$t('ground.shifousyzs')" prop="state" v-if="addMsg.ParentId == 0">
           <el-select filterable v-model="addMsg.IsShowIndex">
             <el-option :label="$t('system.table_isShows')" :value="1"></el-option>
             <el-option :label="$t('MarketingActi.notShow')" :value="2"></el-option>
@@ -231,10 +231,10 @@ export default {
       GoodsTypeList: [],
       rules: {
         Name: [
-          { required: true, message: "商品类型名称", trigger: "blur" }
+          { required: true, message: this.$t('ground.shangpinlxmc'), trigger: "blur" }
         ],
         Image: [
-          { required: true, message: "请上传图片", trigger: "blur" }
+          { required: true, message: this.$t('ground.qingshangctp'), trigger: "blur" }
         ]
       },
       loading: false,
@@ -263,9 +263,9 @@ export default {
     },
     // 删除
     Delete(item) {
-      this.$confirm("是否删除"+ item.Name+"? 删除后不可恢复", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$confirm(this.$t('tips.shifoushanchu'), "提示", {
+        confirmButtonText: this.$t('pub.sureBtn'),
+        cancelButtonText: this.$t('pub.cancelBtn'),
         type: "warning"
       })
         .then(() => {

src/components/FinancialModule/ReportForm/AirTicketLoss.vue

@@ -125,18 +125,26 @@ export default {
  
     },mounted(){
         //默认查询当月第一个到最后一天日期
-        var now = new Date();
-        var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1
-        var year = now.getFullYear();
-        var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
-        var oneDay = 1000 * 24 * 60 * 60;
-        var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
-        if(month<10){
-            month='0'+month;
+        if(this.$route.query.startDate && this.$route.query.endDate){
+            let startDate=this.$route.query.startDate;
+            let endDate=this.$route.query.endDate;
+            this.value1.push(startDate,endDate);
+        }else{
+            var now = new Date();
+            var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1
+            var year = now.getFullYear();
+            var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
+            var oneDay = 1000 * 24 * 60 * 60;
+            var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
+            if(month<10){
+                month='0'+month;
+            }
+            let startDate = [year,month,1].join('-');
+            let endDate = [year,month,monthLast].join('-');
+            this.value1.push(startDate,endDate);
+
         }
-        var startDate = [year,month,1].join('-');
-        var endDate = [year,month,monthLast].join('-');
-        this.value1.push(startDate,endDate);
+        
         this.getList();
     }
 }

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -868,6 +868,7 @@ export default {
       }else{
         endDate=that.year+"-"+column.end
       }
+      
       if(rowIndex<9){
         // 联运收入
         if(rowData.ZhaiYao=="联运收入"){
@@ -913,6 +914,9 @@ export default {
           }
           
         }
+        else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
+          that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
+        }
         else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
         } 

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -137,7 +137,7 @@
         <div class="cm_content">
             <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loadingTable">
                 <tr>
-                    <th><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()"/></th>
+                    <th width="60"><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()"/></th>
                     <th>{{$t('system.query_company')}}</th>
                     <th>{{$t('fnc.danhao')}}</th>
                     <th>{{$t('fnc.a_zhaiyao')}}</th>
@@ -455,8 +455,10 @@ export default {
   },methods:{
     //选择付款对象出现全选框
     getClientId(id){
-      if(id>0){
+      if(id>0||this.AccountId>0){
         this.isShowCheckAll=true;
+      }else{
+        this.isShowCheckAll=false;
       }
     },
     Export(){
@@ -492,6 +494,11 @@ export default {
                     AccountId:this.AccountId
                 }
             )
+            if(this.AccountId>0||this.msg.ClientID>0){
+                this.isShowCheckAll=true;
+            }else{
+                this.isShowCheckAll=false;
+            }
         },
         financeinfo_post_GetClientAccountList(){  //获取付款对象
             let msg = {
@@ -859,7 +866,7 @@ export default {
             })
           }
           this.DataList.forEach((x,index)=>{
-            if(x.check){
+            if(x.check&&x.ClientID>0){
               this.checkList[index] = {
                 FinanceId:x.FinanceId,
                 Type:x.Type,

src/components/LeaderManagement/leaderReimbursement.vue

@@ -928,8 +928,7 @@
           Obj: {},
           SourceID: 0,
           TCIDList: TCIDARR,
-          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this
-            .$routequery.id,
+          TravelReplenish:  this.$route.query.id,
           OtherType: 1
         }
         this.$router.push({
@@ -946,8 +945,7 @@
       getzhuijiaList() {
         this.apipost(
           'Financial_post_GetTravelFinanceReplenishList', {
-            TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route
-              .query.id
+            TravelReplenish:  this.$route.query.id
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -1004,6 +1002,7 @@
           CurrencyId: leadr.CurrencyId,
         }
         let id = [];
+        console.log("nowLineId:"+obj.LineId+"old:"+ this.LineId);
         if (obj.LineId == this.LineId) {
           id = [98, 99]
         } else {
@@ -1215,6 +1214,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let nav = res.data.data.list;
+            this.LineId = res.data.data.EntryId
             if (nav[0].OutBranchId == 1216) {
               this.IsShowRMB = true;
             }
@@ -1324,7 +1324,7 @@
       this.isUpdate = this.$route.query.isUpdate;
       this.msg.TCIDs = this.$route.query.id;
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
-      this.LineId = this.$route.query.lineId ? this.$route.query.lineId : 0
+     
       if (this.$route.query.OutBranchId == 1216) {
         this.IsShowRMB = true;
       }

src/components/SalesModule/groupTourOrder.vue

@@ -1802,7 +1802,7 @@
                         <span v-else>{{$t('salesModule.LossReceipt')}}</span>
                       </div>
                       <!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
-                      <div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
+                      <div v-if='(item.confirmFileList.length>0||item.contractNum.length>0) && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'
                         @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>{{$t('salesModule.ApplyInvoice')}}</div>
                       <div
                         @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice  = item.unit_Price'>

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -99,7 +99,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel()">
+          <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel(2)">
+           <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
           <input type="button" class="normalBtn" value="分房表下载" @click="exportExcel_singleRoom()">
           <input type="button" class="normalBtn" value="旅客名单下载" @click="exportExcel()">
         </li>
@@ -272,10 +273,11 @@
     },
     methods: {
       // 确认酒店
-      querenHotel: function () {
+      querenHotel: function (OpSureHouse) {
         this.apipost(
           "travel_get_UpdateOpSureHouse", {
-            TCID: this.TCID
+            TCID: this.TCID,
+            OpSureHouse:OpSureHouse
           },
           res => {
             if (res.data.resultCode == 1) {

src/components/activity/CouponList.vue

@@ -127,14 +127,13 @@
         <th>{{$t('system.query_type')}}</th>
         <th>{{$t('active.cl_sytiaojian')}}</th>
         <th>{{$t('active.cl_miane')}}</th>
-        <!-- <th>使用状态</th> -->
         <th>{{$t('active.cl_djshiyong')}}</th>
         <th>{{$t('active.cl_sxriqi')}}</th>
         <th>{{$t('active.cl_sxzhuangtai')}}</th>
         <th>{{$t('active.cl_gqriqi')}}</th>
         <th>{{$t('MarketingActi.usingRange')}}</th>
         <th>{{$t('admin.admin_status')}}</th>
-        <th>{{$t('active.cl_addPp')}}</th>
+        <th>是否结束</th>
         <th>{{$t('MarketingActi.huangoujia')}}</th>
         <th>{{$t('MarketingActi.huodongtime')}}</th>
         <th>{{$t('hotel.hotel_remark')}}</th>
@@ -176,7 +175,10 @@
           <span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
           <span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
         </td>
-        <td>{{item.createUserName}}</td>
+        <td>
+          <span v-if="item.activityIsEnding=='0'">未结束</span>
+          <span v-if="item.activityIsEnding=='1'">已结束</span>
+        </td>
         <td>{{item.redemptionPrice}}</td>
         <td>
             <p>{{$t('system.table_begTime')}}：{{item.activityStartDate}}</p>
@@ -227,6 +229,12 @@
                   @click="updateKucundialog=true"
                   ></el-button>
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="修改" placement="top">
+                  <el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;"
+                  @click="outerVisible=true,EditItem(item)"
+                  ></el-button>
+            </el-tooltip>
+            
 
           <!-- </el-button-group> -->
         </td>
@@ -508,13 +516,17 @@ export default {
       QLineTeamList: [],
       upDateKcMsg:{
         number:''
-      }
+      },
+      EditBtn:false,
     };
   },
   mounted() {
     let userInfo = this.getLocalStorage();
     this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
     this.msg.branchId = userInfo.RB_Branch_id; //公司 
+    if(userInfo.EmployeeId==6115){
+      this.EditBtn=true;
+    }
     this.getList();
     this.getCompany();
     this.getLineList();
@@ -523,6 +535,9 @@ export default {
   },
 
   methods: {
+    EditItem(item){
+      this.addMsg=Object.assign({},item);
+    },
     //点击确定修改库存
     sureUpdatekucun(){
       this.apiJavaPost("/api/appActivity/updateCouponStock", this.upDateKcMsg, res => {
@@ -542,11 +557,7 @@ export default {
         this.getCompanyMsg,
         res => {
           if (res.data.resultCode == 1) {
-            if (this.outerVisible) {
               this.layerCompanyList = res.data.data;
-            } else {
-              this.companyList = res.data.data;
-            }
           } else {
           }
         },

src/components/administrative/CommissionDetail.vue

 <template>
-  <div class="commissionDetails-box">
+  <div class="commissionDetails commissionDetails-box">
     <div class="query-box">
       <ul>
         <li>
@@ -206,10 +206,12 @@ export default {
         columnAlign: "left",
         isResize: true,
         width: 80,
-        result: "",
-        filterMultiple: false,
-        filters: [{}],
-        type: "text"
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          if(rowData.leaveStr&&rowData.leaveStr!='')
+          return `<div>${rowData.createByStr}<span style="color:red;display:inline-block">(${rowData.leaveStr})</span></div>`
+          else
+          return `<div>${rowData.createByStr}</div>`
+        }
       };
       let commissionMoney = {
         field: "commissionMoney",
@@ -294,7 +296,7 @@ export default {
         width: 80,
         formatter: function(rowData, rowIndex, pagingIndex, field) {
           if(rowData.periods!=that.stringPerons)
-            return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -10px;padding-left: 10px;'>${rowData.periods}</div>`
+            return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>${rowData.periods}</div>`
           else
             return rowData.periods
         }
@@ -307,7 +309,14 @@ export default {
         isResize: true,
         width: 80,
         formatter: function(rowData, rowIndex, pagingIndex, field) {
-          return rowData.remark ? rowData.remark : ''
+          if(rowData.remark)
+          return `<div class="outDiv">
+          <div class="toolDiv">
+           <div class="triangle_border_up">
+          </div>${rowData.remark}</div>${rowData.remark}</div>`
+          else
+          return ''
+        
         }
       };
       let opera = {
@@ -437,7 +446,7 @@ export default {
   },
   created(){
       Vue.component('commission-table-operation',{
-      template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
+      template:`<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
       props:{
           rowData:{
               type:Object
@@ -461,7 +470,41 @@ export default {
 };
 </script>
 <style>
+.commissionDetails .triangle_border_up{
+    width:0;
+    height:0;
+    border-width:0 5px 5px;
+    border-style:solid;
+    border-color:transparent transparent #303133;/*透明 透明  灰*/
+    position:absolute;
+    top:-5px;
+}
+
+.commissionDetails .v-table-body-cell:hover .outDiv .toolDiv{
+  display: block;
+}
+.commissionDetails .v-table-body-cell{
+  overflow: initial;
+  cursor: pointer;
+}
+.commissionDetails .toolDiv{
+  position: absolute;
+  top: 25px;
+  background: #303133;
+  color: #fff;
+  z-index: 20000;
+  padding: 4px 15px;
+  max-width: 220px;
+  white-space: normal;
+  border-radius: 4px;
+  word-wrap:break-word;
+  display: none;
 
+}
+.commissionDetails .outDiv{
+  position: relative;
+
+}
 .commissionDetails-box .el-button.is-circle{padding: 5px !important;}
 .commissionDetails-box .v-table-body-cell span {
     display: block;

src/components/administrative/CommissionManagement.vue

@@ -20,7 +20,7 @@
         </li>
       </ul>
     </div>-->
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+    <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>期数</th>
         <th v-if="userInfo.RB_Branch_id==0 || userInfo.RB_Branch_id==49">提成总金额</th>
@@ -58,10 +58,10 @@
             ></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="制单" placement="top">
-            <el-button
+            <el-button v-if="btnShow"
               type="primary"
               class="CM_look"
-              @click="generalFinancacls(item.branchMoney)"
+              @click="generalFinancacls(item)"
               icon="el-icon-plus"
               title="制单"
               circle
@@ -95,12 +95,18 @@ export default {
       dataList: [],
       total: 0,
       currentPage: 1,
-      userInfo: {}
+      userInfo: {},
+      btnShow:false,
     };
   },
   mounted() {
     this.getList();
     this.userInfo = this.getLocalStorage();
+    let userInfo = this.getLocalStorage();
+    let ActionMenuCode=userInfo.ActionMenuCode;
+      if(ActionMenuCode.indexOf('CommissionVoucher')!=-1){
+        this.btnShow=true;
+      }
   },
   methods: {
     handleCurrentChange(val) {
@@ -169,10 +175,14 @@ export default {
         null
       );
     },
-    generalFinancacls(money){
+    generalFinancacls(item){
+      if(item.financialsArray&&item.financialsArray.length>0){
+        this.Error("请不要多次制单！")
+        return;
+      }
       let obj = {
         CostType: 16,
-        Money: money,
+        Money: item.branchMoney,
         CurrencyId: 1,
         XSTC: 1,
       }

src/components/commonPage/commonHotelInfo.vue

@@ -59,7 +59,7 @@
         <template v-for="(hotelItem,index) in  HotelObj">
           <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
             <td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
-              {{hotelItem.UseDay}}
+              {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
             </td>
             <td style="text-align:left;padding-left:3px;">
               <template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
@@ -221,6 +221,15 @@
         this.Confirm(str, function () {
           that.$emit('SetShouPeiShu');
         });
+      },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
       }
     },
     mounted() {}

src/components/leaderPay2.vue

@@ -1644,7 +1644,7 @@
                 Diningdest.push({
                   UseTimeStr: ai.UseTimeStr,
                   DiningID: ai.NewDiningID,
-                  id: ai.NewDiningID + ai.UseTimeStr,
+                  id: ai.NewDiningID + ai.UseTimeStr + ai.UseDinnerTypeStr,
                   data: [ai]
                 });
                 Diningmap[ai.UseTimeStr] = ai;
@@ -1663,7 +1663,7 @@
                   Diningdest.push({
                     UseTimeStr: ai.UseTimeStr,
                     DiningID: ai.NewDiningID,
-                    id: ai.NewDiningID + ai.UseTimeStr,
+                    id: ai.NewDiningID + ai.UseTimeStr  + ai.UseDinnerTypeStr,
                     data: [ai]
                   });
                 }

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -872,7 +872,7 @@
         <template v-for="(subItem,subIndex) in  priceData.PriceHotelList">
           <tr v-for="(childItem,childIndex) in subItem.SubList">
             <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
-              {{subItem.UseDay}}</td>
+              {{subItem.UseDay}}&nbsp;({{getDayByDate(subItem.UseDay)}})</td>
             <td style="text-align:left;padding-left:3px;">
               {{childItem.HotelName}}
             </td>
@@ -1775,6 +1775,15 @@
           );
         });
       },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
+      }
     },
     mounted() {
       var dateObj = this.$calendarUtils.getCurrentDate();

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -787,7 +787,7 @@
     <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
       <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
         <tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
-          <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
+          <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}&nbsp;({{getDayByDate(item.UseDay)}})</td>
           <td>
             <div class="tp_divList" v-for="(subItem,index) in item.SubList">
               <div>
@@ -1595,6 +1595,15 @@
             err => {}
           );
         }
+      },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
       }
     },
     mounted() {

src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue

@@ -873,7 +873,7 @@
         <template v-for="(subItem,subIndex) in  priceData.PriceHotelList">
           <tr v-for="(childItem,childIndex) in subItem.SubList">
             <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0" :rowspan="subItem.SubList.length">
-              {{subItem.UseDay}}</td>
+              {{subItem.UseDay}}&nbsp;({{getDayByDate(subItem.UseDay)}})</td>
             <td style="text-align:left;padding-left:3px;">
               {{childItem.HotelName}}
             </td>
@@ -1776,6 +1776,15 @@
           );
         });
       },
+      //根据日期返回星期几
+      getDayByDate(dateString){
+        if(dateString){
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]); 
+          return "日一二三四五六".charAt(date.getDay());
+        }
+      }
     },
     mounted() {
       var dateObj = this.$calendarUtils.getCurrentDate();

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -212,7 +212,7 @@
         </div>
         <div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix">
-            <div class="TC-leftTitle">温馨提醒111</div>
+            <div class="TC-leftTitle">温馨提醒</div>
             <div class="TC-rightContent">
               <!--<el-input type="textarea" v-model="dayObj.WarmTipObj.Description"></el-input>-->
               <my-edit v-on:edit-value="dayObj.WarmTipObj.Description = arguments[0]"
@@ -224,7 +224,7 @@
         </div>
         <div class="TC-warmTips TC-Comtitlediv TC-warmText" v-if="dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix">
-            <div class="TC-leftTitle">温馨提醒222</div>
+            <div class="TC-leftTitle">温馨提醒</div>
             <div class="TC-rightContent" v-html="dayObj.WarmTipObj.Description"></div>
           </div>
         </div>