From aefe26ed705bfc1c173a3e75918cc7c642d60648 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 26 六月 2023 09:04:03 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 81 +++++++++++++++++++++++++-
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html | 22 +++---
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 21 ++++++-
3 files changed, 106 insertions(+), 18 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 574e242..b6394a6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -218,6 +218,10 @@
var HBatchNo = "";
var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+
+ var HMaterInfo = ""; //瀛樺偍鐗╂枡淇℃伅
+ var HBarInfo = ""; //瀛樺偍鏉＄爜淇℃伅
+ var HFileList = ""; //瀛樺偍妗ｆ鍒楄〃
//#endregion
//鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
@@ -227,17 +231,25 @@
HModName = "Gy_BarCodeBill";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.reload('mainTable', {
+ data: HMaterInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
} else if (cur_title == "鏉＄爜淇℃伅") {
HModName = "Gy_BarCodeBill_1";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn1();
-
+ table.reload('mainTable1', {
+ data: HBarInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
} else if (cur_title == "妗ｆ鍒楄〃") {
HModName = "Gy_BarCodeBill_2";
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn2();
-
+ //鍔犺浇妗ｆ鍒楄〃
+ table.reload('mainTable2', {
+ data: HFileList // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+ });
}
})
@@ -572,6 +584,7 @@
form.on('submit(ToolCreate)', function (data) {
$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
var sSubStr = JSON.stringify(table.cache['mainTable']);
+ HMaterInfo = table.cache['mainTable'];
//鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -1589,12 +1602,14 @@
table.reload('mainTable1', {
data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
});
+ HBarInfo = result.list;
//鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
element.tabChange('tab-TabTest', '3');
//鍔犺浇妗ｆ鍒楄〃
table.reload('mainTable2', {
data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
- });
+ });
+ HFileList = result.data;
}
else {
$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
index 27d2bc6..77a0ea4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
@@ -819,10 +819,10 @@
$("#HQty").val(result.data[0]["璁″垝鏁伴噺"]);
$("#HProcBegName").val(result.data[0]["宸ュ簭鍚嶇О"]);
$("#HProcBegID").val(result.data[0]["HProcID"]);
- $("#HProcEndName").val(result.data[1]["宸ュ簭鍚嶇О"]);
- $("#HProcEndID").val(result.data[1]["HProcID"]);
+ $("#HProcEndName").val(result.data.length == 1 ? "" :result.data[1]["宸ュ簭鍚嶇О"]);
+ $("#HProcEndID").val(result.data.length==1?"0": result.data[1]["HProcID"]);
$("#HProcExchBegNO").val(result.data[0]["娴佹按鍙�"]);
- $("#HProcExchEndNO").val(result.data[1]["娴佹按鍙�"]);
+ $("#HProcExchEndNO").val(result.data.length == 1 ? "9999" :result.data[1]["娴佹按鍙�"]);
$("#HPRDORGID").val(result.data[0]["HPRDORGID"]);
$("#HPRDORGName").val(result.data[0]["缁勭粐"]);
$("#HICMOBillNo").val(result.data[0]["浠诲姟鍗曞彿"]);
@@ -916,20 +916,20 @@
return false;
}
- if ($("#HProcEndName").val() == "") {
- layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
- return false;
- }
+ //if ($("#HProcEndName").val() == "") {
+ // layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
+ // return false;
+ //}
if ($("#HProcExchBegNO").val() == "") {
layer.msg("寮�濮嬫祦姘村彿涓嶈兘涓虹┖!");
return false;
}
- if ($("#HProcExchEndNO").val() == "") {
- layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
- return false;
- }
+ //if ($("#HProcExchEndNO").val() == "") {
+ // layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
+ // return false;
+ //}
if ($("#HPRDORGName").val() == "") {
layer.msg("鐢熶骇缁勭粐涓嶈兘涓虹┖!");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 23b4cf7..0d5e6d9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -108,11 +108,38 @@
<label class="layui-form-label">鐢熶骇璁㈠崟鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
<select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
- <option value="0" >鍏ㄩ儴</option>
+ <option value="0">鍏ㄩ儴</option>
<option value="4" selected="selected">寮�宸�</option>
<option value="6">缁撴</option>
</select>
</div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px">
+ <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>
</div>
@@ -258,8 +285,8 @@
, { field: '鐢熶骇璁㈠崟鍙�', title: '鎵瑰彿', width: 160 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '寮�宸ユ棩鏈�', title: '涓嬭揪鏃ユ湡', width: 160, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" }
- , { field: '瑕佹眰瀹屽伐', title: '瑕佹眰瀹屽伐', width: 160, templet: "<div>{{d.瑕佹眰瀹屽伐 ==null ?'':layui.util.toDateString(d.瑕佹眰瀹屽伐, 'yyyy-MM-dd')}}</div>" }
+ , { field: '寮�宸ユ棩鏈�', title: '涓嬭揪鏃ユ湡', width: 160, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瑕佹眰瀹屽伐', title: '瑕佹眰瀹屽伐', width: 160, templet: "<div>{{d.瑕佹眰瀹屽伐 ==null ?'':layui.util.toDateString(d.瑕佹眰瀹屽伐, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 200 }
, { field: '鏁存壒', title: '鏁存壒', width: 160, totalRow: true }
, { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾', width: 160, totalRow: true}
@@ -318,6 +345,10 @@
// }
// }
//}
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
table.render(option);
layer.close(wait);
} else {
@@ -344,6 +375,31 @@
var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
var HOrgID = sessionStorage["OrganizationID"];
var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var sWhere1 = "";
+ 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;
+ }
+ sWhere1 += " and " + ColName + " " + com;
+ }
if (checkWRuku) {
checkWRuku = 1;
@@ -363,6 +419,7 @@
, IsTrue: checkWRuku
, HState: HState
, HSTATUS: HSTATUS
+ , sWhere1: sWhere1
}
get_Display(JSON.stringify(sWhere));
@@ -371,7 +428,7 @@
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HICMOBillNo").val("");
$("#HProcExchBillNo").val("");
@@ -380,6 +437,9 @@
$("#HMaterNumber").val("");
$("#F_BSV_WYID").val("");
$("#HState").val("0")
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
$("input[name='checkWRuku']").prop("checked", false);
form.render()
sWhere = "";
@@ -516,6 +576,19 @@
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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');
+ }
+
//#endregion
});
--
Gitblit v1.9.1