From ebc637fe72d7ceb4c05c57b25bb295eed10c7e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 18 Feb 2020 15:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/index.html                  | 1 +
 erp_web/pages/manage/functions.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/erp_web/index.html b/erp_web/index.html
index 8641424c..9a83e699 100644
--- a/erp_web/index.html
+++ b/erp_web/index.html
@@ -191,5 +191,6 @@
 <script src="js/jquery-toastr/2.0/toastr.min.js"></script>
 <script src="js/jquery/jquery.slimscroll.js"></script>
 <script src="js/easyui/jquery.easyui.min.js"></script>
+<script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
 <script src="js/common/common.js"></script>
 <script src="js/modules/sys/sysIndex.js"></script>
\ No newline at end of file
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index 46eeb482..82d8671e 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -390,7 +390,7 @@
         $("#Sort").textbox("setValue", rowsdata.sort);
         $("#Enabled").attr("checked", rowsdata.enabled);
         $("#Type").textbox("setValue", rowsdata.type);
-        if (rowsdata.pushbtn != "undefined" && rowsdata.pushbtn != "") {
+        if (rowsdata.pushbtn) {
             var arr = rowsdata.pushbtn.split(",");
             var pushBtnArray = [];
             for (var i = 0; i < arr.length; i++) {