更新

.env.staging

@@ -8,3 +8,6 @@ ENV = 'staging'
 
 # 若依管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
+
+# 图片基地址
+VUE_APP_IMG_URL = 'http://221.195.106.155:8090'

src/api/segchk/segchk_charge_card.js

@@ -10,9 +10,9 @@ export function listSegchk_charge_card(query) {
 }
 
 // 查询seg充值卡管理详细
-export function getSegchk_charge_card(providerId) {
+export function getSegchk_charge_card(cardTypeId) {
   return request({
-    url: '/segchk/segchk_charge_card/' + providerId,
+    url: '/segchk/segchk_charge_card/' + cardTypeId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateSegchk_charge_card(data) {
 }
 
 // 删除seg充值卡管理
-export function delSegchk_charge_card(providerId) {
+export function delSegchk_charge_card(cardTypeId) {
   return request({
-    url: '/segchk/segchk_charge_card/' + providerId,
+    url: '/segchk/segchk_charge_card/' + cardTypeId,
     method: 'delete'
   })
 }

src/api/segchk/segchk_comment_acc.js

@@ -36,9 +36,9 @@ export function updateSegchk_comment_acc(data) {
 }
 
 // 删除seg商家累积评价
-export function delSegchk_comment_acc(updateId) {
+export function delSegchk_comment_acc(updateIds) {
   return request({
-    url: '/segchk/segchk_comment_acc/' + updateId,
+    url: '/segchk/segchk_comment_acc/' + updateIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_district_info.js

@@ -36,9 +36,9 @@ export function updateSegchk_district_info(data) {
 }
 
 // 删除seg行政区域代码
-export function delSegchk_district_info(districtId) {
+export function delSegchk_district_info(districtIds) {
   return request({
-    url: '/segchk/segchk_district_info/' + districtId,
+    url: '/segchk/segchk_district_info/' + districtIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_keyword_lable.js

@@ -36,9 +36,9 @@ export function updateSegchk_keyword_lable(data) {
 }
 
 // 删除seg关键字管理
-export function delSegchk_keyword_lable(providerId) {
+export function delSegchk_keyword_lable(keywordIds) {
   return request({
-    url: '/segchk/segchk_keyword_lable/' + providerId,
+    url: '/segchk/segchk_keyword_lable/' + keywordIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_logion_detail.js

@@ -36,9 +36,9 @@ export function updateSegchk_logion_detail(data) {
 }
 
 // 删除seg登录记录
-export function delSegchk_logion_detail(loginId) {
+export function delSegchk_logion_detail(loginIds) {
   return request({
-    url: '/segchk/segchk_logion_detail/' + loginId,
+    url: '/segchk/segchk_logion_detail/' + loginIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_msg_detail.js

@@ -36,9 +36,9 @@ export function updateSegchk_msg_detail(data) {
 }
 
 // 删除seg消息记录
-export function delSegchk_msg_detail(msgId) {
+export function delSegchk_msg_detail(msgIds) {
   return request({
-    url: '/segchk/segchk_msg_detail/' + msgId,
+    url: '/segchk/segchk_msg_detail/' + msgIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_preference_lable.js

@@ -10,9 +10,9 @@ export function listSegchk_preference_lable(query) {
 }
 
 // 查询seg优惠管理详细
-export function getSegchk_preference_lable(providerId) {
+export function getSegchk_preference_lable(preferenceId) {
   return request({
-    url: '/segchk/segchk_preference_lable/' + providerId,
+    url: '/segchk/segchk_preference_lable/' + preferenceId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateSegchk_preference_lable(data) {
 }
 
 // 删除seg优惠管理
-export function delSegchk_preference_lable(providerId) {
+export function delSegchk_preference_lable(preferenceIds) {
   return request({
-    url: '/segchk/segchk_preference_lable/' + providerId,
+    url: '/segchk/segchk_preference_lable/' + preferenceIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_provider_cnt_ctrl.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询运营商流量管控列表
+export function listSegchk_provider_cnt_ctrl(query) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运营商流量管控详细
+export function getSegchk_provider_cnt_ctrl(cntId) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl/' + cntId,
+    method: 'get'
+  })
+}
+
+// 新增运营商流量管控
+export function addSegchk_provider_cnt_ctrl(data) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改运营商流量管控
+export function updateSegchk_provider_cnt_ctrl(data) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除运营商流量管控
+export function delSegchk_provider_cnt_ctrl(cntIds) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl/' + cntIds,
+    method: 'delete'
+  })
+}
+
+// 导出运营商流量管控
+export function exportSegchk_provider_cnt_ctrl(query) {
+  return request({
+    url: '/segchk/segchk_provider_cnt_ctrl/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/segchk/segchk_provider_mgt.js

@@ -35,10 +35,11 @@ export function updateSegchk_provider_mgt(data) {
   })
 }
 // 修改seg运营商管理
-export function updateSegchk_provider_service_state(providerId, flagId) {
+export function updateSegchk_provider_service_state(providerId, flagId, useSelfCardWithNovip) {
   const data = {
     providerId,
-    flagId
+    flagId,
+    useSelfCardWithNovip
   }
   return request({
     url: '/segchk/segchk_provider_mgt/status',
@@ -48,9 +49,9 @@ export function updateSegchk_provider_service_state(providerId, flagId) {
 }
 
 // 删除seg运营商管理
-export function delSegchk_provider_mgt(providerId) {
+export function delSegchk_provider_mgt(providerIds) {
   return request({
-    url: '/segchk/segchk_provider_mgt/' + providerId,
+    url: '/segchk/segchk_provider_mgt/' + providerIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_recommender_store.js

@@ -50,9 +50,9 @@ export function updateSegchk_recommender_state(recommenderId, mgtState) {
 }
 
 // 删除seg首页推荐商户
-export function delSegchk_recommender_store(recommenderId) {
+export function delSegchk_recommender_store(recommenderIds) {
   return request({
-    url: '/segchk/segchk_recommender_store/' + recommenderId,
+    url: '/segchk/segchk_recommender_store/' + recommenderIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_saler_info.js

@@ -50,9 +50,9 @@ export function updateSegchk_saler_status(providerId, salerId, salerState) {
 }
 
 // 删除seg销售人员信息
-export function delSegchk_saler_info(salerId) {
+export function delSegchk_saler_info(salerIds) {
   return request({
-    url: '/segchk/segchk_saler_info/' + salerId,
+    url: '/segchk/segchk_saler_info/' + salerIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_self_service_chk.js

@@ -36,9 +36,9 @@ export function updateSegchk_self_service_chk(data) {
 }
 
 // 删除seg自定义卡核消记录
-export function delSegchk_self_service_chk(chkServiceId) {
+export function delSegchk_self_service_chk(chkServiceIds) {
   return request({
-    url: '/segchk/segchk_self_service_chk/' + chkServiceId,
+    url: '/segchk/segchk_self_service_chk/' + chkServiceIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_service_chk.js

@@ -36,9 +36,9 @@ export function updateSegchk_service_chk(data) {
 }
 
 // 删除seg核消记录
-export function delSegchk_service_chk(chkServiceId) {
+export function delSegchk_service_chk(chkServiceIds) {
   return request({
-    url: '/segchk/segchk_service_chk/' + chkServiceId,
+    url: '/segchk/segchk_service_chk/' + chkServiceIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_service_comment.js

@@ -36,9 +36,9 @@ export function updateSegchk_service_comment(data) {
 }
 
 // 删除seg评价记录
-export function delSegchk_service_comment(commentId) {
+export function delSegchk_service_comment(commentIds) {
   return request({
-    url: '/segchk/segchk_service_comment/' + commentId,
+    url: '/segchk/segchk_service_comment/' + commentIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_sms_detail.js

@@ -36,9 +36,9 @@ export function updateSegchk_sms_detail(data) {
 }
 
 // 删除seg短信记录
-export function delSegchk_sms_detail(shortMsgId) {
+export function delSegchk_sms_detail(shortMsgIds) {
   return request({
-    url: '/segchk/segchk_sms_detail/' + shortMsgId,
+    url: '/segchk/segchk_sms_detail/' + shortMsgIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_account.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_account(data) {
 }
 
 // 删除seg商户余额信息
-export function delSegchk_store_account(accountId) {
+export function delSegchk_store_account(accountIds) {
   return request({
-    url: '/segchk/segchk_store_account/' + accountId,
+    url: '/segchk/segchk_store_account/' + accountIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_basic_info.js

@@ -1,5 +1,43 @@
 import request from '@/utils/request'
 
+// 删除VR信息
+export function deleteSegchk_store_vr_info(storeId) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/delete_vr/' + storeId,
+    method: 'delete'
+  })
+}
+
+// 添加VR信息
+export function editSegchk_store_cnt_info(query) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/update_count',
+    method: 'put',
+    data: query
+  })
+}
+
+// 添加VR信息
+export function addSegchk_store_vr_info(query) {
+  return request({
+    url: '/segchk/segchk_store_basic_info/add_vr',
+    method: 'put',
+    data: query
+  })
+}
+// 修改VR信息
+export function updateSegchk_store_vr_info(query) {
+  /*const data = {
+    query.providerId,
+    query.storeId,
+    query.vrPath
+  }*/
+  return request({
+    url: '/segchk/segchk_store_basic_info/update_vr',
+    method: 'put',
+    data: query
+  })
+}
 // 查询seg商家基础信息列表
 export function listSegchk_store_basic_info(query) {
   return request({
@@ -45,13 +83,7 @@ export function update_store_detail(data) {
 }
 
 // 修改seg商家基础服务状态
-export function updateSegchk_store_service_state(providerId, storeId, serviceState, withMsg) {
-  const data = {
-    providerId,
-    storeId,
-    serviceState,
-    withMsg
-  }
+export function updateSegchk_store_service_state(data) {
   return request({
     url: '/segchk/segchk_store_basic_info/service_state',
     method: 'put',
@@ -60,9 +92,9 @@ export function updateSegchk_store_service_state(providerId, storeId, serviceSta
 }
 
 // 删除seg商家基础信息
-export function delSegchk_store_basic_info(storeId) {
+export function delSegchk_store_basic_info(storeIds) {
   return request({
-    url: '/segchk/segchk_store_basic_info/' + storeId,
+    url: '/segchk/segchk_store_basic_info/' + storeIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_cash.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_cash(data) {
 }
 
 // 删除seg商户户提现记录
-export function delSegchk_store_cash(cashId) {
+export function delSegchk_store_cash(cashIds) {
   return request({
-    url: '/segchk/segchk_store_cash/' + cashId,
+    url: '/segchk/segchk_store_cash/' + cashIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_charge.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_charge(data) {
 }
 
 // 删除seg商户充值记录
-export function delSegchk_store_charge(chargeId) {
+export function delSegchk_store_charge(chargeIds) {
   return request({
-    url: '/segchk/segchk_store_charge/' + chargeId,
+    url: '/segchk/segchk_store_charge/' + chargeIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_chk_mgt.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_chk_mgt(data) {
 }
 
 // 删除seg商家核消卡管理
-export function delSegchk_store_chk_mgt(mgtId) {
+export function delSegchk_store_chk_mgt(mgtIds) {
   return request({
-    url: '/segchk/segchk_store_chk_mgt/' + mgtId,
+    url: '/segchk/segchk_store_chk_mgt/' + mgtIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_image.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_image(data) {
 }
 
 // 删除seg商家图片信息
-export function delSegchk_store_image(storeId) {
+export function delSegchk_store_image(storeIds) {
   return request({
-    url: '/segchk/segchk_store_image/' + storeId,
+    url: '/segchk/segchk_store_image/' + storeIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_lable_mgt.js

@@ -49,9 +49,9 @@ export function updateSegchk_store_lable_status(mgtId, mgtState) {
 }
 
 // 删除seg商家标签管理
-export function delSegchk_store_lable_mgt(mgtId) {
+export function delSegchk_store_lable_mgt(mgtIds) {
   return request({
-    url: '/segchk/segchk_store_lable_mgt/' + mgtId,
+    url: '/segchk/segchk_store_lable_mgt/' + mgtIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_reward.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_reward(data) {
 }
 
 // 删除seg商户奖励
-export function delSegchk_store_reward(rewardId) {
+export function delSegchk_store_reward(rewardIds) {
   return request({
-    url: '/segchk/segchk_store_reward/' + rewardId,
+    url: '/segchk/segchk_store_reward/' + rewardIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_security.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_security(data) {
 }
 
 // 删除seg商户密码
-export function delSegchk_store_security(pwdId) {
+export function delSegchk_store_security(pwdIds) {
   return request({
-    url: '/segchk/segchk_store_security/' + pwdId,
+    url: '/segchk/segchk_store_security/' + pwdIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_store_self_mgt.js

@@ -36,9 +36,9 @@ export function updateSegchk_store_self_mgt(data) {
 }
 
 // 删除seg商家自定义卡管理
-export function delSegchk_store_self_mgt(freeCardId) {
+export function delSegchk_store_self_mgt(freeCardIds) {
   return request({
-    url: '/segchk/segchk_store_self_mgt/' + freeCardId,
+    url: '/segchk/segchk_store_self_mgt/' + freeCardIds,
     method: 'delete'
   })
 }
@@ -51,3 +51,21 @@ export function exportSegchk_store_self_mgt(query) {
     params: query
   })
 }
+
+// 查询seg商家赠卡推广列表
+export function listSegchk_self_record(query) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/recordlist',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出seg商家赠卡推广列表
+export function exportSegchk_self_record(query) {
+  return request({
+    url: '/segchk/segchk_store_self_mgt/recordexport',
+    method: 'get',
+    params: query
+  })
+}

src/api/segchk/segchk_system_setting.js

@@ -36,9 +36,9 @@ export function updateSegchk_system_setting(data) {
 }
 
 // 删除系统设置
-export function delSegchk_system_setting(id) {
+export function delSegchk_system_setting(ids) {
   return request({
-    url: '/segchk/segchk_system_setting/' + id,
+    url: '/segchk/segchk_system_setting/' + ids,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_account.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_account(data) {
 }
 
 // 删除seg用户余额信息
-export function delSegchk_user_account(accountId) {
+export function delSegchk_user_account(accountIds) {
   return request({
-    url: '/segchk/segchk_user_account/' + accountId,
+    url: '/segchk/segchk_user_account/' + accountIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_basic_info.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_basic_info(data) {
 }
 
 // 删除seg用户基本信息
-export function delSegchk_user_basic_info(userId) {
+export function delSegchk_user_basic_info(userIds) {
   return request({
-    url: '/segchk/segchk_user_basic_info/' + userId,
+    url: '/segchk/segchk_user_basic_info/' + userIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_cash.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_cash(data) {
 }
 
 // 删除seg用户提现记录
-export function delSegchk_user_cash(cashId) {
+export function delSegchk_user_cash(cashIds) {
   return request({
-    url: '/segchk/segchk_user_cash/' + cashId,
+    url: '/segchk/segchk_user_cash/' + cashIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_certification_info.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_certification_info(data) {
 }
 
 // 删除seg用户实名认证信息
-export function delSegchk_user_certification_info(usercardId) {
+export function delSegchk_user_certification_info(usercardIds) {
   return request({
-    url: '/segchk/segchk_user_certification_info/' + usercardId,
+    url: '/segchk/segchk_user_certification_info/' + usercardIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_charge.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_charge(data) {
 }
 
 // 删除seg用户充值记录
-export function delSegchk_user_charge(chargeId) {
+export function delSegchk_user_charge(chargeIds) {
   return request({
-    url: '/segchk/segchk_user_charge/' + chargeId,
+    url: '/segchk/segchk_user_charge/' + chargeIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_collect.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_collect(data) {
 }
 
 // 删除seg用户收藏记录
-export function delSegchk_user_collect(collectId) {
+export function delSegchk_user_collect(collectIds) {
   return request({
-    url: '/segchk/segchk_user_collect/' + collectId,
+    url: '/segchk/segchk_user_collect/' + collectIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_ext_info.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_ext_info(data) {
 }
 
 // 删除seg用户扩展信息
-export function delSegchk_user_ext_info(userId) {
+export function delSegchk_user_ext_info(userIds) {
   return request({
-    url: '/segchk/segchk_user_ext_info/' + userId,
+    url: '/segchk/segchk_user_ext_info/' + userIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_likego.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_likego(data) {
 }
 
 // 删除seg用户想去记录
-export function delSegchk_user_likego(likegoId) {
+export function delSegchk_user_likego(likegoIds) {
   return request({
-    url: '/segchk/segchk_user_likego/' + likegoId,
+    url: '/segchk/segchk_user_likego/' + likegoIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_reward.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_reward(data) {
 }
 
 // 删除seg用户奖励
-export function delSegchk_user_reward(rewardId) {
+export function delSegchk_user_reward(rewardIds) {
   return request({
-    url: '/segchk/segchk_user_reward/' + rewardId,
+    url: '/segchk/segchk_user_reward/' + rewardIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_reward_ctl.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_reward_ctl(data) {
 }
 
 // 删除seg会员推荐控制
-export function delSegchk_user_reward_ctl(rewardCtlId) {
+export function delSegchk_user_reward_ctl(rewardCtlIds) {
   return request({
-    url: '/segchk/segchk_user_reward_ctl/' + rewardCtlId,
+    url: '/segchk/segchk_user_reward_ctl/' + rewardCtlIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_security.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_security(data) {
 }
 
 // 删除seg用户密码
-export function delSegchk_user_security(pwdId) {
+export function delSegchk_user_security(pwdIds) {
   return request({
-    url: '/segchk/segchk_user_security/' + pwdId,
+    url: '/segchk/segchk_user_security/' + pwdIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_vip.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_vip(data) {
 }
 
 // 删除seg会员卡
-export function delSegchk_user_vip(cardId) {
+export function delSegchk_user_vip(cardIds) {
   return request({
-    url: '/segchk/segchk_user_vip/' + cardId,
+    url: '/segchk/segchk_user_vip/' + cardIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_user_wechat.js

@@ -36,9 +36,9 @@ export function updateSegchk_user_wechat(data) {
 }
 
 // 删除seg用户微信信息
-export function delSegchk_user_wechat(userId) {
+export function delSegchk_user_wechat(userIds) {
   return request({
-    url: '/segchk/segchk_user_wechat/' + userId,
+    url: '/segchk/segchk_user_wechat/' + userIds,
     method: 'delete'
   })
 }

src/api/segchk/segchk_vip_record.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询seg用户充值记录列表
+export function listSegchk_vip_record(query) {
+  return request({
+    url: '/segchk/segchk_vip_record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出seg用户充值记录
+export function exportSegchk_vip_record(query) {
+  return request({
+    url: '/segchk/segchk_vip_record/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/segchk/segchk_vip_set_info.js

@@ -36,9 +36,9 @@ export function updateSegchk_vip_set_info(data) {
 }
 
 // 删除seg会员卡设置
-export function delSegchk_vip_set_info(modeId) {
+export function delSegchk_vip_set_info(modeIds) {
   return request({
-    url: '/segchk/segchk_vip_set_info/' + modeId,
+    url: '/segchk/segchk_vip_set_info/' + modeIds,
     method: 'delete'
   })
 }

src/components/ImageUpload/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="component-upload-image">
     <el-upload
+      :disabled="hideUpload"
       :action="uploadImgUrl"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
@@ -71,6 +72,11 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    // 是否显示提示
+    hideUpload: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/views/segchk/segchk_charge_card/index.vue

@@ -137,6 +137,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"></el-table-column>
       <el-table-column label="卡类型id" align="center" prop="cardTypeId"  sortable="custom" :sort-orders="['descending', 'ascending']"  :formatter="tableProviderName" :render-header="renderHeader" />
+<!--      <el-table-column label="卡类型id1" align="center" prop="cardTypeId"/>-->
 <!--      <el-table-column label="卡类型名称" align="center" prop="cardTypeName" :render-header="renderHeader" />-->
       <el-table-column label="卡面额" align="center" prop="cardTypeValue" :render-header="renderHeader" sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="有效期时长" align="center" prop="effectiveTime" :render-header="renderHeader"  sortable="custom" :sort-orders="['descending', 'ascending']" />

src/views/segchk/segchk_lable_mgt/index.vue

@@ -223,7 +223,7 @@
           <el-tooltip content="会员充值卡、关键字、优惠" placement="top">
             <i class="el-icon-question"></i>
           </el-tooltip>
-          <el-select v-model="form.lableFlag" placeholder="标签来源">
+          <el-select :disabled="change" v-model="form.lableFlag" placeholder="标签来源">
             <el-option
               v-for="dict in this.typeSelectOptions"
               :key="parseInt(dict.typeId)"
@@ -231,13 +231,14 @@
               :value="parseInt(dict.typeId)"
             ></el-option>
           </el-select>
+          <div v-if="change">如想修改请移步充值卡/关键字/优惠券管理页面修改</div>
         </el-form-item>
         <el-form-item label="标签名称" prop="cardTypeId">
 <!--          <el-input v-model="form.cardTypeId" placeholder="请输入卡类型名称(9.9,99,199,299)" />-->
           <el-tooltip content="会员充值卡、关键字、优惠中的一种具体名称" placement="top">
             <i class="el-icon-question"></i>
           </el-tooltip>
-          <el-select v-model="form.cardTypeId" placeholder="标签名称" @change="changecardTypeName">
+          <el-select :disabled="change" v-model="form.cardTypeId" placeholder="标签名称" @change="changecardTypeName">
             <el-option
               v-for="(dict,index) in getLabelComp(form.lableFlag, form.providerId)"
               :key="index"
@@ -245,6 +246,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
+          <div v-if="change">如想修改请移步充值卡/关键字/优惠券管理页面修改</div>
         </el-form-item>
 <!--        <el-form-item label="卡类型名称" prop="cardTypeName">-->
 <!--          <el-input v-model="form.cardTypeName"></el-input>-->
@@ -278,9 +280,12 @@
 <!--          <el-input v-model="form.sortId" placeholder="请输入展示序号" />-->
           <el-input-number v-model="form.sortId" controls-position="right" :min="0" placeholder="展示序号" :value="lableSort"/>
         </el-form-item>
+
         <el-form-item label="标签图标路径">
-          <ImageUpload v-model="form.iconUrl" :limit=1 :file-size=1  :uploadUrl="getLableUrl(form.lableFlag)"/>
+<!--          {{form.iconUrl}}-->
+          <ImageUpload :disabled="change" :hideUpload="change" v-model="form.iconUrl" :limit=1 :file-size=1  :uploadUrl="getLableUrl(form.lableFlag)"/>
         </el-form-item>
+        <div v-if="change">如想修改请移步充值卡/关键字/优惠券管理页面修改</div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -328,6 +333,9 @@ export default {
       segchk_lable_mgtList: [],
       // 弹出层标题
       title: "",
+
+      //针对修改的情况进行一定的保护，如对标签名称，图片等进行修改，则必须去相应充值卡管理，关键字管理，优惠券管理进行相应的修改，以保证一定程度的一致性。
+      change: false,
       // 是否显示弹出层
       open: false,
       // 修改时间时间范围
@@ -639,6 +647,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加seg首页标签管理";
+      this.change = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -648,6 +657,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改seg首页标签管理";
+        this.change = true;
       });
     },
     /** 提交按钮 */

src/views/segchk/segchk_provider_cnt_ctrl/index.vue

@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运营商id，全局唯一" prop="providerId">
+        <el-input
+          v-model="queryParams.providerId"
+          placeholder="请输入运营商id，全局唯一"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="浏览量,大于0表示生效" prop="browseCnt">
+        <el-input
+          v-model="queryParams.browseCnt"
+          placeholder="请输入浏览量,大于0表示生效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收藏次数,大于0表示生效" prop="collectCnt">
+        <el-input
+          v-model="queryParams.collectCnt"
+          placeholder="请输入收藏次数,大于0表示生效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预约次数，0无效，1有效" prop="bookCnt">
+        <el-input
+          v-model="queryParams.bookCnt"
+          placeholder="请输入预约次数，0无效，1有效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管理状态，0有效，1失效" prop="mgtState">
+        <el-input
+          v-model="queryParams.mgtState"
+          placeholder="请输入管理状态，0有效，1失效"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建或修改时间" prop="modTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.modTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建或修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_provider_cnt_ctrl:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_provider_cnt_ctrl:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_provider_cnt_ctrl:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_provider_cnt_ctrl:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_provider_cnt_ctrlList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="控制id" align="center" prop="cntId" />
+      <el-table-column label="运营商id，全局唯一" align="center" prop="providerId" />
+      <el-table-column label="浏览量,大于0表示生效" align="center" prop="browseCnt" />
+      <el-table-column label="收藏次数,大于0表示生效" align="center" prop="collectCnt" />
+      <el-table-column label="预约次数，0无效，1有效" align="center" prop="bookCnt" />
+      <el-table-column label="管理状态，0有效，1失效" align="center" prop="mgtState" />
+      <el-table-column label="创建或修改时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_provider_cnt_ctrl:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_provider_cnt_ctrl:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改运营商流量管控对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id，全局唯一" prop="providerId">
+          <el-input v-model="form.providerId" placeholder="请输入运营商id，全局唯一" />
+        </el-form-item>
+        <el-form-item label="浏览量,大于0表示生效" prop="browseCnt">
+          <el-input v-model="form.browseCnt" placeholder="请输入浏览量,大于0表示生效" />
+        </el-form-item>
+        <el-form-item label="收藏次数,大于0表示生效" prop="collectCnt">
+          <el-input v-model="form.collectCnt" placeholder="请输入收藏次数,大于0表示生效" />
+        </el-form-item>
+        <el-form-item label="预约次数，0无效，1有效" prop="bookCnt">
+          <el-input v-model="form.bookCnt" placeholder="请输入预约次数，0无效，1有效" />
+        </el-form-item>
+        <el-form-item label="管理状态，0有效，1失效" prop="mgtState">
+          <el-input v-model="form.mgtState" placeholder="请输入管理状态，0有效，1失效" />
+        </el-form-item>
+        <el-form-item label="创建或修改时间" prop="modTime">
+          <el-date-picker clearable size="small"
+            v-model="form.modTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSegchk_provider_cnt_ctrl, getSegchk_provider_cnt_ctrl, delSegchk_provider_cnt_ctrl, addSegchk_provider_cnt_ctrl, updateSegchk_provider_cnt_ctrl, exportSegchk_provider_cnt_ctrl } from "@/api/segchk/segchk_provider_cnt_ctrl";
+import store from "@/store";
+
+export default {
+  name: "Segchk_provider_cnt_ctrl",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 运营商流量管控表格数据
+      segchk_provider_cnt_ctrlList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        providerId: null,
+        browseCnt: null,
+        collectCnt: null,
+        bookCnt: null,
+        mgtState: null,
+        modTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        bookCnt: [
+          { required: true, message: "预约次数，0无效，1有效不能为空", trigger: "blur" }
+        ],
+        mgtState: [
+          { required: true, message: "管理状态，0有效，1失效不能为空", trigger: "blur" }
+        ]
+        /*,
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ]*/
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.isAdmin = store.getters.roles.includes('admin')
+    console.log("user role is : " + this.isAdmin)
+    this.getList();
+  },
+  methods: {
+    /** 查询运营商流量管控列表 */
+    getList() {
+      this.loading = true;
+      listSegchk_provider_cnt_ctrl(this.queryParams).then(response => {
+        this.segchk_provider_cnt_ctrlList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cntId: null,
+        providerId: null,
+        browseCnt: null,
+        collectCnt: null,
+        bookCnt: null,
+        mgtState: null,
+        modTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cntId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加运营商流量管控";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const cntId = row.cntId || this.ids
+      getSegchk_provider_cnt_ctrl(cntId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改运营商流量管控";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cntId != null) {
+            updateSegchk_provider_cnt_ctrl(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_provider_cnt_ctrl(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cntIds = row.cntId || this.ids;
+      this.$confirm('是否确认删除运营商流量管控编号为"' + cntIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_provider_cnt_ctrl(cntIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有运营商流量管控数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_provider_cnt_ctrl(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/segchk/segchk_provider_mgt/index.vue

@@ -66,6 +66,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="非会员能否使用赠卡" prop="useSelfCardWithNovip">
+        <el-select v-model="queryParams.useSelfCardWithNovip" placeholder="非会员能否使用赠卡" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.useSelfCardWithNovips"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="区县行政代码" prop="districtId">
         <el-select v-model="queryParams.districtId" placeholder="行政区" @keyup.enter.native="handleQuery">
           <el-option
@@ -165,7 +175,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="segchk_provider_mgtList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="segchk_provider_mgtList" @selection-change="handleSelectionChange" @cell-dblclick="tableDbEdit">
       <el-table-column type="selection" width="55" align="center" />
       <!--<el-table-column label="小程序的openid" align="center" prop="openid" />
       <el-table-column label="微信的联合登录id" align="center" prop="unionId" />-->
@@ -179,8 +189,7 @@
         </template>
       </el-table-column>
       <el-table-column label="手机号码" align="center" prop="phoneNo" />
-      <el-table-column label="状态" align="center" prop="flagId" >
-
+      <el-table-column label="状态" align="center" prop="flagId" width="90">
         <template slot-scope="scope">
 <!--          <el-switch-->
 <!--            v-model="scope.row.flagId"-->
@@ -188,7 +197,7 @@
 <!--            :inactive-value=1-->
 <!--            @change="handleMsgChange(scope.row)"-->
 <!--          ></el-switch>-->
-          <el-select v-model="scope.row.flagId" @change="handleStatusChange(scope.row)">
+          <el-select v-model="scope.row.flagId" @change="handleStatusChange(scope.row, 0)">
             <el-option
               v-for="dict in providerStatus"
               :key="parseInt(dict.key)"
@@ -198,6 +207,53 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column label="非会员能否使用赠卡" align="center" prop="useSelfCardWithNovip">
+        <template slot="header">
+          <el-tooltip class="item" content="在用户无有效会员卡时能否进行预约核销" effect="dark" placement="top-start">
+            <span><i class="el-icon-question"></i>非会员能否使用赠卡</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.useSelfCardWithNovip" @change="handleStatusChange(scope.row, 1)">
+            <el-option
+              v-for="dict in useSelfCardWithNovips"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="预约单有效时长" align="center" prop="bookLiveHour" >
+        <template slot="header">
+          <el-tooltip class="item" content="预约单能保留的时长，单位小时，0表示长期保留，双击可修改" effect="dark" placement="top-start">
+            <span><i class="el-icon-question"></i>预约单有效时长</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.bookLiveHour" v-if="showInput == `bookLiveHour${scope.row.bookLiveHour}`"
+                    @blur='blurInput(scope.row,"bookLiveHour",scope.row.bookLiveHour)' v-focus>
+          </el-input>
+          <p v-else>{{scope.row.bookLiveHour}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户商家赠卡数量" align="center" prop="canGiveSelf" >
+        <template slot="header">
+          <el-tooltip class="item" content="不允许商家给用户赠卡；单张：商家给单用户只有赠一张即单用户在单商家只能同时拥有一张赠卡；多张：商家可以给单用户多张赠卡" effect="dark" placement="top-start">
+            <span><i class="el-icon-question"></i>用户商家赠卡数量</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.canGiveSelf" @change="handleStatusChange(scope.row, 2)">
+            <el-option
+              v-for="dict in canGiveSelfs"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
       <el-table-column label="区县行政代码" align="center" prop="districtId"  :formatter="tableProviderName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -274,6 +330,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="非会员能否使用赠卡" prop="useSelfCardWithNovip">
+          <el-select v-model="form.useSelfCardWithNovip" >
+            <el-option
+              v-for="dict in useSelfCardWithNovips"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="区县行政代码" prop="districtId">
           <el-select v-model="form.districtId" >
             <el-option
@@ -402,6 +468,32 @@ export default {
           value:"删除"
         }
       ],
+      useSelfCardWithNovips:[
+        {
+          key: 0,
+          value:"否"
+        },
+        {
+          key: 1,
+          value:"能"
+        }
+      ],
+      canGiveSelfs:[
+        {
+          key: 0,
+          value:"不允许"
+        },
+        {
+          key: 1,
+          value:"单张"
+        },
+        {
+          key: 2,
+          value:"多张"
+        }
+      ],
+      showInput: "",
+      oldData: {},
       oldstatus: undefined,
       segchk_providerList: [],
       segchk_distctList: [],
@@ -446,26 +538,130 @@ export default {
     this.queryParams.providerId = store.getters.providerId || null
     this.getList();
   },
+  directives: {
+    // 通过自定义指令实现的表单自动获得光标的操作
+    focus: {
+      inserted: function(el) {
+        if (el.tagName.toLocaleLowerCase() == "input") {
+          el.focus()
+        } else {
+          if (el.getElementsByTagName("input")) {
+            el.getElementsByTagName("input")[0].focus()
+          }
+        }
+        el.focus()
+      }
+    },
+    focusTextarea: {
+      inserted: function(el) {
+        if (el.tagName.toLocaleLowerCase() == "textarea") {
+          el.focus()
+        } else {
+          if (el.getElementsByTagName("textarea")) {
+            el.getElementsByTagName("textarea")[0].focus()
+          }
+        }
+        el.focus()
+      }
+    }
+  },
   methods: {
+    handleHelp(h,{column}){
+      console.log('handleHelp %o', column);
+      return h('div',[
+        h('span', column.label),
+        h('el-tooltip',{undefined,
+            props:{undefined,
+              effect:'dark',
+              content:"死亡:点击可查看死亡信息;正常:点击更改人员生存状态",
+              placement:'top',
+            },
+          },
+          [h('i', {undefined,
+            class: 'el-icon-question'
+          })],
+          {content:"死亡:点击可查看死亡信息;正常:点击更改人员生存状态"})
+
+      ]);
+    },
+    /*
+    方法参数皆为框架方法的默认传参
+    row     行数据
+    column  被点击的触发了方法的单元格
+    event   事件
+    */
+    tableDbEdit(row, column, event) {
+      this.showInput = column.property + row.bookLiveHour
+      this.oldData[column.property] = row[column.property]
+    },
     recordStatus(row, index) {
       this.oldstatus=row.flagId
     },
-    // 修改状态
-    handleStatusChange(row, index) {
-      let text = row.flagId === 0 ? "上线" : row.flagId === 1 ? "下线" : "删除";
-      this.$confirm('确认要"' + text + '""' + row.nickName + '"运营商吗?', "警告", {
+    openEdit(row) {
+      row.edit = false;
+    },
+    handleStatusChangeV2(row, index) {
+      let text = row.flagId === 0 ? '确认要上线运营商"' + row.nickName + '"吗?' : row.flagId === 1 ? '确认要下线运营商"' + row.nickName + '"吗?' : '确认要删除运营商"' + row.nickName + '"吗?';
+      let text1 = row.useSelfCardWithNovip === 0 ? '确认要关闭运营商"' + row.nickName + '"下非会员的赠卡使用吗?' : '确认要打开运营商"' + row.nickName + '"下非会员的赠卡使用吗?';
+      let text2 = '确认要更新运营商"' + row.nickName + '"下所有商家赠卡功能吗?';
+      let text3 = '确认要更新运营商"' + row.nickName + '"预约单有效时长吗？';
+
+      updateSegchk_provider_mgt(row).then(response => {
+        this.form = response.data;
+        // this.segchkLableMgtList = response.data.segchkLableMgtList;
+        this.open = true;
+        this.title = "修改seg运营商管理";
+      });
+
+      this.$confirm(index === 0 ? text : index === 1 ? text1 : index === 2 ? text2 : text3, "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
         // return
-        return updateSegchk_provider_service_state(row.providerId, row.flagId);
+        return updateSegchk_provider_mgt(row);
       }).then((response) => {
         console.log(response)
-        this.msgSuccess(text + "成功");
+        this.msgSuccess("操作成功");
       }).catch(function(res) {
+        this.msgError("操作失败");
         // row.flagId = row.flagId === "0" ? "1" : "0";
       });
+      row.edit = true;
+    },
+    // 修改状态
+    handleStatusChange(row, index) {
+      let text = row.flagId === 0 ? '确认要上线运营商"' + row.nickName + '"吗?' : row.flagId === 1 ? '确认要下线运营商"' + row.nickName + '"吗?' : '确认要删除运营商"' + row.nickName + '"吗?';
+      let text1 = row.useSelfCardWithNovip === 0 ? '确认要关闭运营商"' + row.nickName + '"下非会员的赠卡使用吗?' : '确认要打开运营商"' + row.nickName + '"下非会员的赠卡使用吗?';
+      let text2 = '确认要更新运营商"' + row.nickName + '"下所有商家赠卡功能吗?';
+      let text3 = '确认要更新运营商"' + row.nickName + '"预约单有效时长吗？';
+      this.$confirm(index === 0 ? text : index === 1 ? text1 : index === 2 ? text2 : text3, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        // return
+        return updateSegchk_provider_mgt(row);
+      }).then((response) => {
+        console.log(response)
+        this.msgSuccess("操作成功");
+      }).catch(function(res) {
+        this.msgError("操作失败");
+        // row.flagId = row.flagId === "0" ? "1" : "0";
+      });
+      row.edit = true;
+    },
+    // 当input失去光标后进行的操作
+    async blurInput(row, name, value) {
+      let obj = {}
+      // 判断数据是否有所改变，如果数据有改变则调用修改接口
+      if (this.oldData[name] != value) {
+        obj[name] = value //被改变的数据
+        // 然后再写调用接口，提交内容的东西就可以了
+        console.log("===值改变了")
+        this.handleStatusChange(row, 3);
+      }
+      this.showInput = ""
     },
     tableProviderName(row, column) {
       if(column.property == 'providerId') {

src/views/segchk/segchk_self_record/index.vue

@@ -0,0 +1,508 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item v-if="queryParams.providerId == null || isAdmin" label="运营商" prop="providerId">
+        <el-select
+          v-model="queryParams.providerId"
+          placeholder="运营商id"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家" prop="storeId">
+        <el-select
+          v-model="queryParams.storeId"
+          placeholder="商家名称"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(-1, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="截止时间">
+        <el-date-picker
+          v-model="daterangeExpirationDate"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="用户id" v-if="isAdmin" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会员卡号id" v-if="isAdmin" prop="cardId">
+        <el-input
+          v-model="queryParams.cardId"
+          placeholder="请输入会员卡号id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="卡状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="卡状态"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.cardStatus"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_self_record:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_self_record:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_self_record:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_self_record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_store_self_mgtList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="providerId" />
+      <el-table-column label="赠卡id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="freeCardId" />
+      <el-table-column label="会员id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="userId" />
+      <el-table-column label="会员卡号id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="cardId" />
+      <el-table-column label="预约单id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="likegoId" />
+      <el-table-column label="创建时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="截止时间" align="center" prop="expirationDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expirationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家" align="center" prop="storeId" :formatter="tableGetName"/>
+      <el-table-column label="用户号码" align="center" prop="userPhone" />
+      <el-table-column label="权益次数" align="center" prop="freeCount" />
+      <el-table-column label="权益卡名称" align="center" prop="freeName" />
+      <el-table-column label="权益内容" align="center" prop="freeContent" />
+      <el-table-column label="剩余权益次数" align="center" prop="leftCount" />
+      <el-table-column label="状态，0正常，1过期" align="center" prop="status" :formatter="tableGetName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_self_record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_self_record:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listSegchk_self_record, exportSegchk_self_record } from "@/api/segchk/segchk_store_self_mgt";
+import store from "@/store";
+import {
+  segchk_get_provider_list,
+  segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+
+export default {
+  name: "Segchk_self_record",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg商家自定义卡管理表格数据
+      segchk_store_self_mgtList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+      daterangeExpirationDate: [],
+
+      // 增加对admin超级管理员角色判断
+      isAdmin: true,
+
+      segchk_providerList: [],
+      segchk_storeList: [],
+      cardStatus: [
+        {
+          key: 0,
+          value: "正常"
+        },
+        {
+          key: 1,
+          value: "失效"
+        },
+      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        freeCardId: null,
+        modTime: null,
+        expirationDate: null,
+        storeId: null,
+        providerId: null,
+        userId: null,
+        cardId: null,
+        lableId: null,
+        typeId: null,
+        freeCount: null,
+        freeName: null,
+        freeContent: null,
+        leftCount: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        lableId: [
+          { required: true, message: "标签id，只在优惠标签时有效不能为空", trigger: "blur" }
+        ],
+        typeId: [
+          { required: true, message: "标签来源id，0自定义卡，2优惠标签不能为空", trigger: "blur" }
+        ],
+        freeCount: [
+          { required: true, message: "权益次数不能为空", trigger: "blur" }
+        ],
+        freeName: [
+          { required: true, message: "权益卡名称不能为空", trigger: "blur" }
+        ],
+        freeContent: [
+          { required: true, message: "权益内容不能为空", trigger: "blur" }
+        ],
+        leftCount: [
+          { required: true, message: "剩余权益次数不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态，0正常，1过期不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.isAdmin = store.getters.roles.includes('admin')
+    this.tmpList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.key), value: e.value }
+            }) // 会员卡
+        }
+        else if(fromLableId == -1){
+          arr = this.segchk_storeList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.key), value: e.value }
+            }) // 商家列表
+        }
+        return arr
+      }
+    },
+  },
+  methods: {
+    // 获取各种列表
+    getSimpleList() {
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+    },
+    tableGetName(row, column) {
+      // console.log("tableProviderName --- " + row.property + "---" + column.property + "---" + column.index)
+
+      if (column.property == 'status'){
+
+        var ret = this.cardStatus.find((value) => {
+          return value.key == row.status})
+        var provName = ret == null ? "" : ret.value
+        return provName
+      }
+      if (column.property == 'storeId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.storeId
+        })
+        var provName = ret == null ? row.recommenderId : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg商家自定义卡管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      if (null != this.daterangeExpirationDate && '' != this.daterangeExpirationDate) {
+        this.queryParams.params["beginExpirationDate"] = this.daterangeExpirationDate[0];
+        this.queryParams.params["endExpirationDate"] = this.daterangeExpirationDate[1];
+      }
+      listSegchk_self_record(this.queryParams).then(response => {
+        this.segchk_store_self_mgtList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    async tmpList() {
+      await this.getSimpleList();
+      await this.getList();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        freeCardId: null,
+        modTime: null,
+        expirationDate: null,
+        storeId: null,
+        providerId: null,
+        userId: null,
+        cardId: null,
+        lableId: null,
+        typeId: null,
+        freeCount: null,
+        freeName: null,
+        freeContent: null,
+        leftCount: null,
+        status: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeModTime = [];
+      this.daterangeExpirationDate = [];
+      this.resetForm("queryForm");
+      this.queryParams.providerId = store.getters.providerId || null
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.freeCardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.reset();
+      this.open = true;
+      this.title = "添加seg商家自定义卡管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.reset();
+      const freeCardId = row.freeCardId || this.ids
+      getSegchk_store_self_mgt(freeCardId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg商家自定义卡管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.freeCardId != null) {
+            updateSegchk_store_self_mgt(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_store_self_mgt(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      const freeCardIds = row.freeCardId || this.ids;
+      this.$confirm('是否确认删除seg商家自定义卡管理编号为"' + freeCardIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_store_self_mgt(freeCardIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg商家自定义卡管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return listSegchk_self_record(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/segchk/segchk_store_basic_info/index.vue

@@ -86,6 +86,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="非会员能否使用赠卡" prop="useSelfCardWithNovip">
+        <el-select v-model="queryParams.useSelfCardWithNovip" placeholder="非会员能否使用赠卡" @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.useSelfCardWithNovips"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="销售" prop="salerId">
         <el-select v-model="queryParams.salerId" placeholder="销售" @keyup.enter.native="handleQuery">
           <el-option
@@ -278,8 +288,8 @@
 
     <el-table empty-text="loading" v-loading="loading" ref="tables" :default-sort="defaultSort" :data="segchk_store_basic_infoList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="运营商" align="center" prop="providerId" :formatter="tableProviderName"/>
-      <el-table-column label="商家" align="center" prop="storeId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="运营商" v-if="isAdmin" align="center" prop="providerId" :formatter="tableProviderName"/>
+      <el-table-column label="商家" v-if="isAdmin" align="center" prop="storeId"  sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="商家名称" align="center" prop="storeName"  show-overflow-tooltip/>
       <el-table-column label="商家电话" align="center" prop="storePhone" />
       <!--<el-table-column label="微信唯一识别号" align="center" prop="openid" />
@@ -296,14 +306,62 @@
             v-model="scope.row.serviceState"
             active-value="0"
             inactive-value="1"
-            @change="handleStatusChange(scope.row)"
+            @change="handleStatusChange(scope.row, 0)"
           ></el-switch>
         </template>
       </el-table-column>
 
       <el-table-column label="销售" align="center" prop="salerId"  :formatter="tableProviderName"  sortable="custom" :sort-orders="['descending', 'ascending']" width="100"/>
-
-      <el-table-column label="合同日期" align="center" prop="effectiveDate" sortable="custom" :sort-orders="['descending', 'ascending']"  width="180">
+      <el-table-column label="VR全景" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button
+            v-if="scope.row.vrPath === null"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAddVr(scope.row)"
+            v-hasPermi="['segchk:segchk_store_basic_info:add']"
+          >添加</el-button>
+          <el-button
+            v-if="scope.row.vrPath !== null"
+            size="mini"
+            type="text"
+            icon="el-icon-thumb"
+            @click="openVr(scope.row.vrPath)"
+          >查看</el-button>
+          <el-button
+            v-if="scope.row.vrPath !== null"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateVr(scope.row)"
+            v-hasPermi="['segchk:segchk_store_basic_info:edit']"
+          >修改</el-button>
+          <el-button
+            v-if="scope.row.vrPath !== null"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDeleteVr(scope.row)"
+            v-hasPermi="['segchk:segchk_store_basic_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="流量" align="center">
+        <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-thumb"
+            @click="showCntDiag(scope.row)"
+          >查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="流量1" align="center">
+        <template v-slot="scope">{{scope.row.segchkStoreCntCtrl.browseCnt}}
+        </template>
+      </el-table-column>
+      <el-table-column label="合同日期" align="center" prop="effectiveDate" sortable="custom" :sort-orders="['descending', 'ascending']"  width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.effectiveDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -319,10 +377,22 @@
             v-model="scope.row.withMsg"
             active-value="0"
             inactive-value="1"
-            @change="handleMsgChange(scope.row)"
+            @change="handleStatusChange(scope.row, 2)"
           ></el-switch>
         </template>
       </el-table-column>
+      <el-table-column label="非会员能否使用赠卡" align="center" prop="useSelfCardWithNovip" >
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.useSelfCardWithNovip" @change="handleStatusChange(scope.row, 1)">
+            <el-option
+              v-for="dict in useSelfCardWithNovips"
+              :key="parseInt(dict.key)"
+              :label="dict.value"
+              :value="parseInt(dict.key)"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="下线平均星评门限" align="center" prop="serviceDownThreshold" />
       <el-table-column label="是否人工干预，0自动，1人工" align="center" prop="stateFlag" />
       <el-table-column label="商家经度" align="center" prop="storeLon" />
@@ -333,7 +403,7 @@
           <div @click="show_details(scope.row)">{{scope.row.detail}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="创建或修改时间" align="center" prop="modTime"  sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+      <el-table-column label="创建或修改时间"  v-if="isAdmin" align="center" prop="modTime"  sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -366,6 +436,36 @@
       @pagination="getList"
     />
 
+<!--    商家流量对话框-->
+    <el-dialog :title="title" :visible.sync="showCnt" width="300px" append-to-body>
+      <el-form ref="cntForm" :model="cntForm" :rules="rules" label-width="80px">
+        <el-form-item label="浏览次数" prop="browseCnt">
+          <el-tooltip>
+            <div slot="content">{{ cntForm.browseCnt1 }}</div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="cntForm.browseCnt" />
+        </el-form-item>
+        <el-form-item label="收藏次数" prop="collectCnt">
+          <el-tooltip>
+            <div slot="content">{{ cntForm.collectCnt1 }}</div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="cntForm.collectCnt" />
+        </el-form-item>
+        <el-form-item label="预约次数" prop="bookCnt">
+          <el-tooltip>
+            <div slot="content">{{ cntForm.bookCnt1 }}</div>
+            <i class="el-icon-question"></i>
+          </el-tooltip>
+          <el-input v-model="cntForm.bookCnt" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitCnt">确 认</el-button>
+      </div>
+    </el-dialog>
+<!--    商家详情对话框-->
     <el-dialog :title="title" :visible.sync="detailopen" width="1000px" append-to-body>
       <editor v-model="showdetail.detail" :min-height="192"  :upload-url="store_details"/>
       <div slot="footer" class="dialog-footer">
@@ -373,6 +473,18 @@
       </div>
     </el-dialog>
 
+<!--    商家Vr信息对话框-->
+    <el-dialog :title="title" :visible.sync="vrdialog" width="300px" append-to-body>
+      <el-form ref="vrform" :model="vrform" :rules="rules" label-width="80px">
+        <el-form-item label="VR地址" prop="vrUrl">
+          <el-input v-model="vrform.vrUrl" placeholder="请输入商家VR地址信息" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitVr">修 改</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 添加或修改seg商家基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -777,7 +889,7 @@
 </template>
 
 <script>
-import { listSegchk_store_basic_info, getSegchk_store_basic_info, delSegchk_store_basic_info, addSegchk_store_basic_info, updateSegchk_store_basic_info, exportSegchk_store_basic_info, updateSegchk_store_service_state, update_store_detail } from "@/api/segchk/segchk_store_basic_info";
+import { listSegchk_store_basic_info, getSegchk_store_basic_info, delSegchk_store_basic_info, addSegchk_store_basic_info, updateSegchk_store_basic_info, exportSegchk_store_basic_info, updateSegchk_store_service_state, update_store_detail, addSegchk_store_vr_info, updateSegchk_store_vr_info, deleteSegchk_store_vr_info, editSegchk_store_cnt_info } from "@/api/segchk/segchk_store_basic_info";
 import {listSegchk_charge_card} from "@/api/segchk/segchk_charge_card";
 import {listSegchk_keyword_lable} from "@/api/segchk/segchk_keyword_lable";
 import {listSegchk_preference_lable} from "@/api/segchk/segchk_preference_lable";
@@ -835,6 +947,7 @@ export default {
       // 是否显示弹出层
       open: false,
 
+      showCnt: false,
       detailopen: false,
       showdetail: {
         storeId: null,
@@ -846,6 +959,11 @@ export default {
       // 创建或修改时间时间范围
       daterangeModTime: [],
       defaultSort: {prop: 'storeId', order: 'descending'},
+      // 增加对admin超级管理员角色判断
+      isAdmin: true,
+
+      // vr信息对话框
+      vrdialog: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -912,10 +1030,25 @@ export default {
             typeName:"优惠标签"
           }
       ],
+      useSelfCardWithNovips:[
+        {
+          key: 0,
+          value:"否"
+        },
+        {
+          key: 1,
+          value:"能"
+        }
+      ],
       storeStatus: [],
       sendMsgs: [],
       // 表单参数
       form: {},
+      cntForm: {},
+      oldcntForm: {},
+
+      vrform: {},
+      vract: undefined,
       // 表单校验
       rules: {
         providerId: [
@@ -964,6 +1097,9 @@ export default {
         ],
         detail: [
           { required: true, message: "商家描述详情不能为空", trigger: "blur" }
+        ],
+        vrUrl: [
+          { required: true, message: "VR路径不能为空", trigger: "blur" }
         ]
         /*,modTime: [
           { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
@@ -973,6 +1109,8 @@ export default {
   },
   created() {
     this.queryParams.providerId = store.getters.providerId || null
+    this.isAdmin = store.getters.roles.includes('admin')
+    console.log("user role is : " + this.isAdmin)
     this.tmpList()
   },
   computed:{
@@ -1048,9 +1186,108 @@ export default {
         }
         this.msgSuccess("修改成功");
         this.detailopen = false;
+        this.showCnt = false;
         this.getList();
       });
     },
+    resetCnt (){
+      this.cntForm = {
+        providerId: null,
+        storeId: null,
+        browseCnt:null,
+        browseCnt1:null,
+        collectCnt:null,
+        collectCnt1:null,
+        bookCnt:null,
+        bookCnt1:null
+      };
+      this.cntForm.providerId = store.getters.providerId || null;
+      this.resetForm("cntForm");
+      console.log('resetCnt %o', this.cntForm);
+
+      this.oldcntForm = {
+        providerId: null,
+        storeId: null,
+        browseCnt:null,
+        browseCnt1:null,
+        collectCnt:null,
+        collectCnt1:null,
+        bookCnt:null,
+        bookCnt1:null
+      };
+      this.oldcntForm.providerId = store.getters.providerId || null;
+      this.resetForm("oldcntForm");
+      console.log('resetCnt %o', this.oldcntForm);
+    },
+    submitCnt() {
+      // console.log('submitCnt with %o', this.cntForm);
+      // console.log('will submitCnt with %o', this.oldcntForm)
+      // return;
+      this.oldcntForm.browseCnt = this.oldcntForm.browseCnt == parseInt(this.cntForm.browseCnt) ?
+        this.cntForm.browseCnt1 : parseInt(this.cntForm.browseCnt);
+
+      this.oldcntForm.collectCnt = this.oldcntForm.collectCnt == parseInt(this.cntForm.collectCnt) ?
+        this.cntForm.collectCnt1 : parseInt(this.cntForm.collectCnt);
+
+      this.oldcntForm.bookCnt = this.oldcntForm.bookCnt == parseInt(this.cntForm.bookCnt) ?
+        this.cntForm.bookCnt1 : parseInt(this.cntForm.bookCnt);
+      // console.log('will submitCnt with %o', this.oldcntForm)
+      // return
+      editSegchk_store_cnt_info(this.oldcntForm).then(response => {
+        /*if (response.code != 200) {
+          this.msgError(response.msg)
+          return
+        }*/
+        this.msgSuccess("关闭查看");
+        this.showCnt = false;
+        this.cntForm = {};
+        this.oldcntForm = {};
+        this.resetVr();
+        this.getList();
+        this.resetCnt();
+      })
+
+    },
+    submitVr() {
+      this.$refs["vrform"].validate(valid => {if (valid) {
+        console.log('submitVr with %o', this.vrform);
+        if (this.vract == 1) {
+          addSegchk_store_vr_info(this.vrform).then(response => {
+            if (response.code != 200) {
+              this.msgError(response.msg)
+              return
+            }
+            this.msgSuccess("添加成功");
+            this.vrdialog = false;
+            this.resetVr();
+            this.getList();
+          });
+        } else if (this.vract == 2) {
+          updateSegchk_store_vr_info(this.vrform).then(response => {
+            if (response.code != 200) {
+              this.msgError(response.msg)
+              return
+            }
+            this.msgSuccess("修改成功");
+            this.vrdialog = false;
+            this.vrform = {};
+            this.getList();
+          });
+        } else if (this.vract == 3) {
+          deleteSegchk_store_vr_info(this.vrform).then(response => {
+            if (response.code != 200) {
+              this.msgError(response.msg)
+              return
+            }
+            this.msgSuccess("删除成功");
+            this.vrdialog = false;
+            this.vrform = {};
+            this.getList();
+          });
+        }
+
+      }});
+    },
     show_details(row) {
       this.showdetail.detail = row.detail
       this.showdetail.storeId = row.storeId
@@ -1123,17 +1360,36 @@ export default {
     },
     // 服务状态修改
     handleStatusChange(row, index) {
-      let text = row.serviceState === "0" ? "上线" : "下线并不在首页推荐";
-      this.$confirm('确认要"' + text + '""' + row.storeName + '"商家吗?', "警告", {
+
+      let text = row.serviceState === "0" ? '确认要上线商家"' + row.storeName + '"吗?' : '确认要下线并不在首页推荐商家"' + row.storeName + '"吗?';
+      let text1 = row.useSelfCardWithNovip === 0 ? '确认要关闭商家"' + row.storeName + '"非会员的赠卡使用功能吗?' : '确认要打开商家"' + row.storeName + '"非会员的赠卡使用功能吗?';
+      let text2 = row.withMsg === "0" ? '确定要开启向商家"' + row.storeName + '"发送消息' : '确定要开启向商家"' + row.storeName + '"禁发消息';
+
+      this.$confirm(index === 0 ? text : index === 1 ? text1 : text2, "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-
-        return updateSegchk_store_service_state(row.providerId, row.storeId, row.serviceState, null);
+        let providerId = row.providerId;
+        let storeId = row.storeId;
+        let serviceState = row.serviceState;
+        let withMsg = row.withMsg;
+        let useSelfCardWithNovip = row.useSelfCardWithNovip;
+        let stateFlag = row.stateFlag;
+        const data = {
+          providerId,
+          storeId,
+          serviceState,
+          withMsg,
+          stateFlag,
+          useSelfCardWithNovip
+        };
+        // console.log("handleStatusChange with %o", data)
+        return updateSegchk_store_service_state(data);
       }).then((response) => {
-        this.msgSuccess(text + "成功");
+        this.msgSuccess("操作成功");
       }).catch(function(res) {
+        this.msgError("操作失败")
         // console.log("updateSegchk_store_service_state res " + res)
         row.serviceState = row.serviceState === "0" ? "1" : "0";
       });
@@ -1236,6 +1492,7 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      console.log(this.segchk_store_basic_infoList);
     },
 
     async tmpList() {
@@ -1246,6 +1503,7 @@ export default {
     cancel() {
       this.open = false;
       this.detailopen = false;
+      this.showCnt = false;
       this.reset();
     },
     // 表单重置
@@ -1281,6 +1539,7 @@ export default {
       this.segchkStoreChkMgtList = [];
       this.segchkStoreLableMgtList = [];
       this.segchkStoreSecurityList = [];
+
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -1302,6 +1561,53 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    showCntDiag(row) {
+      this.title = "商家'" + row.storeName + "'流量"
+      this.cntForm = JSON.parse(JSON.stringify(row.segchkStoreCntCtrl));
+      this.oldcntForm = JSON.parse(JSON.stringify(row.segchkStoreCntCtrl));
+      // this.cntForm = row.segchkStoreCntCtrl;
+      // this.oldcntForm = row.segchkStoreCntCtrl;
+      // console.log('showCntDiag with %o\n%o', this.cntForm, this.oldcntForm);
+      this.showCnt = true;
+    },
+    openVr(vrUrl) {
+      window.open(vrUrl, '_blank');
+    },
+    handleAddVr(row) {
+      this.resetVr();
+      this.vrform.providerId = row.providerId
+      this.vrform.storeId = row.storeId
+      this.vract = 1
+      this.vrdialog = true
+      console.log('handleAddVr with %o %o', row, this.vrform)
+    },
+    handleUpdateVr(row) {
+      console.log('handleUpdateVr with %o', row);
+      this.resetVr();
+      this.vrform.providerId = row.providerId
+      this.vrform.storeId = row.storeId
+      this.vrform.vrUrl = row.vrPath
+      this.vract = 2
+      this.vrdialog = true
+    },
+    handleDeleteVr(row) {
+      this.resetVr();
+      let text = "删除";
+
+      this.$confirm('确认要"' + text + '"' + row.storeName + '"商家的VR链接吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+
+        return deleteSegchk_store_vr_info(row.storeId);
+      }).then((response) => {
+        this.getList();
+        this.msgSuccess(text + "成功");
+      }).catch(function(res) {
+        ;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       if(this.segchk_charge_cardList.length == 0){
@@ -1319,6 +1625,8 @@ export default {
       this.reset();
       this.open = true;
       this.detailopen = false;
+      this.showCnt = false;
+      this.vrdialog = false;
       this.title = "添加商家基础信息";
     },
     /** 修改按钮操作 */
@@ -1332,6 +1640,7 @@ export default {
         this.segchkStoreLableMgtList = response.data.segchkStoreLableMgtList;
         this.segchkStoreSecurityList = response.data.segchkStoreSecurityList;
         this.open = true;
+        this.vrdialog = false;
         this.title = "修改商家基础信息";
       });
     },
@@ -1353,6 +1662,7 @@ export default {
 
               this.msgSuccess("修改成功");
               this.open = false;
+              this.vrdialog = false;
               this.getList();
             });
           } else {
@@ -1363,6 +1673,7 @@ export default {
               }
               this.msgSuccess("新增成功");
               this.open = false;
+              this.vrdialog = false;
               this.getList();
             });
           }
@@ -1542,6 +1853,16 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
+    },
+    resetVr() {
+      this.vrform = {
+        providerId: null,
+        storeId: null,
+        vrUrl:null
+      };
+      this.vrform.providerId = store.getters.providerId || null;
+      this.resetForm("vrform");
+      console.log('resetVr %o', this.vrform);
     }
   },
 

src/views/segchk/segchk_store_lable_mgt/index.vue

@@ -210,7 +210,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标签来源" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="标签来源" >
+          <el-select :disabled="change" v-model="form.typeId" placeholder="标签来源" >
             <el-option
               v-for="dict in typeIds"
               :key="parseInt(dict.key)"
@@ -218,9 +218,10 @@
               :value="parseInt(dict.key)"
             ></el-option>
           </el-select>
+          <div v-if="change">如想修改请移步充值卡/关键字/优惠券管理页面修改</div>
         </el-form-item>
         <el-form-item label="标签id" prop="lableId">
-          <el-select v-model="form.lableId" placeholder="标签id" >
+          <el-select :disabled="change" v-model="form.lableId" placeholder="标签id" >
             <el-option
               v-for="dict in getLabelComp(form.typeId, form.providerId)"
               :key="dict.value"
@@ -228,6 +229,7 @@
               :value="dict.value"
             ></el-option>
           </el-select>
+          <div v-if="change">如想修改请移步充值卡/关键字/优惠券管理页面修改</div>
         </el-form-item>
         <el-form-item label="显示顺序id" prop="sortId">
           <el-input v-model="form.sortId" placeholder="请输入显示顺序id" />
@@ -290,6 +292,9 @@ export default {
       segchk_store_lable_mgtList: [],
       // 弹出层标题
       title: "",
+
+      //针对修改的情况进行一定的保护，如对标签名称，图片等进行修改，则必须去相应充值卡管理，关键字管理，优惠券管理进行相应的修改，以保证一定程度的一致性。
+      change: false,
       // 是否显示弹出层
       open: false,
       // 创建或修改时间时间范围
@@ -565,6 +570,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加seg商家标签管理";
+      this.change = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -574,6 +580,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改seg商家标签管理";
+        this.change = true;
       });
     },
     /** 提交按钮 */

src/views/segchk/segchk_store_self_mgt/index.vue

@@ -22,6 +22,18 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="截止时间">
+        <el-date-picker
+          v-model="daterangeExpirationDate"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item label="商家id，全局唯一" prop="storeId">
         <el-input
           v-model="queryParams.storeId"
@@ -223,6 +235,14 @@
             placeholder="选择创建或修改时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="创建或修改时间" prop="expirationDate">
+          <el-date-picker clearable size="small"
+            v-model="form.expirationDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建或修改时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="商家id，全局唯一" prop="storeId">
           <el-input v-model="form.storeId" placeholder="请输入商家id，全局唯一" />
         </el-form-item>
@@ -294,12 +314,14 @@ export default {
       open: false,
       // 创建或修改时间时间范围
       daterangeModTime: [],
+      daterangeExpirationDate: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         freeCardId: null,
         modTime: null,
+        expirationDate: null,
         storeId: null,
         providerId: null,
         userId: null,
@@ -367,6 +389,10 @@ export default {
         this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
         this.queryParams.params["endModTime"] = this.daterangeModTime[1];
       }
+      if (null != this.daterangeExpirationDate && '' != this.daterangeExpirationDate) {
+        this.queryParams.params["beginExpirationDate"] = this.daterangeExpirationDate[0];
+        this.queryParams.params["endExpirationDate"] = this.daterangeExpirationDate[1];
+      }
       listSegchk_store_self_mgt(this.queryParams).then(response => {
         this.segchk_store_self_mgtList = response.rows;
         this.total = response.total;
@@ -383,6 +409,7 @@ export default {
       this.form = {
         freeCardId: null,
         modTime: null,
+        expirationDate: null,
         storeId: null,
         providerId: null,
         userId: null,

src/views/segchk/segchk_vip_record/index.vue

@@ -0,0 +1,564 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item v-if="queryParams.providerId == null || isAdmin" label="运营商" prop="providerId">
+        <el-select
+          v-model="queryParams.providerId"
+          placeholder="运营商id"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.segchk_providerList"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="推广人角色" v-if="isAdmin" prop="recommendersLevel">
+        <el-select
+          v-model="queryParams.recommendersLevel"
+          placeholder="推广人角色"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.recommendersLevels"
+            :key="dict.key"
+            :label="dict.value"
+            :value="dict.key"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商家" prop="recommenderId">
+        <el-select
+          v-model="queryParams.recommenderId"
+          placeholder="商家名称"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(-1, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会员卡类型" prop="cardTypeId">
+        <el-select
+          v-model="queryParams.cardTypeId"
+          placeholder="会员卡类型"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in getLabelComp(0, queryParams.providerId)"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会员卡状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="会员卡状态"
+          @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in this.cardStatus"
+            :key="parseInt(dict.key)"
+            :label="dict.value"
+            :value="parseInt(dict.key)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间">
+        <el-date-picker
+          v-model="daterangeModTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效期">
+        <el-date-picker
+          v-model="daterangeEffectiveDate"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['segchk:segchk_vip_record:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['segchk:segchk_vip_record:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['segchk:segchk_vip_record:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['segchk:segchk_vip_record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="segchk_vip_recordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="运营商id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="providerId" />
+      <el-table-column label="会员卡号id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="cardId" />
+      <el-table-column label="用户id" v-if="isAdmin || queryParams.providerId == null" align="center" prop="userId" />
+      <el-table-column label="用户号码" align="center" prop="phoneNo" />
+      <el-table-column label="会员卡类型" align="center" prop="cardTypeId" :formatter="tableGetName"/>
+      <el-table-column label="使用次数" align="center" prop="useCount" />
+      <el-table-column label="剩余次数" align="center" prop="leftCount" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="tableGetName"/>
+      <el-table-column label="推广人" align="center" prop="recommenderId" :formatter="tableGetName"/>
+      <el-table-column label="推广人角色" v-if="isAdmin" align="center" prop="recommendersLevel" :formatter="tableGetName"/>
+      <el-table-column label="推广时间" align="center" prop="modTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效期" align="center" prop="effectiveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.effectiveTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['segchk:segchk_vip_record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['segchk:segchk_vip_record:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listSegchk_vip_record, exportSegchk_vip_record} from "@/api/segchk/segchk_vip_record";
+import store from "@/store";
+import {
+  segchk_get_chargecard_list, segchk_get_provider_list, segchk_get_store_list
+} from "@/api/segchk/segchk_get_simple_list";
+
+export default {
+  name: "Segchk_vip_record",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // seg用户充值记录表格数据
+      segchk_vip_recordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建或修改时间时间范围
+      daterangeModTime: [],
+
+      daterangeEffectiveDate: [],
+
+      segchk_providerList: [],
+      segchk_storeList: [],
+      segchk_charge_cardList: [],
+      recommendersLevels:[
+        {
+          key: -1,
+          value:"未知"
+        },
+        {
+          key: 0,
+          value:"运营商"
+        },
+        {
+          key: 1,
+          value:"商家"
+        },
+        {
+          key: 2,
+          value:"用户"
+        }
+      ],
+      cardStatus: [
+        {
+          key: 0,
+          value: "正常"
+        },
+        {
+          key: 1,
+          value: "失效"
+        },
+      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        cardTypeId: null,
+        providerId: null,
+        recommendersLevel: null,
+        recommenderId: null,
+        retFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户id，全局唯一不能为空", trigger: "blur" }
+        ],
+        storeId: [
+          { required: true, message: "商家id，全局唯一不能为空", trigger: "blur" }
+        ],
+        charge: [
+          { required: true, message: "充值额不能为空", trigger: "blur" }
+        ],
+        accountUsed: [
+          { required: true, message: "使用的余额部分不能为空", trigger: "blur" }
+        ],
+        cardId: [
+          { required: true, message: "会员卡号id，全局惟一不能为空", trigger: "blur" }
+        ],
+        cardTypeId: [
+          { required: true, message: "会员卡类型，0--9块9，1---99不能为空", trigger: "blur" }
+        ],
+        chargeType: [
+          { required: true, message: "充值类型不能为空", trigger: "change" }
+        ],
+        providerId: [
+          { required: true, message: "运营商id，全局唯一不能为空", trigger: "blur" }
+        ],
+        modTime: [
+          { required: true, message: "创建或修改时间不能为空", trigger: "blur" }
+        ],
+        retFlag: [
+          { required: true, message: "结果，0未完成，1成功，2失败不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams.providerId = store.getters.providerId || null
+    this.isAdmin = store.getters.roles.includes('admin')
+    this.tmpList();
+  },
+  computed:{
+    getLabelComp(){
+      return function (fromLableId, providerId) {
+        let arr = []
+        if(fromLableId == 0){
+          arr = this.segchk_charge_cardList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.key), value: e.value }
+            }) // 会员卡
+        }
+        else if(fromLableId == -1){
+          arr = this.segchk_storeList
+            .filter(value => value.providerId == providerId)
+            .map(e=>  {
+              return { key: parseInt(e.key), value: e.value }
+            }) // 商家列表
+        }
+        return arr
+      }
+    },
+    provsegchk_charge_cardList() {
+      return function (providerId) {
+        if(providerId == undefined) {
+          console.log("prov is "+providerId)
+          alert("请先填写运营商id")
+          return [];
+        }
+        var providerId = providerId
+        var segchk_charge_cardList = this.segchk_charge_cardList
+        let ret = segchk_charge_cardList
+          .filter(scc=> scc.providerId == providerId)
+          .map(e => {
+            return { key: parseInt(e.key) , value: e.value}
+          })
+        // console.log(ret)
+        return ret
+      }
+    },
+    lableSort() {
+      return  function(row){
+        let maxsortId = this.segchkStoreLableMgtList.reduce((v1, v2) => {
+          return v1.sortId > v2.sortId ? v1 : v2
+        }).sortId
+        if(row.mgtId == null)
+          return maxsortId
+        else return row.sortId
+      }
+
+    },
+  },
+  methods: {
+    // 获取各种列表
+    getSimpleList() {
+      // 运营商列表
+      segchk_get_provider_list(this.queryParams.providerId).then(response => {
+        this.segchk_providerList = response.rows;
+        // this.cardtotal = response.total;
+      });
+      // 商家列表
+      segchk_get_store_list(this.queryParams.providerId).then(response => {
+        this.segchk_storeList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+      // 会员卡
+      segchk_get_chargecard_list(this.queryParams.providerId).then(response => {
+        this.segchk_charge_cardList = response.rows;
+        // this.cardtotal = response.total;
+      });
+
+    },
+    tableGetName(row, column) {
+      // console.log("tableProviderName --- " + row.property + "---" + column.property + "---" + column.index)
+
+      if (column.property == 'status'){
+
+        var ret = this.cardStatus.find((value) => {
+          return value.key == row.status})
+        var provName = ret == null ? "" : ret.value
+        return provName
+      }
+      if (column.property == 'recommendersLevel'){
+        var ret = this.recommendersLevels.find((value) => {
+          return value.key == row.recommendersLevel})
+        var provName = ret == null ? "未知" : ret.value
+        return provName
+      }
+      if (column.property == 'recommenderId'){
+        var ret = this.segchk_storeList.find(value => {
+          return value.key == row.recommenderId
+        })
+        var provName = ret == null ? row.recommenderId : ret.value;
+        return provName
+      }
+      if (column.property == 'cardTypeId'){
+        var ret = this.segchk_charge_cardList.find(value => {
+          return value.providerId == row.providerId
+            && value.key == row.cardTypeId
+        })
+        var provName = ret == null ? "未知" : ret.value;
+        return provName
+      }
+    },
+    /** 查询seg会员卡记录列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeModTime && '' != this.daterangeModTime) {
+        this.queryParams.params["beginModTime"] = this.daterangeModTime[0];
+        this.queryParams.params["endModTime"] = this.daterangeModTime[1];
+      }
+      if (null != this.daterangeEffectiveDate && '' != this.daterangeEffectiveDate) {
+        this.queryParams.params["beginEffectiveDate"] = this.daterangeEffectiveDate[0];
+        this.queryParams.params["endEffectiveDate"] = this.daterangeEffectiveDate[1];
+      }
+      this.getSimpleList();
+      listSegchk_vip_record(this.queryParams).then(response => {
+        this.segchk_vip_recordList = response.rows;
+        console.log('getList with %o', response.rows);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    async tmpList() {
+      await this.getSimpleList();
+      await this.getList();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: null,
+        storeId: null,
+        charge: null,
+        accountUsed: null,
+        cardId: null,
+        cardTypeId: null,
+        chargeType: null,
+        chargeId: null,
+        providerId: null,
+        modTime: null,
+        retFlag: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeEffectiveDate = [];
+      this.daterangeModTime = [];
+      this.resetForm("queryForm");
+      this.queryParams.providerId = store.getters.providerId || null
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.chargeId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.reset();
+      this.open = true;
+      this.title = "添加seg用户充值记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.reset();
+      const chargeId = row.chargeId || this.ids
+      getSegchk_user_charge(chargeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改seg用户充值记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.chargeId != null) {
+            updateSegchk_user_charge(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSegchk_user_charge(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.msgInfo("功能尚未开放，敬请期待！");
+      return;
+      const chargeIds = row.chargeId || this.ids;
+      this.$confirm('是否确认删除seg用户充值记录编号为"' + chargeIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSegchk_user_charge(chargeIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有seg用户充值记录数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportSegchk_vip_record(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+
+  }
+};
+</script>

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:7170`,
+        // target: `http://192.168.2.20:7170`,
 
         target: `http://localhost:7070`,
         // target: `http://221.195.106.155:8090`,