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

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

@@ -660,6 +660,22 @@ export const obj = {
   lingduifany: '领队返佣',
   gongsifany: '公司返佣',
   tonghangfy: '同行返佣',
-  weitufany: '微途返佣'
+  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

@@ -660,6 +660,22 @@ leixingmc: '類型名稱',
 lingduifany: '領隊返傭',
 gongsifany: '公司返傭',
 tonghangfy: '同行返傭',
-weitufany: '微途返傭'
+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/BuyingPrice.vue

@@ -33,11 +33,11 @@
         <th>{{$t('MarketingActi.commName')}}</th>
         <th>{{$t('ground.cbenjia')}}</th>
         <th>{{$t('ground.xiaoshoujia')}}</th>
-        <th>开始时间</th>
-        <th>结束时间</th>
-        <th>描述</th>
-        <th>操作人</th>
-        <th>操作时间</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/LeaderManagement/leaderReimbursement.vue

@@ -694,7 +694,7 @@
     </table>
     <table border="0" cellspacing="1" class="leaderReimbursementTable">
       <tr>
-        <th :colspan="7">
+        <th :colspan="8">
           <span>追加团款</span>
         </th>
         <th :colspan="1" width="200">
@@ -707,6 +707,7 @@
         <th>单号</th>
         <th>所属公司</th>
         <th>单据类型</th>
+        <th>单据状态</th>
         <th>费用类型</th>
         <th>交易方式</th>
         <th>金额</th>
@@ -719,6 +720,8 @@
         </td>
         <td>{{item.BranchName}}</td>
         <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
+        <td>
+          <span style="color: red;">{{item.StatusStr}}</span>
         </td>
         <td>
           <template v-for="(s,si) in item.CostTypeList">
@@ -763,7 +766,7 @@
         </td>
       </tr>
       <tr v-if="!zhuijiaList.length">
-        <td colspan="8">暂无数据</td>
+        <td colspan="9">暂无数据</td>
       </tr>
     </table>
     <div v-if='picIsShow' class="viewBigPicLayer">
@@ -1004,7 +1007,6 @@
           CurrencyId: leadr.CurrencyId,
         }
         let id = [];
-        console.log("nowLineId:"+obj.LineId+"old:"+ this.LineId);
         if (obj.LineId == this.LineId) {
           id = [98, 99]
         } else {
@@ -1216,7 +1218,6 @@
         }, 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;
             }
@@ -1326,7 +1327,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;
       }