From cba0ef063a24b5b965bfa943cf1c8d2c8acba84a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:16:43 +0800
Subject: [PATCH] 排产 工艺路线的加工数量排产需要 生产入库 单据号改成流转卡号
---
WebTM/views/车间管理/报表分析/Kf_MaterOutSumReport_Cloth.html | 190 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 173 insertions(+), 17 deletions(-)
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/Kf_MaterOutSumReport_Cloth.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/Kf_MaterOutSumReport_Cloth.html"
index abd72a7..20d050e 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/Kf_MaterOutSumReport_Cloth.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/Kf_MaterOutSumReport_Cloth.html"
@@ -133,6 +133,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-detail"><i class="layui-icon layui-icon-return"></i>鏄庣粏鎶ヨ〃</button>
</div>
</script>
</form>
@@ -182,6 +183,10 @@
case 'HideColumn':
get_HideColumn();
break;
+ //鏄庣粏鎶ヨ〃
+ case 'btn-detail':
+ get_EntryReport();
+ break;
};
});
//閲嶇疆鎸夐挳
@@ -193,6 +198,74 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+
+ //琛岀洃鍚簨浠�-鍙屽嚮
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ //涓嬫帹
+ var sBillNo = obj.data["鍗曟嵁鍙�"];
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Kf_MaterOutEntryReport_Cloth.html?sBillNo=' + sBillNo
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ });
+
+ ////鐩戝惉浠绘剰瀛楁杩囨护-锛氭牴鎹�変腑鐨勫瓧娈碉紝鍙樻洿杈撳叆妗嗙殑杈撳叆褰㈠紡
+ layui.use(['form'], function () {
+ var form = layui.form;
+ form.on('select(ColName)', function (data) {
+ if (data.value == "鏃ユ湡") {
+ document.getElementById("ColContent").type = "date";
+ } else {
+ document.getElementById("ColContent").type = "text";
+ }
+ })
+ })
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -203,7 +276,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
- //set_InitGrid();
+ set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
DisPlay_HideColumn();
@@ -211,7 +284,55 @@
}
//鍒濆鍖栬〃鏍�
- function set_InitGrid(sWhere) {
+ function set_InitGrid() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+ var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
+ var com = "";
+ if (ColName != 0 && Comparator != 0) {
+ 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HMaterNumber: HMaterNumber
+ , HBillNo: HBillNo
+ , HProductName: HProductName
+ , HProductModel: HProductModel
+ , RandomSearch: com
+ }
+
+ sWhere = JSON.stringify(sWhere);
+
+
//鍔ㄦ�佸垪-缂撳瓨鍒楄〃
$.ajax({
url: GetWEBURL() + "/MaterOutSumReport/MaterOutSumReport_Cloth",
@@ -227,27 +348,26 @@
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
- var width = data1.list[key].width * 23;
- if (width < 150) {
- width = 150;
- } else if (width > 300) {
- width = 300;
- }
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType, "width": width});
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
}
-
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, "") > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, width: data[i].width }); //闅愯棌id鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
}
else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: data[i].width });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true});
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: data[i].width });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
}
}
}
@@ -303,7 +423,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 0; i < option.cols[0].length; i++) {
+ 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>';
}
@@ -323,6 +443,13 @@
data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
+ //璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃�
+ for (var i = 0; i < data1.data.length; i++) {
+ if (data1.data[i].鏃ユ湡 != null) {
+ data1.data[i].鏃ユ湡 = data1.data[i]["鏃ユ湡"].split("T")[0];
+ }
+ }
+
option.data = data1.data;
//var num = 0;
//for (let i = 0; i < data1.data.length; i++) {
@@ -405,7 +532,7 @@
, HProductModel: HProductModel
, RandomSearch:com
}
- set_InitGrid(JSON.stringify(sWhere));
+ //set_InitGrid(JSON.stringify(sWhere));
get_Display(JSON.stringify(sWhere));
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -431,7 +558,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -470,7 +597,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
@@ -533,7 +660,36 @@
}
})
}
+ //鏄庣粏鎶ヨ〃
+ function get_EntryReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var sBillNo = data[0]["鍗曟嵁鍙�"];
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Kf_MaterOutEntryReport_Cloth.html?sBillNo=' + sBillNo
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//#endregion
});
</script>
--
Gitblit v1.9.1