From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
index 6eeab8f..99e8c74 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html
@@ -161,7 +161,6 @@
alarmNum = row.alarmNum;
}
var storeNum = parseInt(value);
- console.log(alarmNum,storeNum);
if (alarmNum > storeNum) {
html = '<span class="label-danger" > ' + value
+ ' </span>';
@@ -173,8 +172,9 @@
}
function savePl() {
- var select = $("#mgrid").bootstrapTable('getAllSelections');
- parent.selectPl(select);
+ var rows = $("#mgrid").bootstrapTable('getAllSelections');
+ parent.selectPl(rows);
+ parent.layer.close(parent.layer.getFrameIndex(window.name));
}
</script>
--
Gitblit v1.9.1