From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 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 80fd5a0..6a55a1a 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"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -45,6 +46,9 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
閲嶇疆
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDel" id="btnDel">
+ 鍒犻櫎
</button>
</div>
</div>
@@ -169,7 +173,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
// #region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -188,6 +192,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = " HRealPotType=HBookPotType and HRealPot=HBookPot";
var option1 = [];
@@ -199,16 +204,16 @@
var option7 = [];
var col = [
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', width: 200,hide: true}
- , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200 }
- , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200 }
- , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200 }
- , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200 }
- , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200 }
- , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200 }
- , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200 }
- , { field: 'HOWNERName', title: '鐩樼偣缁勭粐', width: 200 }
- , { field: 'HMakeDate', title: '鐩樼偣鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>" }
+ , { field: 'HItemID', title: 'HItemID', width: 200, hide: true, sort: true}
+ , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200, sort: true}
+ , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200, sort: true}
+ , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200, sort: true}
+ , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200, sort: true}
+ , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200, sort: true}
+ , { field: 'HOWNERName', title: '鐩樼偣缁勭粐', width: 200, sort: true}
+ , { field: 'HMakeDate', title: '鐩樼偣鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>", sort: true }
];
//#endregion
@@ -393,12 +398,45 @@
option1.data = data1.list[0];
table1.render(option1);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
+ });
+
+ //鍒犻櫎鎸夐挳
+ form.on('submit(btnDel)', function (data) {
+ var HItemID = $("#HItemID").val();//鐩樼偣
+ if (HItemID) {
+ layer.confirm('鏄惁鍒犻櫎鍏朵粬鏃犵敤鐨勫簱瀛橈紵', {
+ icon: 3,
+ title: "鎻愮ず",
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index) {
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubDel',
+ type: "GET",
+ anysc: false,
+ data: { "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ })
+ }
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨鐩樼偣鏂规");
+ return;
+ }
});
//鐩樼偣鏂规寮圭獥
@@ -496,7 +534,7 @@
//鍒濆鍖栬〃鏍�(閫�搴�)
set_InitGrid7();
//鍒濆鏌ユ甯搁〉绛�
- zc_Display();
+ //zc_Display();
}
//鍒濆鍖栬〃鏍�(姝ｅ父)
@@ -511,6 +549,9 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [col]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
option1.data = [];
table1.render(option1);
@@ -714,7 +755,7 @@
}
//鐩樼泩鏌ヨ
function py_Display() {
- var sWhere = "isnull(HBookPot,'''')='''' and isnull(HRealPot,'''')!=''''";
+ var sWhere = "py";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -786,7 +827,7 @@
var checkStatus = table.checkStatus('mainTable2')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check2').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -821,7 +862,7 @@
var checkStatus = table.checkStatus('mainTable3')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check3').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -855,7 +896,7 @@
var checkStatus = table.checkStatus('mainTable4')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check4').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -889,7 +930,7 @@
var checkStatus = table.checkStatus('mainTable5')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check5').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -957,7 +998,7 @@
var checkStatus = table.checkStatus('mainTable7')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check7').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
--
Gitblit v1.9.1