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

src/components/Buying/BuyingType.vue

@@ -231,13 +231,10 @@ export default {
       GoodsTypeList: [],
       rules: {
         Name: [
-          { required: true, message: "请输入会员等级", trigger: "blur" }
+          { required: true, message: "商品类型名称", trigger: "blur" }
         ],
         Image: [
           { required: true, message: "请上传图片", trigger: "blur" }
-        ],
-        ParentId: [
-          { required: true, message: "请上传图片", trigger: "change" }
         ]
       },
       loading: false,

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -889,8 +889,10 @@ export default {
                     this.shouxufei = res.data.data
                 }, err => {})
             } else {
-                this.msg.OriginalFee = 0
-                this.msg.Fee = 0
+                if (!this.$route.query.edit){
+                    this.msg.OriginalFee = 0
+                    this.msg.Fee = 0
+                }
             }
         },
         clearAccBank(){  // 选择账户类型清空数据

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -42,7 +42,7 @@
       <div class="query-box">
         <div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1">
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
-          <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
+          <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
         </div>
         <ul>
           <li>
@@ -444,7 +444,7 @@
                   </p>
                   <p>
                     <span>{{$t('visa.v_currentseat')}}</span>
-                    <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i> </p> <p>
+                    <i>{{item.SurplusSeat=(item.SurplusSeat<0) ? 0:item.SurplusSeat}}</i> </p> <p>
                         <span>{{$t('visa.v_yibaoru')}}</span>
                         <i>
                           {{item.OrderGuestNum}}
@@ -457,7 +457,7 @@
                   </p>
                   <p class="travelnowrap">
                     <span>{{$t('visa.v_houbu')}}</span>
-                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('Operation.v_yxhoubu')}}</span>
+                    <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
                     <span v-else class="TCL-redType">{{$t('Operation.v_byxhoubu')}}</span>
                   </p>
                   <p>
@@ -546,7 +546,7 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                   <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
-                  <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_childNobed')}}OP备注</el-button>
+                  <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">{{$t('Operation.Op_remark')}}</el-button>
                   <el-dropdown trigger="click">
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
@@ -580,7 +580,7 @@
               <div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
                 <div class="TCL_remarkTitle">{{$t('sm.biaoqian')}}：</div>
                 <div class="TCL_Content">
-                  <span v-for="chidItem in item.PriceTagList">{{chidItem.Content}}</span>
+                  <span v-for="(chidItem,childIndex) in item.PriceTagList" :key="childIndex">{{chidItem.Content}}</span>
                 </div>
               </div>
             </div>
@@ -1377,9 +1377,9 @@
       this.queryMsg.StartGroupDate = nowDate;
       if (
             this.queryCommonData.IsParentCompany != 1 &&
-            this.CurrentUserInfo.RB_Branch_id != 49
+            userInfo.RB_Branch_id != 49
         ) {
-            this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
+            this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
         }
       //默认查询全部团队状态
       this.$tripUtils.TeamStatesList.TeamStates.forEach(states=>{