From 81aee811637e7727895f61fa3befd0cabba46a11 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 22 三月 2023 16:43:44 +0800
Subject: [PATCH] 页面优化
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 12 ++
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 8 +-
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 84 ++++++++++++++++++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillEdit.html | 8 +-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit.html | 25 ++++++
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBillList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.rar | 0
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 14 ++-
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 18 +++-
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html | 8 +-
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 8 ++
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 12 +++
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 6
15 files changed, 176 insertions(+), 33 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 3d55e25..b720e4b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -771,7 +771,9 @@
//澶嶅埗鎸夐挳
form.on('submit(Copy)', function (data) {
+ $("#HItemID").val(0);
$('#HNumber').val('');
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
});
function f_alert(sMsg) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index 0c073dd..59b8614 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -1208,6 +1208,14 @@
{
return false;
}
+ if ($("#HNumber").val() == "") {
+ layer.msg("璇疯緭鍏ヨ亴鍛樹唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HName").val() == "") {
+ layer.msg("璇疯緭鍏ヨ亴鍛樺悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HDeptName").val() == 0) {
layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1220,6 +1228,10 @@
layer.msg("璇烽�夋嫨鏍哥畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if ($("#HName").val() =="") {
+ layer.msg("璇疯緭鍏ヨ亴鍛樺悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Employee/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index cde235d..d2a2af3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -543,6 +543,14 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ if ($("#HNumber").val() == "") {
+ layer.msg("璇疯緭鍏ュ伐搴忎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HName").val() == "") {
+ layer.msg("璇疯緭鍏ュ伐搴忓悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if (!$("#HType").val()) {
layer.msg("璇烽�夋嫨姹囨姤绫诲瀷锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 0b7595a..780c551 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -393,7 +393,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '鐢熶骇璧勬簮-鏂板'
+ , title: '宸ュ簭鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
})
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index aabee45..eb24b8a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -34,6 +34,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏉＄爜缂栧彿</label>
<div class="layui-input-block">
@@ -50,6 +55,35 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 5%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -88,7 +122,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
-
+ var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HModName = "Gy_BarCodeBillList";
@@ -176,6 +210,10 @@
form.on('submit(btnReSearch)', function (data) {
$("#HBarCode").val("");
$("#HMaterName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
sWhere = "";
get_Display(sWhere);
});
@@ -185,6 +223,32 @@
form.on('submit(btnSearch)', function (data) {
var HBarCode = $("#HBarCode").val();//寮�濮嬫棩鏈�
var HMaterName = $("#HMaterName").val();//缁撴潫鏃ユ湡
+ var ColName = $("#ColName").val();//澶嶉�夋
+ 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 (HBarCode) {
sWhere += " and 鏉＄爜缂栧彿 like '" + HBarCode + "'";
}
@@ -269,6 +333,10 @@
option.data = data1.data;
table.render(option);
layer.close(index);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
} else {
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -320,7 +388,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
dataCol = data1.data[0].HGridString.split(',');
@@ -392,6 +460,18 @@
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ 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>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
index 51cfeb0..c33d3f4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/KF_BarCodeStatusChangeBillList.html"
@@ -264,11 +264,11 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));//鏃ユ湡
- $("#btnSearch").click();
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
form.render('select');
+ $("#btnSearch").click();
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
index 2f24e0d..6b50c28 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
@@ -927,6 +927,31 @@
}
option.data = rowdata;
table.render(option);
+ for (var i = 0; i < d.data.length; i++) {
+ var HSTATUS = "";
+ switch (d.data[i].鐘舵��) {
+ case "璁″垝":
+ HSTATUS = "1";
+ break;
+ case "璁″垝纭":
+ HSTATUS = "2";
+ break;
+ case "涓嬭揪":
+ HSTATUS = "3";
+ break;
+ case "寮�宸�":
+ HSTATUS = "4";
+ break;
+ case "瀹屽伐":
+ HSTATUS = "5";
+ break;
+ case "缁撴":
+ HSTATUS = "6";
+ break;
+ }
+ $('#HSTATUS' + (i + 1)).find("option[value='" + HSTATUS + "']").attr("selected", true);
+ }
+
form.render('select');
}
})
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 82c5e27..9435da1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -776,7 +776,13 @@
"HEmpName4": data.HEmpName4,
"HEmpID5": data.HEmpID5,
"HEmpName5": data.HEmpName5,
- "HRemark": data.HRemark
+ "HRemark": data.HRemark,
+ "HMaker": data.HMaker,
+ "HMakeDate": Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+ "HUpDater": data.HUpDater,
+ "HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+ "HChecker": data.HChecker,
+ "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
@@ -1382,7 +1388,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('Cj_StationOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+ location.replace('Cj_StationOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HBillNo=' + $("#HBillNo").val() + '&HSouceBillType=');
}
//#endregion
@@ -1482,7 +1488,7 @@
, cancel: function (index, layero) {
}
})
- layer.msg('绂佹閫夋嫨');
+ //layer.msg('绂佹閫夋嫨');
});
//閫夋嫨鎿嶄綔鍛�
form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.rar" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.rar"
new file mode 100644
index 0000000..e21980f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.rar"
Binary files differ
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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
index 468d42e..0d55168 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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
@@ -173,10 +173,10 @@
<tr>
<th>鎺ユ敹浜�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" readonly>
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
</td>
<td class="bz_td">
- <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
</td>
@@ -1323,7 +1323,7 @@
$("#HEmpNumber").val(data1.data[0].HNumber);
$("#HEmpName").val(data1.data[0].HName);
$("#HEmpID").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID").val());
+ //layer.alert($("#HEmpID").val());
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
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_ProcExchRecordBackBillEdit.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_ProcExchRecordBackBillEdit.html"
index 1330c2d..0af846a 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_ProcExchRecordBackBillEdit.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_ProcExchRecordBackBillEdit.html"
@@ -341,7 +341,7 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HEntryID = params[params[2]];//娴佹按鍙�
}
//宸ュ簭杩斿伐鏂板
@@ -699,8 +699,8 @@
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);//璐熻矗浜篿d
@@ -713,7 +713,7 @@
//鏌ヨ宸ュ簭娴佽浆鍗�
function get_ProcessExchange() {
- var sWhere = " where hmainid=" + linterid + " and (HEntryID=" + HEntryID + " or HEntryID>" + HEntryID + ") ";
+ var sWhere = " where hmainid=" + linterid + " and (cast(娴佹按鍙� as int)=" + HEntryID + " or cast(娴佹按鍙� as int)>" + HEntryID + ") ";
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Sc_ProcExchRecordBackBill/GetProcessExchangeBillSub',
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_ProcExchWorkBackBillEdit.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_ProcExchWorkBackBillEdit.html"
index 2884428..8d5dc0a 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_ProcExchWorkBackBillEdit.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_ProcExchWorkBackBillEdit.html"
@@ -341,7 +341,7 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HEntryID = params[params[2]];//娴佹按鍙�
}
//宸ュ簭杩斿伐鏂板
@@ -693,8 +693,8 @@
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);//璐熻矗浜篿d
@@ -707,7 +707,7 @@
//鏌ヨ宸ュ簭娴佽浆鍗�
function get_ProcessExchange() {
- var sWhere = " where hmainid=" + linterid + " and (HEntryID=" + HEntryID + " or HEntryID>" + HEntryID + ") ";
+ var sWhere = " where hmainid=" + linterid + " and (cast(娴佹按鍙� as int)=" + HEntryID + " or cast(娴佹按鍙� as int)>" + HEntryID + ") ";
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Sc_ProcExchWorkBackBill/GetProcessExchangeBillSub',
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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
index 0b9997b..84843d2 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_ProcessExchangeBillList.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_ProcessExchangeBillList.html"
@@ -149,7 +149,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭杩斿伐</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>杩斿伐鐢宠</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
@@ -497,7 +497,7 @@
table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
layer.close(wait);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -963,7 +963,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["100%", "100%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["娴佹按鍙�"], "yes"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -993,7 +993,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["100%", "100%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["HEntryID"], "yes"]
+ , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html?OperationType=1&linterid=' + checkStatus.data[0]["hmainid"] + '&HEntryID=' + checkStatus.data[0]["娴佹按鍙�"], "yes"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
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_Mul.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_Mul.html"
index 398fbe2..ebd4a7b 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_Mul.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_Mul.html"
@@ -316,12 +316,14 @@
//鍒嗚В鎸夐挳
form.on('submit(btnFj)', function () {
- if (HProcessExchangeSum == 0) {
- layer.msg("璇疯緭鍏ユ祦杞崱寮犳暟!");
+ var HProcessExchangeSum = $("#HProcessExchangeSum").val();
+ var HProcessExchangeHqty = $("#HProcessExchangeHqty").val();
+ if (HProcessExchangeSum <= 0) {
+ layer.msg("娴佽浆鍗″紶鏁板繀椤诲ぇ浜�0!");
return false;
}
- if (HProcessExchangeHqty == 0) {
- layer.msg("璇疯緭鍏ユ瘡寮犳祦杞崱鏁伴噺!");
+ if (HProcessExchangeHqty <= 0) {
+ layer.msg("姣忓紶娴佽浆鍗℃暟閲忓繀椤诲ぇ浜�0!");
return false;
}
@@ -331,8 +333,8 @@
var dataNum = [];
var HBillNo = $("#HBillNo").val();
- for (var i = 0; i < $("#HProcessExchangeSum").val(); i++) {
- dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": $("#HProcessExchangeHqty").val() });
+ for (var i = 0; i < HProcessExchangeSum; i++) {
+ dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty});
}
option1.data = dataNum;
table.render(option1);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index bdb7237..f3e0f77 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -396,7 +396,7 @@
<input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
- <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ <!--<input type="hidden" name="HMaker" id="HMaker">--><!--鍒跺崟浜�-->
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
</form>
@@ -449,6 +449,8 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1 || OperationType == 2) {
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -612,7 +614,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+ location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HBillNo=' + $("#HBillNo").val() + '&HSouceBillType=');
}
//#endregion
@@ -640,7 +642,13 @@
"HSourceName": data.HSourceName,
"HEmpID": data.HEmpID,
"HEmpName": data.HEmpName,
- "HRemark": data.HRemark
+ "HRemark": data.HRemark,
+ "HMaker": data.HMaker,
+ "HMakeDate": Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+ "HUpDater": data.HUpDater,
+ "HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+ "HChecker": data.HChecker,
+ "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
@@ -876,7 +884,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
//$("#HEmpID").val(sessionStorage["Czybm"]);
//$("#HEmp").val(sessionStorage["HUserName"]);
- $("#HMaker").val(sessionStorage["HUserName"]);
+
@@ -1214,7 +1222,7 @@
$("#HEmpNumber").val(data1.data[0].HNumber);
$("#HEmpName").val(data1.data[0].HName);
$("#HEmpID").val(data1.data[0].HItemID);
- layer.alert($("#HEmpID").val());
+ /* layer.alert($("#HEmpID").val());*/
}
else {
layer.alert(data1.code + data1.Message, { icon: 5 });
--
Gitblit v1.9.1