From e570b232bc6b7aa8c46c73f87caa1cb89f90dcff Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 28 七月 2022 15:07:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index fbaafe4..04ab15d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -165,6 +165,7 @@
case 'btn-Edit':
set_ShowBill();
break;
+ //鍒犻櫎
case 'btn-Delete':
set_DeleteBill();
break;
@@ -240,6 +241,8 @@
, height: '400'
, page: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
@@ -256,7 +259,7 @@
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
, { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜', width: 115, hide: true }
, { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
- , { field: '鍗曚綅', title: '鍗曚綅', width: 200 }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
, { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 200 }
, { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
, { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
@@ -294,6 +297,8 @@
, height: '350'
, page: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [[
//{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
@@ -321,6 +326,8 @@
, height: '350'
, page: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [[
//{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
@@ -350,7 +357,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -428,7 +435,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID },
+ data: { "HInterID": 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