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

src/components/SalesModule/MyCustomer.vue

@@ -492,6 +492,17 @@
               :key="item.Id"></el-option>
           </el-select>
         </span>
+      </li>
+       <li style="margin-left: 10px">
+        <span>
+          <em>VIP{{$t("admin.admin_status")}}：</em>
+         <el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable 
+          v-model="msg.IsVip"
+            @change="reSearchPage">
+            <el-option v-for="item in VipStatusList" :label="item.Name" :value="item.Id"
+              :key="item.Id"></el-option>
+          </el-select>
+        </span>
       </li>
       <li>
         <button class="hollowFixedBtn" @click="reSearchPage">{{$t('pub.searchBtn')}}</button>
@@ -532,6 +543,7 @@
           <th>{{$t('system.query_name')}}</th>
           <th>{{$t('restaurant.res_ContactNumber')}}</th>
           <th>{{$t('salesModule.storeName')}}</th>
+          <th>VIP</th>
           <th>{{$t('objFill.v102.appjihuozhuant')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Yuefang')}}</th>
           <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Visit')}}</th>
@@ -571,6 +583,10 @@
               {{$t('objFill.dai')}}{{item.departmentManagerStr}}{{$t('fnc.shenhe')}}
             </span>
           </td>
+          <td>
+            {{item.isVip==1?$t('fnc.yes'):$t('fnc.fou')}}
+          
+          </td>
           <td>
             <span :style="{'color':item.openIdStatus==1?'red':''}">
               {{ item.openIdStatus==1?$t('objFill.v102.yijihuo'):$t('objFill.v102.weijihuo') }}
@@ -1092,7 +1108,8 @@
           City: '-1',
           District: '-1',
           SigningType: 0,
-          OpenIdStatus: 0// 0-全部，1-已激活，2-未激活 
+          OpenIdStatus: 0,// 0-全部，1-已激活，2-未激活 
+          IsVip:-1,//1-是VIP
         },
         addMsg: {
           CustomerId: 0,
@@ -1262,6 +1279,11 @@
           { Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
           { Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
         ],
+        VipStatusList:[
+          { Name: this.$t('objFill.v101.activity.col3.t4'),Id: -1 },
+          { Name: this.$t('fnc.yes'),Id: 1 },
+          { Name: this.$t('fnc.fou'),Id: 0 },
+        ],
         customerStatus: 0,
       }
     },

src/components/SalesModule/customerTransfer.vue

@@ -130,6 +130,15 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+                <el-col :span="6">
+                <el-form-item label="VIP">
+                  <el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable 
+          v-model="msg.IsVip">
+            <el-option v-for="item in VipStatusList" :label="item.Name" :value="item.Id"
+              :key="item.Id"></el-option>
+          </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </li>
@@ -179,6 +188,7 @@
           <th width="14%">{{$t('salesModule.storeName')}}
             <!--<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>{{$t('salesModule.storeName')}}</label>-->
           </th>
+            <th width="3%">VIP</th>
           <th width="7%">激活状态</th>
           <th width="7%">{{$t('hotel.suplier_contact')}}</th>
           <th width="8%">{{$t('restaurant.res_ContactNumber')}}</th>
@@ -241,6 +251,10 @@
               </table>
               <span v-if="item.ExceptionCount > 0" slot="reference" class="yichangde" @click="yichangde(item)">异</span>
             </el-popover>
+          </td>
+           <td>
+            {{item.isVip==1?$t('fnc.yes'):$t('fnc.fou')}}
+          
           </td>
           <td>
             <span
@@ -477,6 +491,11 @@
         EnterTime: [],
         isSelLayer: false,
         layerShow: false,
+          VipStatusList:[
+          { Name: this.$t('objFill.v101.activity.col3.t4'),Id: -1 },
+          { Name: this.$t('fnc.yes'),Id: 1 },
+          { Name: this.$t('fnc.fou'),Id: 0 },
+        ],
         msg: {
           pageIndex: 1,
           pageSize: 14,
@@ -500,6 +519,7 @@
           OpenIdStatus: '',
           ActivateStartDate: '',
           ActivateEndDate: '',
+         IsVip:-1,//1-是VIP
         },
         RecipientMsg: {
           CustomerIdArr: [],