From 644ebdd7564dc4fa0a67c284a292e5f79010bc91 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 24 八月 2021 17:02:24 +0800
Subject: [PATCH] 工序流转卡优化
---
WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 571 ++++++++++++++++++++++++++++++--------------------------
2 files changed, 307 insertions(+), 266 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index 29e768b..dd239b6 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -48,7 +48,7 @@
//var sMainStr = JSON.stringify(table.cache['ck-table']);
var checkStatus = table.checkStatus('ck-table')
, data = checkStatus.data;
- parent.GetICMOBillValue(data[0].hmainid);
+ //parent.GetICMOBillValue(data[0].hmainid);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
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 e94a68c..9ed5acf 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"
@@ -24,18 +24,31 @@
.btn-title {
font-size: 16px;
}
- /*.table-select {
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
margin-top: -10px;
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>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card" style="padding: 15px;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<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>
@@ -54,126 +67,127 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID">
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HDate" id="HDate">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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">
- <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber2" id="HMaterNumber2" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧瑙勬牸</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧瑙勬牸</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HQty" id="HQty">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曚綅</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HUnitID" id="HUnitID" value="0">
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝瀹屽伐鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妯″叿璁惧</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">妯″叿璁惧</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+ </button>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 38.8%;">
- <label class="layui-form-label" style="width: 85px;">琛ユ枡鍘熷洜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 70px;">
- <input type="checkbox" name="checkboxHBLFlag" id="checkboxHBLFlag" title="琛ユ枡鏍囪" lay-skin="primary" lay-filter="checkboxHBLFlag">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">琛ユ枡鏍囪</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHBLFlag" id="checkboxHBLFlag" lay-skin="primary" lay-filter="checkboxHBLFlag" value="true" title="鏄惁琛ユ枡">
<input type="hidden" value="false" name="HBLFlag" id="HBLFlag">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰缂栧彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 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-row">
- <div class="layui-inline" style="width: 55.1%;">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸枡鎵规</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸枡鎵规</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -184,24 +198,23 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+ </button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閫夊崟鍙�</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="textBox2" id="textBox2" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: left;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <input type="hidden" name="" id="" value="0">
</div>
</div>
<div class="layui-inline">
@@ -255,7 +268,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇鏁伴噺</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style=" background-color: #efefef4d; width: 90px; float: left; margin-right: 4px;" readonly>
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style=" background-color: #efefef4d; width: 90px; float: left; margin-right: 4px;" readonly>
<input type="text" class="layui-input" name="HprocExQty" id="HprocExQty" style="background-color:#efefef4d; width: 90px;" readonly>
</div>
</div>
@@ -270,7 +283,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">HICMOEntryID</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -511,6 +524,13 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+ <!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+ <script type="text/html" id="isEntrust">
+ <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+ <option value="false">鍚�</option>
+ <option value="true">鏄�</option>
+ </select>
+ </script>
<script>
layui.config({
@@ -523,6 +543,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -543,7 +564,19 @@
}
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
- $("#HItemID").val(0);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7505' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
}
else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -555,7 +588,8 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
@@ -579,9 +613,9 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
- "HCenterID": "0", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "0",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "鍚�", "isEntrustValue": "false",
+ "HProcNo": "", "hprocid": "", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
+ "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+ "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
"HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
"濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
"鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
@@ -591,23 +625,23 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , cellMinWidth: 90
+ , height: 'full-50'
+ , cellMinWidth: 110
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- , { field: 'hprocid', title: '宸ュ簭ID', hide: true }
- , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭鍚嶇О', event: "HProcCheck" }
- , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑', edit: 'text' }
+ , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
+ , { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
+ , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
+ , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
, { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績鍚嶇О', event: "HWorkCenterCheck" }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck" }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績鍚嶇О' }
, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', event: "HSupCheck" }
- , { field: 'isEntrust', title: '鏄惁濮斿', event: "isEntrustCheck" }
- , { field: 'isEntrustValue', title: '鏄惁濮斿鍊�' }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: 'isEntrust', title: '鏄惁濮斿', templet: '#isEntrust' }
, { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
, { field: '鍔犲伐鍗曚綅', title: '鍔犲伐鍗曚綅', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
@@ -622,14 +656,29 @@
, { field: 'isEditValue', title: '涓嶅彲缂栬緫鍊�', hide: true }
, { field: '鑹巼', title: '鑹巼', edit: 'text' }
, { field: '绱鑹巼', title: '绱鑹巼', edit: 'text' }
- , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', edit: 'text' }
- , { field: '鍥剧焊缂栧彿', title: '鍥剧焊缂栧彿', edit: 'text' }
- , { field: '鏈伐搴忕‘璁よ褰�', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
+ , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
+ , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text', width: 500 }
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', width:1200 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
- //, done: function (res, curr, count) {
- // $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');
- //}
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.isEntrust);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
};
//鍒濆鍔犺浇琛ㄦ牸
option.data = rowdata;
@@ -650,9 +699,9 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
- "HCenterID": "0", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "0",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "鍚�", "isEntrustValue": "false",
+ "HProcNo": "", "hprocid": "", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
+ "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+ "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
"HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
"濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
"鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
@@ -662,6 +711,10 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ }
+ form.render('select');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -677,7 +730,10 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ }
+ form.render('select');
}
break;
}
@@ -700,87 +756,108 @@
}
});
}
- //鍗曞嚮鏀瑰彉鏄惁濮斿鍊�
- if (obj.event === 'isEntrustCheck') {
- var flag = obj.data.isEntrust;
- var flagValue = obj.data.isEntrustValue;
- if (flagValue === "false") {
- flagValue = "true";
- flag = "鏄�";
- }
- else if (flagValue === "true") {
- flagValue = "false";
- flag = "鍚�";
- }
- else {
- flagValue = "false";
- flag = "鍚�";
- }
- obj.update({
- isEntrust: flag
- , isEntrustValue: flagValue
- });
- }
- if (obj.event === 'HProcCheck') {//宸ュ簭
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 宸ュ簭: subProcName
- , hprocid: subProcID
- , HProcNumber: subProcNumber
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HProcCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ 宸ュ簭: checkStatus.data[0].宸ュ簭
+ , hprocid: checkStatus.data[0].HItemID
+ , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
});
}
- })
- }
- if (obj.event === 'HSupCheck') {//渚涘簲鍟�
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '渚涘簲鍟嗗垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 渚涘簲鍟�: subSupName
- , HSupID: subSupID
- , 渚涘簲鍟嗕唬鐮�: subSupNumber
+ if (obj.event === 'HWorkCenterCheck') {//宸ヤ綔涓績
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍔犲伐涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ 宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績
+ , HCenterID: checkStatus.data[0].HItemID
+ , 宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
});
}
- })
- }
- if (obj.event === 'HWorkCenterCheck') {//宸ヤ綔涓績
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鍔犲伐涓績鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 宸ヤ綔涓績: subWorkCenterName
- , HCenterID: subWorkCenterID
- , 宸ヤ綔涓績浠ｇ爜: subWorkCenterNumber
+ if (obj.event === 'HSupCheck') {//渚涘簲鍟�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ 渚涘簲鍟�: checkStatus.data[0].HName
+ , HSupID: checkStatus.data[0].HItemID
+ , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].HNumber
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
});
}
- })
- }
+ obj.event = "";
+ return false;
+ }
+ })
//鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
if (obj.event === 'isEditCheck') {
var flag = obj.data.isEdit;
@@ -813,6 +890,10 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
+ if ($("#HICMOInterID").val() == 0) {
+ layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -827,15 +908,32 @@
}
var sSubTable = table.cache['mainTable'];
for (var i = 0; i < sSubTable.length; i++) {
- if (!sSubTable[i].hprocid) {
+ if (!sSubTable[i].HProcNo) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (sSubTable[i].HProcNo == 0) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!sSubTable[i].HProcID) {
var indexRow = i + 1;
layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!sSubTable[i].HSupID) {
+ if (!sSubTable[i].HCenterID) {
var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
+ }
+ if (sSubTable[i].isEntrust == "true") {
+ if (!sSubTable[i].HSupID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
}
}
var sMainStr = JSON.stringify(data.field);
@@ -1002,7 +1100,6 @@
//缂栬緫
form.on('submit(cmdModify)', function () {//缂栬緫
var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1020,27 +1117,12 @@
});
form.on('submit(Cancel)', function () {
- Pub_Close(1);
+ if (OperationType == 1) {
+ Pub_Close(2);
+ } else if (OperationType == 2) {
+ Pub_Close(1);
+ }
})
-
-
- ////鑾峰彇鏄庣粏琛�
- //window.GetICMOBillDetail = function (hmainid) {
- // $.ajax({
- // url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
- // type: "GET",
- // data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
- // success: function (result) {
- // if (result.count == 1) {
- // option.data = result.data;
- // table.render(option);
- // }
- // else {
- // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // }
- // })
- //}
//杩斿洖鐢熶骇浠诲姟鍗�
@@ -1054,6 +1136,7 @@
var data = result.data[result.data.length - 1];
$("#HICMOInterID").val(data.hmainid);
$("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+ $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
$("#HICMOEntryID").val(data.HEntryID);
$("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
$("#HMaterID").val(data.hmaterid);
@@ -1102,6 +1185,10 @@
if (result.count == 1) {
option.data = result.data;
table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ }
+ form.render('select');
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1110,6 +1197,17 @@
})
}
+ //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+ form.on('select(isEntrust)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.isEntrust = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//浠ヤ笂涓簂ayui妯″潡
});
@@ -1132,8 +1230,8 @@
function GetHMaterNameValue(obj) {
$("#HMaterName2").val(obj[0].HName);
$("#HMaterID2").val(obj[0].HItemID);
- $("#HMaterNumber2").val(obj[0].HNumber);
- $("#HMaterHModel2").val(obj[0].HModel);
+ $("#HMaterNumber2").val(obj[0].HNumber);
+ $("#HMaterHModel2").val(obj[0].HModel);
}
function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
EmpName = obj[0].HName;
@@ -1165,63 +1263,6 @@
QRName = obj[0].HName;
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
- }
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
- }
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- else {
- return true;
- }
}
</script>
</body>
--
Gitblit v1.9.1