From dcb1e3a12a07273cc18012e978bf2425557a9088 Mon Sep 17 00:00:00 2001
From: wangbin <lan@DESKTOP-MG88OFJ>
Date: 星期三, 10 七月 2024 16:02:16 +0800
Subject: [PATCH] 提料计划单列表,即时库存列表,车间仓库,提料,要料计划信息列表, 要料计划单列表,日计划单列表,生产计划日期查询,工艺路线维护, 工艺路线查询,工艺路线历史列表,生产班组,生产资源维护,工作中心维护,生产工序维护,条码主档维护 ,防错验证检查列表, 防错验证清单列表,设备启动点检清单,设备启动点检清单列表 ,质量追溯查询,退料申请 恢复,生产日计划查询,半成品计划排产 ,工作日期,产品防错验证清单列表
---
WebTM/views/车间管理/产线/Gy_WorkDay.html | 148 ------------------------------------------------
1 files changed, 2 insertions(+), 146 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
index a38d979..d29ff59 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
@@ -60,61 +60,6 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -207,12 +152,6 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
form.render('select');
sWhere = "";
//$("#btnSearch").click();
@@ -266,33 +205,7 @@
};
}
//#endregion
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
- //鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
- , area: ['100%', '100%']
- , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../杞﹂棿绠$悊/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
- , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- end: function () { //褰撳叧闂椂璋冪敤
- get_FastQuery(table, option);
- }
- , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- });
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -316,10 +229,6 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
}
else {
switch (data[i].Type) {
@@ -348,7 +257,7 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -374,12 +283,6 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -400,48 +303,6 @@
break;
}
sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
}
if (HDate) {
sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
@@ -618,8 +479,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HParentID",];
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
@@ -701,10 +561,6 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
--
Gitblit v1.9.1