From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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..cf98d95 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,18 @@
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {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'
@@ -35,6 +42,8 @@
},
];
};
+
+
function currentTime(timestamp){
var time = timestamp + '';
if(time.length != 13){
@@ -81,7 +90,23 @@
return true;
}
};
-
+/**
+ *
+ * 点击门店设置门禁
+ */
+TCompetition.addDevice = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '添加门禁',
+ area: ['50%', '50%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tShop/tShop_addDevice/' +TCompetition.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
/**
* 点击添加车辆管理
*/
@@ -271,7 +296,6 @@
Feng.success("重置成功!");
TCompetition.table.refresh();
}, function (data) {
- Feng.error("重置失败!" + data.responseJSON.message + "!");
});
ajax.set("id",id);
ajax.start();
--
Gitblit v1.7.1