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

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -141,7 +141,7 @@
               </li>
               <li>
                   <em>期数</em>
-                  <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)" filterable>
+                  <el-select v-model="msg.PeriodsId" size="mini" @change="handleCurrentChange(1)" filterable>
                       <el-option label="不限" :value="-1"></el-option>
                       <el-option v-for="(item,index) in PeroidsList" :key="item.index" :label="item.Periods"
                           :value="item.ID"></el-option>
@@ -248,7 +248,7 @@
               msg: {
                   pageIndex: 1,
                   pageSize: 20,
-                  PeriodId: -1,
+                  PeriodsId: -1,
                   EmployeeId: -1,
                   RB_Department_Id: -1,//部门ID
                   RB_Branch_Id: -1,//公司ID
@@ -298,7 +298,7 @@
           let userInfo = this.getLocalStorage();
           let ActionMenuCode = userInfo.ActionMenuCode;
           
-          this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
+          this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
           this.msg.OutBranchId = this.$route.query.RB_Branch_Id>-1?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
           this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) 
           if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1

src/components/FinancialModule/OpCommission/OPcommissionPeriods.vue

@@ -91,7 +91,7 @@
               <td>
 
                   <el-tooltip class="item" effect="dark" content="查看明细" placement="top">
-                      <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.Id)"
+                      <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)"
                           icon="iconfont icon-chakan" circle></el-button>
                   </el-tooltip>
                   <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="提成制单" placement="top">
@@ -99,7 +99,7 @@
                           icon="iconfont icon-mui-icon-add" circle></el-button>
                   </el-tooltip>
                   <!-- <el-tooltip class="item" effect="dark" content="当期利润" placement="top">
-                      <el-button @click="goUrl('ImpressionCurrentProfit',item.Id,1)" type="danger" class="CM_look"
+                      <el-button @click="goUrl('ImpressionCurrentProfit',item.ID,1)" type="danger" class="CM_look"
                           icon="iconfont icon-money" circle></el-button>
                   </el-tooltip> -->
               </td>

src/components/SalesModule/groupTourOrder.vue

@@ -791,8 +791,9 @@
             <el-form-item :label="$t('fnc.ctleixing')" prop="GroupType">
               <el-select v-model="addMsg.GroupType" filterable :placeholder="$t('pub.pleaseSel')"
                 @change="gettypechange(addMsg.GroupType)">
+                <!-- v-if="item.Id != 5" -->
                 <el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id"
-                  v-if="item.Id != 5">
+                  >
                 </el-option>
               </el-select>
             </el-form-item>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1125,8 +1125,9 @@
             <el-form-item label="参团类型" prop="GroupType">
               <el-select v-model="addMsg.GroupType" filterable :placeholder="$t('pub.pleaseSel')"
                 @change="gettypechange(addMsg.GroupType)">
+                <!--  v-if="item.Id != 5" -->
                 <el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id"
-                  v-if="item.Id != 5">
+                 >
                 </el-option>
               </el-select>
             </el-form-item>

src/components/SalesModule/productQuery.vue

@@ -610,9 +610,9 @@
                 filterable
                 :placeholder="$t('pub.pleaseSel')"
               >
+              <!-- v-if="item.Id != 5" -->
                 <el-option
                   v-for="item in ctlxList"
-                  v-if="item.Id != 5"
                   :label="item.Name"
                   :value="item.Id"
                   :key="item.Id"

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1547,12 +1547,12 @@
                 :placeholder="$t('pub.pleaseSel')"
                 @change="gettypechange(addMsg.GroupType)"
               >
+              <!-- v-if="item.Id != 5" -->
                 <el-option
                   v-for="item in ctlxList"
                   :label="item.Name"
                   :value="item.Id"
                   :key="item.Id"
-                  v-if="item.Id != 5"
                 >
                 </el-option>
               </el-select>

src/components/orderCommon/order-form.vue

@@ -59,7 +59,8 @@
           <el-form-item :label="$t('fnc.ctleixing')" prop="GroupType">
             <el-select v-model="addMsg.GroupType" @change="changeGroupType(addMsg.GroupType)" filterable
               :placeholder="$t('pub.pleaseSel')">
-              <el-option v-for="item in joinTypeList" v-if="item.Id != 5" :label="item.Name" :value="item.Id"
+              <!--  v-if="item.Id != 5"  -->
+              <el-option v-for="item in joinTypeList":label="item.Name" :value="item.Id"
                 :key="item.Id">
               </el-option>
             </el-select>

src/components/orderCommon/order-form2.vue

@@ -120,9 +120,9 @@
               filterable
               :placeholder="$t('pub.pleaseSel')"
             >
+            <!-- v-if="item.Id != 5" -->
               <el-option
                 v-for="item in joinTypeList"
-                v-if="item.Id != 5"
                 :label="item.Name"
                 :value="item.Id"
                 :key="item.Id"

src/pubComponents/buyGroup.vue

@@ -30,7 +30,8 @@
             <el-form-item :label="$t('fnc.ctleixing')" prop="GroupType">
               <el-select v-model="addMsg.GroupType" @change="groupTypeChange(), gettypechange(addMsg.GroupType)"
                 filterable :placeholder="$t('pub.pleaseSel')">
-                <el-option v-for="item in ctlxList" v-if="item.Id != 5" :label="item.Name" :value="item.Id"
+                <!--  v-if="item.Id != 5" -->
+                <el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id"
                   :key="item.Id">
                 </el-option>
               </el-select>