From 2bb2ec7bb9d2989bbb3b7d6de2d1228c3c4af609 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 25 八月 2021 08:55:23 +0800
Subject: [PATCH] 合并
---
WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html | 83 ++++++++++++-----------------------------
1 files changed, 25 insertions(+), 58 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index a5019f6..611d0b3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -29,6 +29,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate">
@@ -66,19 +72,14 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
</div>
</div>
</div>
@@ -120,9 +121,15 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
+ var option = [];
//#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -152,11 +159,6 @@
//#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
- //鍒濆鍖栫晫闈�
- set_ClearBill();
- //#endregion
-
//#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -172,6 +174,8 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , limits: [20, 50, 100, 150, 200, 250]
+ , limit: 20
, page: true
, cellMinWidth: 90
, cols: [[
@@ -242,7 +246,6 @@
var ajaxLoad = layer.load(0);
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
type: "GET",
data: { "sWhere": sWhere },
@@ -273,7 +276,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html',
+ content: '../璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -300,7 +303,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html?hID=' + hID
+ , content: '../璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -353,8 +356,8 @@
}
}
- //蹇�熻繃婊�
- function get_FastQuery() {
+ //蹇�熻繃婊�
+ function get_FastQuery() {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -367,57 +370,21 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- var index = layer.load(0);
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
+ get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
- //$("#HBillType").val("");//鍗曟嵁绫诲瀷
- //$("#HBillNo").val("");//鍗曟嵁鍙�
- //$("#HSourceBillNo").val("");//婧愬崟鍙�
- //$("#HCreateBy").val("");//鍒跺崟浜�
- //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+
}
- //閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
+ //閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
$("#HDate").val("");//寮�濮嬫棩鏈�
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#btnSearch").click();
}
- //鐩戝惉琛屽弻鍑讳簨浠�
- table.on('rowDouble(mainTable)', function (obj) {
- layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- });
//#endregion
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1