From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
index 87a8a3e..95565b7 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
@@ -15,11 +15,17 @@
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
+ {title: '门店类型', field: 'type', visible: role==1?true:false, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return {1:"平台门店",2:"运营商门店"}[data]
+
+ }
+ },
+ {title: '所属运营商', field: 'yysName', visible: role==1?true:false, align: 'center', valign: 'middle'
+ },
{title: '省', field: 'province', visible: role==1?true:false, align: 'center', valign: 'middle'
},
{title: '市', field: 'city', visible: role==1?true:false, align: 'center', valign: 'middle'},
- {title: '所属账号', field: 'account', visible: role==1?true:false, align: 'center', valign: 'middle'
- },
{title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'
},
{title: '门店地址', field: 'address', visible: true, align: 'center', valign: 'middle'
--
Gitblit v1.7.1