From d054d104a5abb43cb3209cceb2c574b84df6393e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 八月 2023 10:18:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 9e6562b..8c4f4c2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -133,7 +133,10 @@
                 get_FastQuery();
             });
 
-
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                get_Refresh();
+            });
 
             //#endregion
 
@@ -154,11 +157,9 @@
                     , toolbar: '#toolbarDemo'
                     , height: 'full-50'
                     , page: true
-                    , limits: [50,200,500,1000,5000,10000]
+                    , limits: [50, 500, 5000, 20000]
                     , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
                     , cellMinWidth: 200
-                    , limit: 50
-                    , limits: [50, 200, 500, 1000, 5000, 10000]
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
@@ -219,7 +220,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -241,7 +242,7 @@
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
-                    sWhere += " and 璁惧缂栧彿 like '%" + HNumber + "%'";
+                    sWhere += " and 璁惧浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
                     sWhere += " and 璁惧鍚嶇О like '%" + HName + "%'";
@@ -315,7 +316,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + '/Gy_EquipFileMain/Delete_EquipFile',
-                            data: { "HItemID": HInterID},
+                            data: { "HItemID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

--
Gitblit v1.9.1