From 79ed1831ddeaf7b5c650e96528f74575e4fa2e7f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 19 一月 2024 10:23:00 +0800
Subject: [PATCH] 报工时添加是否做首件/工序检验单控制；批量出站汇报；生产汇报单添加过滤添加，列设置按钮
---
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 19 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 41 ++--
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html | 2
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 2
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html | 8
WebTM/views/IpadIndex.html | 100 ++++++++----
WebTM/views/车间管理/工序流转卡/Gy_ProcessBatchReport.html | 268 +++++++++++++++++++++++++++++++--
7 files changed, 364 insertions(+), 76 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 37576d0..411e041 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -122,7 +122,7 @@
, data: []
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'radio' }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
, { field: 'HNumber', width: 150, title: '鑱屽憳浠ｇ爜' }
, { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 74a5b5d..0864503 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -180,21 +180,21 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName+']</span></h1>';
+ html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "鐢熶骇涓�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "鎸傝捣":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
case "瀹屽伐":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:5px;">棰嗘枡鐘舵�侊細</span><span>' + LoadData1[i].棰嗘枡鐘舵�� + '</span></h1>';
break;
default:
}
@@ -379,6 +379,7 @@
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+ HICMOBillNo = $("#wk" + i + "").html(); //鐢熶骇璁㈠崟鍙�
HMaterName = $("#ptn" + i + "").html(); //浜у搧鍚嶇О
HMaterID = $("#materid" + i + "").html(); //浜у搧ID
@@ -648,10 +649,10 @@
content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
end: function () {
- },
+ },
});
- /* window.open("../../../views/鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
+ /* window.open("../../../views/鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=" + HMaterID + "&HSourceNo=" + workcode + "&HSourceEntryID=" + HSourceEntryID);*/
}
//姹囨姤鎸夐挳鐐瑰嚮浜嬩欢
@@ -777,39 +778,66 @@
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
- }
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '浜ч噺姹囨姤鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
- end: function () {
+ }
- },
- success: function (dom, index) {
- var data = [];
- data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceBillType": HSourceBillType
- });
+ var IsCheck = false;
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(data);
+ //鏍规嵁绯荤粺鍙傛暟鎺у埗锛屽垽鏂敓浜ц鍗曟槸鍚﹀仛浜嗛浠舵楠屽崟鍜屽伐搴忔楠屽崟锛屽鏋滄湁鍏朵腑涓�绉嶆楠屽崟娌″仛锛屽垯涓嶈鍋氱敓浜ф眹鎶ュ崟
+ $.ajax({
+ url: GetWEBURL() + "/ReportPlatForm/IsCheck",
+ type: "GET",
+ data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HICMOBillNo": HICMOBillNo },
+ async: false,
+ success: function (data) {
+ if (data.code == 0) {
+ layer.alert(data.Message);
+ return false;
+ } else {
+ IsCheck = true;
+ }
},
+ error: function (err) {
+ layer.alert(data.Message);
+ return false;
+ }
});
+
+ if (IsCheck == true) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜ч噺姹囨姤鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "workcode": workcode,
+ "HSourceID": HSourceID1,
+ "HSourceName": HSourceName1,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ "Czybm": sessionStorage["Czybm"],
+ //"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
+
}
//涓婃枡闃查敊鍗�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 96cad61..d20f59a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -891,7 +891,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function () {
});
if (data.Verify == "Y") //鑷姩瀹℃牳
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 5ef7602..ff22f5f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -276,6 +276,25 @@
break;
};
});
+
+ //琛岀洃鍚簨浠�
+ 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;
+ }
+ });
+ });
//#endregion
//#region 鏌ヨ鎸夐挳
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
index 846ce1a..47fd9c8 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
@@ -152,6 +152,9 @@
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
+ //绂佺敤淇濆瓨鎸夐挳
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
var isUseCheck = document.getElementById("HUseingFlag").checked;
var isStopCheck = document.getElementById("HStopflag").checked;
data.field.HUseingFlag = isUseCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
@@ -178,12 +181,15 @@
});
}
else {
+ //鍚敤淇濆瓨鎸夐挳
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
f_alert(data.Message);
}
layer.closeAll("loading");
},
error: function (err) {
-
+ //鍚敤淇濆瓨鎸夐挳
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
f_alert("閿欒:" + err);
}
});
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/Gy_ProcessBatchReport.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/Gy_ProcessBatchReport.html"
index 1acc41d..5fd47ae 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/Gy_ProcessBatchReport.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/Gy_ProcessBatchReport.html"
@@ -159,8 +159,11 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_PaddingQty"><i class="layui-icon layui-icon-form"></i>濉厖鏁伴噺</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_PaddingEmp"><i class="layui-icon layui-icon-form"></i>濉厖鎿嶄綔鍛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -178,6 +181,10 @@
<option value="false">鍚�</option>
<option value="true">鏄�</option>
</select>
+</script>
+<!--澶嶉�夋锛堣浆涓嬮亾锛�-->
+<script type="text/html" id="HLastSubProc">
+ <input type="checkbox" value="{{d.HLastSubProc}}" lay-skin="primary" id="HLastSubProc{{d.LAY_TABLE_INDEX+1}}" lay-filter="HLastSubProc" {{ d.HLastSubProc == 1 ? 'checked' : '' }} disabled>
</script>
<script>
layui.config({
@@ -197,7 +204,8 @@
var option;
var StationOutID = [];
var StationOutBillNo = [];
-
+ var HModName = "Gy_ProcessBatchReport";
+ var HEmpNumber_Enter = "";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -263,7 +271,8 @@
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
"HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0,
"HInterID": 0, "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "",
- "HICMOQty": 0, "HPlanQty": 0
+ "HICMOQty": 0, "HProcessExchangeQty": 0, "HLastSubProc": true, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": "",
+ "NoOutboundHqty":0
};
switch (obj.event) {
@@ -295,6 +304,26 @@
}
form.render('select');
}
+ break;
+ //濉厖鏁伴噺
+ case 'btn_PaddingQty':
+ if (data.length != 1) {
+ layer.msg("璇峰嬀閫変竴琛屾暟鎹幏鍙栭渶瑕佸～鍏呯殑鏁伴噺锛�");
+ }
+
+ PaddingQty(data, obj);
+ break;
+ //濉厖鎿嶄綔鍛�
+ case 'btn_PaddingEmp':
+ if (data.length != 1) {
+ layer.msg("璇峰嬀閫変竴琛屾暟鎹幏鍙栭渶瑕佸～鍏呯殑鎿嶄綔鍛橈紒");
+ }
+
+ PaddingEmp(data, obj);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -341,9 +370,24 @@
}
$input.val(val.replace(/[^\d]/g, ''));
});
+ } else if (obj.event == 'HEmpNumber') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) {
+ val = "0";
+ }
+ if (val.length > 1) {
+ var firstNum = val.substring(0, 1); //鎴彇瀛楃涓茬涓�浣嶆暟锛屽垽鏂槸鍚︿负0锛�
+ if (firstNum == 0) { //濡傛灉绗竴浣嶆暟涓�0锛屽垯鍒犻櫎绗竴浣嶆暟
+ val = val.substring(1, val.length);
+ }
+ }
+ //$input.val(val.replace(/[^\d]/g, ''));
+ HEmpNumber_Enter = val;
+ });
}
- //#region [ 琛ㄤ綋F7浜嬩欢 ]
+ //#region [ 琛ㄤ綋F7,鍥炶溅浜嬩欢 ]
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == 'HSourceCheck') {
@@ -415,6 +459,31 @@
obj.event = "";
return false;
+ }
+ if (event.key == "Enter") {
+ if (obj.event == 'HEmpNumber') {
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+ type: "GET",
+ data: { "HEmpNumber": HEmpNumber_Enter },
+ success: function (data1) {
+ if (data1.count == 1) {
+ obj.update({
+ HEmpName: data1.data[0].HName
+ , HEmpID: data1.data[0].HItemID
+ , HEmpNumber: data1.data[0].HNumber
+ });
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ obj.event = "";
+ return false;
}
})
//#endregion
@@ -438,6 +507,18 @@
//鎵撳嵃
form.on('submit(btn_print)', function (data) {
get_print(data);
+ });
+
+ //杞笅閬�
+ form.on('checkbox(HLastSubProc)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HLastSubProc = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
});
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -480,8 +561,6 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'lngBillKey', title: '娴佽浆鍗D', hide: true }
, { field: 'lngBillSubKey', title: '娴佽浆鍗″瓙ID', hide: true }
- , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
- , { field: 'HWorkCenterName', title: '宸ヤ綔涓績鍚嶇О' }
, { field: 'HSourceBillType', title: '鍗曟嵁绫诲瀷', hide: true }
, { field: 'HProcNo', title: '娴佹按鍙�', width: 80 }
, { field: 'HICMOQty', title: '浠诲姟鍗曟暟閲�', hide: true }
@@ -489,25 +568,32 @@
, { field: 'HProcID', title: '宸ュ簭ID', hide: true }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
, { field: 'HMaterID', title: '浜у搧ID', hide: true }
- , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜'}
+ , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
, { field: 'HMaterName', title: '浜у搧鍚嶇О' }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HQty', title: '鍚堟牸鏁伴噺', edit: 'text', width: 90, event:"inputHQty" }
+ , { field: 'HQty', title: '鍚堟牸鏁伴噺', edit: 'text', width: 90, event: "inputHQty" }
, { field: 'HWasterQty', title: '鎶ュ簾鏁伴噺', edit: 'text', width: 90, event: "inputWasterHQty" }
, { field: 'HEmpID', title: '鎿嶄綔鍛業D', hide: true }
, { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', event: "HEmpNumber" }
, { field: 'HEmpName', title: '鎿嶄綔鍛樺悕绉�' }
- , { field: 'HProcExchBillNo', title: '娲惧伐鍗曞彿', width: 150 }
- , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: 'HProcExchBillNo', title: '娴佽浆鍗″彿', width: 150 }
+ , { field: 'HProcessExchangeQty', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: 'NoOutboundHqty', title: '鏈嚭绔欐暟閲�', width: 100 }
, { field: 'HInterID', title: '宸ュ簭姹囨姤ID', hide: true }
, { field: 'HBillNo', title: '宸ュ簭姹囨姤鍗曞彿', width: 195 }
- , { field: 'HWorkCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text'}
+ , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
+ , { field: 'HWorkCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text' }
+ , { field: 'HWorkCenterName', title: '宸ヤ綔涓績鍚嶇О' }
, { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
, { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
+ , { field: 'HLastSubProc', title: '杞笅閬�', templet: '#HLastSubProc', unresize: false }
, { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿', hide: true }
, { field: 'HICMOInterID', title: '浠诲姟鍗旾D', hide: true }
, { field: 'HICMOEntryID', title: '浠诲姟鍗曞瓙鍐呯爜', hide: true }
+ , { field: 'HMainSourceInterID', title: '婧愬崟鍐呯爜', hide: true }
+ , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
+ , { field: 'HMainSourceBillNo', title: '婧愬崟鍗曞彿', hide: true }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -543,7 +629,8 @@
"HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "",
"HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "",
"HPlanQty": 0, "HQty": 0, "HWasterQty": 0, "HICMOBillNo": "", "HICMOInterID": 0, "HICMOEntryID": 0, "HInterID": 0,
- "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HICMOQty": 0, "HPlanQty": 0
+ "HBillNo": "", "HProcID": 0, "HCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HICMOQty": 0, "HProcessExchangeQty": 0,
+ "HLastSubProc": true, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": "", "NoOutboundHqty": 0
}];
table.render(option);
@@ -566,13 +653,16 @@
"lngBillKey": result.data[i]["hmainid"], "lngBillSubKey": result.data[i]["HEntryID"], "HProcExchBillNo": result.data[i]["鍗曟嵁鍙�"], "HSourceBillType": result.data[i]["HBillType"],
"HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"],
"HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮"], "HEmpID": result.data[i]["HWorkerID"], "HEmpNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HEmpName": result.data[i]["鎿嶄綔宸�"],
- "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HWasterQty": 0, "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"], "HBillNo": StationOutBillNo[i], "HInterID": StationOutID[i], "HProcID": result.data[i]["HProcID"], "HCenterID": result.data[i]["HCenterID"], "HWorkCenterNumber": result.data[i]["宸ヤ綔涓績浠ｇ爜"], "HWorkCenterName": result.data[i]["宸ヤ綔涓績"]
+ "HProcessExchangeQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HWasterQty": 0, "HICMOBillNo": result.data[i]["浠诲姟鍗曞彿"], "HICMOInterID": result.data[i]["hicmointerid"], "HICMOEntryID": result.data[i]["HICMOEntryID"], "HICMOQty": result.data[i]["鐢熶骇璁㈠崟鏁伴噺"], "HBillNo": StationOutBillNo[i], "HInterID": StationOutID[i], "HProcID": result.data[i]["HProcID"], "HCenterID": result.data[i]["HCenterID"], "HWorkCenterNumber": result.data[i]["宸ヤ綔涓績浠ｇ爜"], "HWorkCenterName": result.data[i]["宸ヤ綔涓績"], "HLastSubProc": true, "HMainSourceInterID": result.data[i]["婧愬崟涓诲唴鐮�"], "HMainSourceEntryID": result.data[i]["婧愬崟瀛愬唴鐮�"], "HMainSourceBillNo": result.data[i]["娴佽浆鍗″彿"], "NoOutboundHqty": Number(result.data[i]["娴佽浆鍗℃暟閲�"]) - Number(result.data[i]["鍑虹珯鎶ュ簾鍏宠仈鏁伴噺"]) - Number(result.data[i]["鍑虹珯鍏宠仈鏁伴噺"])
}
)
}
option.data = rowdata;
table.render(option);
form.render('select');
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
} else {
layer.msg(result.code + result.Message, { icon: 5 });
}
@@ -604,9 +694,9 @@
layer.msg("绗�" + (i + 1) + "琛�:鎿嶄綔鍛樹笉鑳戒负绌�!");
return false;
}
- //娲惧伐鍗曞彿涓嶄负绌�
+ //娴佽浆鍗″彿
if (option.data[i]["lngBillKey"] == "0") {
- layer.msg("绗�" + (i + 1) + "琛�:娲惧伐鍗曚笉鑳戒负绌�!");
+ layer.msg("绗�" + (i + 1) + "琛�:娴佽浆鍗′笉鑳戒负绌�!");
return false;
}
//鐗╂枡涓嶄负绌�
@@ -636,7 +726,6 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num_1);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + sSubStr + ";" + OperationType;
-
var index = layer.load();
$.ajax({
type: "POST",
@@ -662,6 +751,30 @@
});
}
+ //濉厖姹囨姤鏁伴噺
+ function PaddingQty(data, obj) {
+ //鑾峰彇褰撳墠琛岀殑绱㈠紩
+ var rowIndex = $(obj.tr).attr("data-index");
+
+ for (let i = 0; i < option.data.length; i++) {
+ option.data[i].HQty = data[0].HQty;
+ option.data[i].HWasterQty = data[0].HWasterQty;
+ }
+
+ table.render(option);
+ }
+
+ //濉厖鎿嶄綔鍛�
+ function PaddingEmp(data, obj) {
+ for (let i = 0; i < option.data.length; i++) {
+ option.data[i].HEmpID = data[0].HEmpID;
+ option.data[i].HEmpNumber = data[0].HEmpNumber;
+ option.data[i].HEmpName = data[0].HEmpName;
+ }
+
+ table.render(option);
+ }
+
function get_UrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -673,6 +786,127 @@
return vars;
}
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["鍗曟嵁绫诲瀷", "浠诲姟鍗曟暟閲�", "浠诲姟鍗曞彿", "璁″垝鏁伴噺", "娴佽浆鍗D", "娴佽浆鍗″瓙ID", "宸ュ簭ID", "浜у搧ID", "鎿嶄綔鍛業D", "宸ュ簭姹囨姤ID", "宸ヤ綔涓績ID", "浠诲姟鍗旾D", "鐢熶骇璧勬簮ID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "浠诲姟鍗曞瓙鍐呯爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
//#endregion
})
</script>
\ No newline at end of file
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_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
index 2e72e26..0ed2834 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_ProcessExchangeIssueBillList.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_ProcessExchangeIssueBillList.html"
@@ -161,8 +161,8 @@
//
var HModName = "Sc_ProcessExchangeIssueBillList";
//鍒濆鍖栫晫闈�
- set_ClearBill();
-
+ set_ClearBill();
+
//#endregion
//#region 澶村伐鍏锋爮浜嬩欢
@@ -218,7 +218,7 @@
break;
//鎵归噺姹囨姤
case 'set_BatchReport': set_BatchReport();
- break;
+ break;
};
});
@@ -379,6 +379,7 @@
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: '鏈嚭绔欐暟閲�', title: '鏈嚭绔欐暟閲�', width: 100 }
, {
field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
}
@@ -675,7 +676,7 @@
var interid = [];
var ieid = [];
for (let i = 0; i < data.length; i++) {
- array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
+ array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
interid.push(checkStatus.data[i]["hmainid"]);
ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
}
@@ -694,13 +695,13 @@
, area: ["100%", "100%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Gy_ProcessBatchReport.html?OperationType=1&linterid=' + HInterID.toString() + '&HEntryID=' + HEntryID.toString() + '&HIeID=' + HIeID + '&HReportNum=' + HReportNum, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
+ //, btn: ["纭畾", "鍙栨秷"]
+ //, btn1: function (index, laero) {
+ // //鍒锋柊琛ㄦ牸鏁版嵁
+ // DisPlay_HideColumn();
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // layer.close(index);//鍏抽棴寮圭獥
+ //}
})
} else {
layer.msg('姹囨姤宸ュ簭涓嶈兘鏄浆宸ュ簭锛�');
@@ -807,15 +808,15 @@
var interid = [];
var ieid = [];
for (let i = 0; i < data.length; i++) {
- array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
+ array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
interid.push(checkStatus.data[i]["hmainid"]);
- ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
+ ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
//鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
//if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
// layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
// return;
- //}
- }
+ //}
+ }
var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
var HInterID = interid.join(",");
var HIeID = ieid.join(",");
@@ -844,7 +845,7 @@
} else {
layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
}
- }
+ }
//宸ュ簭濮斿娲惧伐
function set_WWSendWork() {
@@ -854,14 +855,14 @@
var interid = [];
var ieid = [];
for (let i = 0; i < data.length; i++) {
- array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
+ array.push(checkStatus.data[i]["HEntryID"]); //鑾峰彇娴佽浆鍗″瓙琛↖D
interid.push(checkStatus.data[i]["hmainid"]);
ieid.push(checkStatus.data[i]["hmainid"].toString() + checkStatus.data[i]["HEntryID"].toString());
//鍒ゆ柇鍗曟嵁鍙锋槸鍚︾浉鍚�
//if (checkStatus.data[0]["鍗曟嵁鍙�"] != checkStatus.data[i]["鍗曟嵁鍙�"]) {
// layer.msg("鍕鹃�変簡涓嶅悓娴佽浆鍗″彿锛岃纭");
// return;
- //}
+ //}
}
var HEntryID = array.join(",");//鐢ㄩ�楀彿鍒嗗壊鏁扮粍
var HInterID = interid.join(",");
@@ -891,8 +892,8 @@
} else {
layer.msg('璇烽�夋嫨鏁版嵁缂栬緫锛�');
}
- }
-
+ }
+
//#region 鎸囨淳鏃ユ湡
function set_PlanDate() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1