From 2bf8fae350e4097bf4ed9aa47bc3792158543ad6 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 31 十二月 2021 11:32:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 127 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 61 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index 495f989..91be80f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -17,37 +17,42 @@
</head>
<body>
<div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
-
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div style="padding:20px;margin:0px 700px">
- <h1>鐩樼偣鍒嗘瀽琛�</h1>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鐩樼偣鏂规</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HItemID">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;margin-top:20px"><b>鐩樼偣鍒嗘瀽鍒楄〃</b></h1>
+
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐩樼偣鏂规</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HItemID" id="HItemID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
+ 閲嶇疆
+ </button>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
- 鏌ヨ
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
- 閲嶇疆
- </button>
</div>
</div>
</div>
+
<div class="layui-tab layui-tab-card" style="margin-top:10px">
<ul class="layui-tab-title">
@@ -206,7 +211,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
- set_ClearBill();
+ set_ClearBill();
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -315,7 +320,7 @@
};
});
//#endregion
-
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch1)', function (data) {
var HItemID = $("#HItemID").val();//鐩樼偣
@@ -364,7 +369,7 @@
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '鐩樼偣鏂规鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -380,6 +385,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HItemID").val(checkStatus.data[0].hitemid);
+ $("#HName").val(checkStatus.data[0].鐩樼偣鏂规);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -432,34 +438,33 @@
tk_Display();
});
//#endregion
-
- //#endregion
- //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
- // #region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�(姝ｅ父)
set_InitGrid1();
//鍒濆鍖栬〃鏍�(璋冩嫧)
- set_InitGrid2();
- //鍒濆鍖栬〃鏍�(鍑哄簱)
- set_InitGrid3();
- //鍒濆鍖栬〃鏍�(鍏ュ簱)
- set_InitGrid4();
- //鍒濆鍖栬〃鏍�(鐩樼泩)
- set_InitGrid5();
- //鍒濆鍖栬〃鏍�(鐩樹簭)
- set_InitGrid6();
- //鍒濆鍖栬〃鏍�(閫�搴�)
- set_InitGrid7();
+ set_InitGrid2();
+ //鍒濆鍖栬〃鏍�(鍑哄簱)
+ set_InitGrid3();
+ //鍒濆鍖栬〃鏍�(鍏ュ簱)
+ set_InitGrid4();
+ //鍒濆鍖栬〃鏍�(鐩樼泩)
+ set_InitGrid5();
+ //鍒濆鍖栬〃鏍�(鐩樹簭)
+ set_InitGrid6();
+ //鍒濆鍖栬〃鏍�(閫�搴�)
+ set_InitGrid7();
//鏌ヨ
zc_Display();
}
//鍒濆鍖栬〃鏍�(姝ｅ父)
- function set_InitGrid1()
- {
+ function set_InitGrid1() {
var ajaxLoad = layer.load();
option1 = {
elem: '#mainTable1'
@@ -592,9 +597,9 @@
}
});
}
- //璋冩嫧鏌ヨ
+ //璋冩嫧鏌ヨ
function db_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID";
+ var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID";
var HItemID = $("#HItemID").val();//鐩樼偣
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -613,9 +618,9 @@
}
});
}
- //鍑哄簱鏌ヨ
+ //鍑哄簱鏌ヨ
function ck_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''";
+ var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -634,9 +639,9 @@
}
});
}
- //鍏ュ簱鏌ヨ
+ //鍏ュ簱鏌ヨ
function rk_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID";
+ var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -655,9 +660,9 @@
}
});
}
- //鐩樼泩鏌ヨ
+ //鐩樼泩鏌ヨ
function py_Display() {
- sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
+ var sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -676,9 +681,9 @@
}
});
}
- //鐩樹簭鏌ヨ
+ //鐩樹簭鏌ヨ
function pk_Display() {
- sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
+ var sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -697,9 +702,9 @@
}
});
}
- //閫�搴撴煡璇�
+ //閫�搴撴煡璇�
function tk_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)";
+ var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -721,7 +726,7 @@
//#endregion
- //#region 瀹℃牳
+ //#region 瀹℃牳
//瀹℃牳 璋冩嫧
function set_CheckBill2() {
var checkStatus = table.checkStatus('mainTable2')
@@ -922,7 +927,7 @@
}
//#endregion
-
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1