From c9d0da28b32debada8d015ab1e2cdc4502cd6708 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 一月 2024 16:41:16 +0800
Subject: [PATCH] 1
---
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportOverList.html | 169 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 141 insertions(+), 28 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
index 7e9bac8..7f9a52f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -40,6 +41,33 @@
<option value="2">宸插悓姝�</option>
<option value="3">鏈悓姝�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -77,6 +105,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InStorage" id="btn-InStorage"><i class="layui-icon layui-icon-ok-circle"></i>鍏ュ簱</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InStorage_Batch" id="btn_InStorage_Batch"><i class="layui-icon layui-icon-ok-circle"></i>鎵归噺鍏ュ簱</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
</div>
</script>
@@ -95,7 +124,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -105,6 +134,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鍏敤鍙橀噺
var sWhere = "";
var option = [];
@@ -165,39 +195,42 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
- , { field: '鍚屾鐘舵��', title: '鍚屾鐘舵��' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125, sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190, sort: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125, sort: true }
+ , { field: '鍚屾鐘舵��', title: '鍚屾鐘舵��', sort: true }
+ , { field: 'HProcID', title: 'HProcID', hide: true, sort: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125, sort: true }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', sort: true }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, {
- field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, templet: function (d) {
+ field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, sort: true, templet: function (d) {
if (d.鍑虹珯鏃堕棿 == null) {
return "";
}
return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
}
}
- , { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 190 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
- , { field: 'HSourceID', title: 'HSourceID', hide: true }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125 }
- , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
- , { field: 'HGroupID', title: 'HGroupID', hide: true }
- , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
- , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
- , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 190, sort: true }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', sort: true }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125, sort: true }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true, sort: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125, sort: true }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', sort: true }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺', sort: true }
+ , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺', sort: true }
]]
, text: {
none: '鏃犳暟鎹紒'
@@ -207,13 +240,16 @@
get_FastQuery();
}
-
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍏ュ簱
case 'btn-InStorage': get_InStorage();
+ break;
+ //鎵归噺鍏ュ簱
+ case 'btn_InStorage_Batch': get_InStorage_Batch();
break;
//閫�鍑�
case 'btn-Exit': get_Exit();
@@ -229,7 +265,10 @@
$("#HBillNo").val("");
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HProcExchBillNo").val("");
- $("#HRelationQty").val("1")
+ $("#HRelationQty").val("1");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
form.render("select");
}
@@ -240,6 +279,9 @@
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
var HRelationQty = $("#HRelationQty").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
switch (HRelationQty) {
case "1":
sWhere += "";
@@ -250,6 +292,27 @@
case "3":
sWhere += " and 鍚屾鐘舵�� = ''";
break;
+ }
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
}
if (HDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) = '" + HDate + "'";
@@ -285,6 +348,9 @@
}
table.render(option);
layer.close(wait);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
}, error: function () {
layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -292,6 +358,42 @@
});
}
+ //鎵归噺鍏ュ簱
+ function get_InStorage_Batch() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+ var InterID = [];
+ var BillNo = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID.push(data[i].hmainid.toString());
+ BillNo.push(data[i].鍗曟嵁鍙�.toString());
+ }
+
+ var msg = InterID + ';' + sessionStorage["HUserName"] + ';' + BillNo + ";" + sessionStorage["OrganizationID"];
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill_Batch", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.alert(data.Message, { icon: 1 });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.responseText, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹紒');
+ }
+ }
//鍏ュ簱
function get_InStorage() {
var checkStatus = table.checkStatus('mainTable')
@@ -303,7 +405,7 @@
type: "GET",
url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"]},
+ data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -325,7 +427,18 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹叆搴擄紒');
}
}
-
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
//閫�鍑�
function get_Exit() {
Pub_Close(2);
--
Gitblit v1.9.1