From 49a0e726f3b50da8a65f2d66ed4d3de7574dd3ab Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 12 七月 2021 09:04:56 +0800
Subject: [PATCH] 报工平台前端页面交互优化
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 187 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 45 deletions(-)
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_Add_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_Add_ICMOReportBillList.html"
index e55d58c..5633e0a 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_Add_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_Add_ICMOReportBillList.html"
@@ -90,16 +90,21 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
+ <option value="0" selected="selected">鐢熶骇浠诲姟鍗�</option>
+ <option value="1">鎵嬪伐褰曞叆</option>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceInterID" id="HSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -118,8 +123,8 @@
<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" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine" id="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
</script>
@@ -140,7 +145,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
-
+
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -157,7 +162,7 @@
var params = getUrlVars();
var hID = params[params[0]];//缂栬緫鏌ョ湅
-
+ var Sctag = "0";
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -185,7 +190,8 @@
//}
var tableReload = table.reload;
var option = {
- elem: '#mainTable'
+ id:'mainTable'
+ ,elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 500
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
@@ -282,7 +288,7 @@
});
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
-
+
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
@@ -300,10 +306,9 @@
}
});
}
-
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7")
- {
+ if (event.key == "F7") {
if (obj.event === 'HMaterCode') //鐗╂枡淇℃伅
{
//椤甸潰灞�-鑷畾涔�
@@ -470,9 +475,9 @@
}
obj.event = "";
return false;
-
+
}
- })
+ })
});
@@ -485,7 +490,7 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
+
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sc_ICMOReportBill/Sc_GetICMOReportBillListCheckDetai",
@@ -536,22 +541,35 @@
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("0");
$("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3711' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNum",
+ // type: "GET",
+ // data: { "HBillType": '3711' },
+ // success: function (d) {
+ // //console.log(d.data);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // $("#HDate").val(shijian);
+ // $("#HInterID").val(0);
+ // }
+ //});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(hID);
/* RoadBillSub(linterid);*/
}
+
+ //鑾峰彇涓嬫媺閫変腑鍊�
+ form.on('select(HSourceBillType)', function (data) {
+ Sctag = data.value;
+ form.render('select');
+ if (Sctag != "0") {
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
+
//琛ㄥご淇℃伅杞﹂棿寮圭獥
form.on('submit(HShopList)', function () {
@@ -667,7 +685,76 @@
});
});
+ //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+ form.on('submit(XDHList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇浠诲姟鍗曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: false,
+ content: ['../../PublicPage/ProductionOrder.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , 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('璇烽�夋嫨鍗曟嵁鏁版嵁');
+ }
+ //鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
+ table.reload('mainTable');
+ $("#HSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HSourceEntryID").val(checkStatus.data[0].HEntryID);
+ var list = [];
+ for (var i = 0; i <checkStatus.data.length; i++) {
+ list.push(checkStatus.data[i].鍗曟嵁鍙�)
+ }
+ if (isAllEqual(list)) //鐩稿悓鍗曞彿
+ {
+ if (checkStatus.data.length>1)
+ {
+ for (var i = 0; i < checkStatus.data.length-1; i++) //琛ヨ
+ {
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ }
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterID"] .layui-table-cell').text(checkStatus.data[i].HMaterID);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterCode"] .layui-table-cell').text(checkStatus.data[i].HMaterCode);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterName"] .layui-table-cell').text(checkStatus.data[i].HMaterName);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterSpec"] .layui-table-cell').text(checkStatus.data[i].HMaterSpec);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitID"] .layui-table-cell').text(checkStatus.data[i].HUnitID);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitCode"] .layui-table-cell').text(checkStatus.data[i].HUnitCode);
+ $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitName"] .layui-table-cell').text(checkStatus.data[i].HUnitName);
+ }
+ }
+ else
+ {
+ layer.alert("璇烽�夋嫨鐩稿悓鍗曞彿!", { icon: 5 });
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+ layer.full(index);
+ }
+ });
+ });
@@ -717,14 +804,14 @@
{
return false;
}
-
+
$.ajax(
{
type: "POST",
url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainSub},
+ data: { "msg": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -766,6 +853,17 @@
});
+ //鍒ゆ柇鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+ function isAllEqual(array) {
+ if (array.length > 0) {
+ return !array.some(function (value, index) {
+ return value !== array[0];
+ });
+ } else {
+ return true;
+ }
+ }
+
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
ProcID, ZRProcName, QRName
@@ -825,49 +923,48 @@
var Result = true;
if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
layer.msg("杞﹂棿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
layer.msg("缁熻鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
-
+
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HMaterID == "")
- {
- layer.msg("鏄庣粏璁板綍绗�"+(i+1)+"琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
if (sSubStr[i].HUnitID == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍗曚綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
if (sSubStr[i].HSourceID == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璧勬簮淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
if (sSubStr[i].HWorkerid == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎿嶄綔鍛樹俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
+ return Result = false;
}
- if (parseFloat(sSubStr[i].HQty) <= 0 || sSubStr[i].HQty=="") {
+ if (parseFloat(sSubStr[i].HQty) <= 0 || sSubStr[i].HQty == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏁伴噺涓嶈兘涓虹┖鎴�0鎴栬�呭皬浜�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result =false;
- }
+ return Result = false;
+ }
}
}
else {
- return Result =true;
+ return Result = true;
}
return Result;
}
--
Gitblit v1.9.1