From 35878fc315464d9475aeafeb12d0a5f09b6d9095 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 11 七月 2022 10:16:41 +0800
Subject: [PATCH] 日计划工单组织显示...
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 155 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 136 insertions(+), 19 deletions(-)
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index c81895d..5e258ee 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -34,15 +34,16 @@
margin-left: -15px;
margin-right: -15px;
}
+
.layui-form-item .layui-inline {
margin-top: 5px;
margin-bottom: 5px;
margin-right: 0px;
}
+
.layui-form-label {
width: 25%;
}
-
</style>
</head>
<body>
@@ -54,6 +55,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -231,7 +233,7 @@
</button>
</div>
</div>
-
+
</div>
</div>
</div>
@@ -255,7 +257,7 @@
<input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
</div>
</div>
-
+
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">濮斿鍔犲伐鍗曚綅</label>
<div class="layui-input-inline">
@@ -332,15 +334,15 @@
</div>
</div>
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs3 layui-inline">
@@ -349,7 +351,7 @@
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
</div>
</div>
-
+
</div>
</div>
</div>
@@ -603,7 +605,8 @@
, laydate = layui.laydate
, element = layui.element;
var option;
- var btnHMaterID="";
+ var btnHMaterID = "";
+ var HModName = "Sc_ProcessExchangeBill";
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -626,6 +629,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ DisPlay_HideColumn();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
@@ -1020,6 +1024,11 @@
}
});
+ //闅愯棌鍒楄缃�
+ form.on('submit(HideColumn)', function (data) {
+ get_HideColumn();
+ });
+
//閫夋嫨浜у搧寮圭獥
form.on('submit(btnSearchMater2)', function () {//浜у搧
@@ -1031,7 +1040,7 @@
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- ,btn: ['纭畾', '鍙栨秷']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1276,7 +1285,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
getRoutingBill(checkStatus.data[0].鍗曟嵁鍙�);
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1294,7 +1303,7 @@
var Tablerow = [];
$("#RoutingBill").val(data[0].鍗曟嵁鍙�)
-
+
for (var i = 0; i < data.length; i++) {
Tablerow.push({
"HProcNo": data[i].宸ュ簭鍙�, "HProcID": data[i].hprocid, "HProcNumber": data[i].宸ュ簭浠ｇ爜, "HProcName": data[i].宸ュ簭, "HWorkRemark": data[i].琛ㄤ綋澶囨敞,
@@ -1412,6 +1421,114 @@
}
});
});
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "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 = ["HProcID", "HCenterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 });
+ }
+ })
+ }
+
+
//閫�鍑�
form.on('submit(Cancel)', function () {
if (linterid == undefined) {
@@ -1636,7 +1753,7 @@
var hbillno = result.data[0].鍗曟嵁鍙�
getRoutingBill(hbillno);
}
-
+
},
error: function (result) {
layer.close(index);
@@ -1652,7 +1769,7 @@
})
//txtHBillNo.Text = sBillNo;
//GetICMOBillDetail(hmainid, HEntryID);
-
+
}
function GetICMOBillDetail(hmainid, HEntryID) {
--
Gitblit v1.9.1