From 9e7294ca82f83ab9291141ad32368972a3b4ab68 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] 1
---
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html | 61 +++++++++++++++++++-----------
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 3 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 10 ++++-
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 6 ++
4 files changed, 54 insertions(+), 26 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 4a72256..b555f31 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -618,13 +618,14 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
- var index = layer.load();
+
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
}
+ var index = layer.load();
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index eb517d5..8b7cf0e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -623,6 +623,10 @@
//琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
form.on('submit(HEquipDotCheckRuleInterist)', function () {
+ if ($("#HEquipID").val() == 0 || $("#HEquipID").val() == null || $("#HEquipID").val() == "") {
+ layer.alert("璇峰厛鎵弿璁惧浜岀淮鐮佸甫鍑鸿澶囦俊鎭�");
+ return;
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -632,7 +636,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList_PDA.html?HEquipID=' + $("#HEquipID").val(), 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
index 197dde4..a863a11 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
@@ -92,6 +92,10 @@
, laypage = layui.laypage
, laydate = layui.laydate
, soulTable = layui.soulTable
+
+ var params = getUrlVars();
+ var HEquipID = params[params[0]]; //璁惧ID
+
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckRuleList_PDA";
@@ -228,11 +232,12 @@
//鏌ヨ
function get_Display(sWhere) {
+ sWhere += "";
var index = layer.load();
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
+ url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
@@ -313,27 +318,27 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- 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;
- }
- sWhere += " and " + ColName + " " + com;
- }
+ //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;
+ // }
+ // sWhere += " and " + ColName + " " + com;
+ //}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -643,6 +648,18 @@
form.render('select');
}
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
});
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 ec2f90c..26d9c71 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"
@@ -140,6 +140,12 @@
<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" 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">
+ <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum">
+ </div>
+ </div>
<!--<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">鎬昏鍥惧彿</label>
<div class="layui-input-inline">
@@ -444,12 +450,12 @@
</button>
</div>
</div>
- <div class="layui-col-xs3 layui-inline">
+ <!--<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="HProjectNum" id="HProjectNum" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">濮斿鍔犲伐鍗曚綅</label>
--
Gitblit v1.9.1