From ca092bb227d153813406e2592f5ca8e6aff8d44a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 18 三月 2024 17:20:24 +0800
Subject: [PATCH] 1.增加 直接调拨单 编辑模块， 并完善 直接调拨单 列表功能；（常规 功能， 新增，修改，删除，审核，作废，关闭，自定义过滤，源单类型列表（源单 调拨申请单，手工录入）， 合计行，保存控制，审核控制，删除控制，关联数回填 等等) 2.仓库管理下属模块，单据编辑界面，选择基础资料的 全部改为 基础资料列表 的方式； （生产入库单，生产退库单，其他入库单，分布式调入单，生产领料单，领用申请单，生产退料单，其他出库单，分布式调出单，出库申请单，直接调拨单，调拨申请单，条码状态变更单 ）
---
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 529 +++++++++++++++++++++++----------------------------------
1 files changed, 215 insertions(+), 314 deletions(-)
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_BarCodeStatusChangeBill.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_BarCodeStatusChangeBill.html"
index 0c6ea11..f79f287 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_BarCodeStatusChangeBill.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_BarCodeStatusChangeBill.html"
@@ -59,6 +59,7 @@
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -72,7 +73,7 @@
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
@@ -88,62 +89,132 @@
<option style="color:blue;" value="10">楠岃瘉</option>
<option style="color:blue;" value="11">涓嬭揪</option>
<option style="color:blue;" value="12">寮�宸�</option>
- <option style="color:blue;" value="13">鐢宠瀹℃壒</option>
+ <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
<!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
- <option style="color:blue;" value="15">鐢宠妫�楠�</option>
+ <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
<option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
<option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
</select>
</div>
- </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" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</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" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></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" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
- <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <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" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <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;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" 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;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" 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;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" 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;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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;">
+ <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " 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;">
+ <input type="text" class="layui-input" name="HBacker " id="HBacker " 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;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" 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;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </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;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" 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;">
+ <input type="text" class="layui-input" name="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -157,7 +228,7 @@
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
</div>
</script>
</form>
@@ -168,19 +239,33 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <!--琛屼笅鎷夐�夋嫨(涓氬姟鐘舵��)-->
- <script type="text/html" id="HSTATUS">
- <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS{{d.LAY_TABLE_INDEX+1}}">
- <option value="1">璁″垝</option>
- <option value="2">璁″垝纭</option>
- <option value="3">涓嬭揪</option>
- <option value="4">寮�宸�</option>
- <option value="5">瀹屽伐</option>
- <option value="6">缁撴</option>
- <option value="7">缁撶畻</option>
+ <!--琛屼笅鎷夐�夋嫨-->
+ <!--<script type="text/html" id="HBarCodeStatus_Old">
+ <select name="HBarCodeStatus_Old" lay-filter="HBarCodeStatus_Old" id="HBarCodeStatus_Old{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鍦ㄥ簱">鍦ㄥ簱</option>
+ <option value="鍑哄簱">鍑哄簱</option>
+ <option value="浣滃簾">浣滃簾</option>
+ <option value="闅旂">闅旂</option>
+ <option value="涓嶈壇">涓嶈壇</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ </select>
+ </script>-->
+
+ <!--琛屼笅鎷夐�夋嫨-->
+ <script type="text/html" id="HBarCodeStatus_New">
+ <select name="HBarCodeStatus_New" lay-filter="HBarCodeStatus_New" id="HBarCodeStatus_New{{d.LAY_TABLE_INDEX+1}}">
+ <option value=""></option>
+ <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鍦ㄥ簱">鍦ㄥ簱</option>
+ <option value="鍑哄簱">鍑哄簱</option>
+ <option value="浣滃簾">浣滃簾</option>
+ <option value="闅旂">闅旂</option>
+ <option value="涓嶈壇">涓嶈壇</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
</select>
</script>
-
<script>
layui.config({
@@ -200,15 +285,15 @@
, laydate = layui.laydate
var option = [];
-
+ var HBarCodeStatusVal = [];
+ var CopyHBarCodeStatusVal = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
var rowdata = [{
- "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
- , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
- , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+ "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
+ , "HBarCodeStatus_New": ""
}];
//鍒濆鍖�
set_ClearBill();
@@ -222,10 +307,11 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3710' },
+ data: { "HBillType": '1288' },
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -234,9 +320,10 @@
$("#HPRDORGID").attr("disabled", true);
$("#HDate").attr("disabled", true);
RoadBillMain(linterid);
+ $("#HInterID").val(linterid);
}
-
+ $("#HMaker").val(sessionStorage["HUserName"]);
//#endregion
@@ -248,16 +335,20 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
- , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
- , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+ "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
+ , "HBarCodeStatus_New": ""
};
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
checkRefresh();
break;
@@ -275,6 +366,12 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HBarCodeStatus_New' + i + '').find("option[value='" + option.data[i - 1].HBarCodeStatus_New + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
//鍒锋柊澶嶉�夋
checkRefresh();
}
@@ -286,37 +383,14 @@
}
});
- //閫夋嫨閿�鍞鍗曞彿鎸夐挳
- form.on('submit(btnHSeOrder)', function () {
- get_btnHSeOrder();
- });
-
- //閫夋嫨涓氬姟鍛樻寜閽�
+ //閫夋嫨鍙樻洿浜�
form.on('submit(btnHEmp)', function () {
get_btnHEmp();
});
- //閫夋嫨瀹㈡埛鎸夐挳
- form.on('submit(btnHCus)', function () {
- get_btnHCus();
- });
-
- //閫夋嫨宸ヤ綔涓績鎸夐挳
- form.on('submit(btnHCenter)', function () {
- get_btnHCenter();
- });
-
-
- //琛岄�夋嫨澶勭悊锛堝伐搴忕被鍨嬶級
- form.on('select(HSTATUS)', 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.HSTATUS = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- }
- });
+ //閫夋嫨璐熻矗閮ㄩ棬
+ form.on('submit(btnHDept)', function () {
+ get_btnHDept();
});
//閫�鍑�
@@ -338,47 +412,20 @@
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- //#region 淇敼琛� 鏃堕棿
-
- var data = obj.data;
- //璁″垝寮�濮嬫棩鏈�
- if (obj.event == 'HPlanBeginDate') {
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- //鍒锋柊澶嶉�夋
- checkRefresh();
- }
- });
- }
-
- //璁″垝瀹屽伐鏃ユ湡
- if (obj.event == 'HPlanEndDate') {
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- //鍒锋柊澶嶉�夋
- checkRefresh();
- }
- });
- }
-
- //#endregion
-
});
+ //鐘舵��
+ form.on('select(HBarCodeStatus_New)', 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.HBarCodeStatus_New = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ })
//#endregion
@@ -422,25 +469,18 @@
, toolbar: '#toolbarDemo'
, limit: 500
, height: 500
+ , totalRow: true
, loading: false
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
- , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HSourceID', title: 'HSourceID', hide: true }
- , { field: 'HSourceName', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" }//f7
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: 'HDeptName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HDeptID" }//f7
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
- , { field: 'HSTATUS', title: '涓氬姟鐘舵��', templet: "#HSTATUS" }
- , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', event: 'HPlanBeginDate' }
- , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', event: 'HPlanEndDate' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ , { field: 'HBarCode', title: '鏉″舰鐮�', edit: 'text' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', edit: 'text', totalRow: true }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦', edit: 'text', totalRow: true}
+ , { field: 'HBarCodeStatus_Old', title: '鍘熺姸鎬�', templet: "#HBarCodeStatus_Old", hide: true }
+ , { field: 'HBarCodeStatus_New', title: '鐘舵��', templet: "#HBarCodeStatus_New" }
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
]]
}
@@ -448,15 +488,15 @@
table.render(option);
}
- //閿�鍞鍗�
- function get_btnHSeOrder() {
+ //閮ㄩ棬
+ function get_btnHDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '閿�鍞鍗�'//鏍囬
+ , title: '閮ㄩ棬'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -465,9 +505,8 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HSeOrderInterID").val(checkStatus.data[0].hmainid);
- $("#HSeOrderBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -475,13 +514,13 @@
})
}
- //涓氬姟鍛�
+ //鍙樻洿浜�
function get_btnHEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '涓氬姟鍛�'//鏍囬
+ , title: '鍙樻洿浜�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
@@ -522,133 +561,7 @@
//琛屽唴鍒犻櫎蹇嵎閿�
function set_GridCellCheck(obj) {
- $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- //鐗╂枡
- if (obj.event == "HMaterID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐗╂枡鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "HMaterNumber": checkStatus.data[0].HNumber
- , "HMaterName": checkStatus.data[0].HName
- , "HModel": checkStatus.data[0].HModel
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //鐢熶骇璧勬簮
- if (obj.event == "HSourceID") {
- //鎵撳紑浜哄憳琛� 灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HSourceID": checkStatus.data[0].HItemID
- , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //鐢熶骇杞﹂棿
- if (obj.event == "HDeptID") {
- //鎵撳紑浜哄憳琛� 灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HDeptID": checkStatus.data[0].HItemID
- , "HDeptName": checkStatus.data[0].HName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //璁￠噺鍗曚綅
- if (obj.event == "HUnitID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HUnitName": checkStatus.data[0].HName
- , "HUnitID": checkStatus.data[0].HItemID
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- obj.event = "";
- return false;
- }
- })
}
//澶氶�� 鍒锋柊琛ㄦ牸
@@ -662,7 +575,7 @@
form.render('select');
}
- //淇濆瓨HMaker
+ //淇濆瓨
function set_AddNew(data) {
var num = [];
@@ -670,6 +583,18 @@
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
+ }
+ //if ($("#HBarCodeStatus_Old" + (i + 1)).val()) {
+ // num[i].HBarCodeStatus_Old = $("#HBarCodeStatus_Old" + (i + 1)).val();
+ //}
+ if ($("#HBarCodeStatus_New" + (i + 1)).val()) {
+ num[i].HBarCodeStatus_New = $("#HBarCodeStatus_New" + (i + 1)).val();
+ }
+ }
+
+ for (let j = 0; j < num.length; j++) {
+ if (num[j].HBarCodeStatus_New != HBarCodeStatusVal[j]) {
+ num[j].HBarCodeStatus_Old = HBarCodeStatusVal[j]
}
}
@@ -681,7 +606,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_ICMOBill/ICMOBillEdit",
+ url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/BarCodeStatusChangeBillEdit",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -706,68 +631,44 @@
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "'";
$.ajax({
- url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
+ url: GetWEBURL() + "/KF_BarCodeStatusChangeBill/cx",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": linterid },
success: function (d) {
//$("#HPRDORGID").val(d.data[0].HPRDORGID);
//涓昏〃
form.val("formData", {
"HBillNo": d.data[0].鍗曟嵁鍙�
- , "HInterID":d.data[0].hmainid
+ , "HInterID": d.data[0].hmainid
, "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
- , "HSeOrderBillNo": d.data[0].婧愬崟鍗曞彿
- , "HSeOrderInterID": d.data[0].婧愬崟涓诲唴鐮�
- , "HSeOrderEntryID": d.data[0].婧愬崟瀛愬唴鐮�
- , "HEmpID": d.data[0].HEmpID
- , "HEmpName": d.data[0].涓氬姟鍛�
- , "HCenterID": d.data[0].HCenterID
- , "HCenterName": d.data[0].宸ヤ綔涓績
, "HRemark": d.data[0].琛ㄥご澶囨敞
- , "HPlanQty": d.data[0].璁″垝鐢熶骇鏁伴噺
- , "HPRDORGID": d.data[0].HPRDORGID
+ , "HEmpName": d.data[0].鍙樻洿浜�
+ , "HDeptName": d.data[0].璐熻矗閮ㄩ棬
+ , "HBillStatus": d.data[0].鍗曟嵁鐘舵��
+ , "HEmpID": d.data[0].HEmpID
+ , "HDeptID": d.data[0].HDeptID
});
//瀛愯〃 璧嬪��
var rowdata = [];
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;
- }
rowdata.push(
{
- "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].浜у搧浠ｇ爜, "HMaterName": d.data[i].浜у搧鍚嶇О
- , "HModel": d.data[i].瑙勬牸鍨嬪彿, "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].鐢熶骇璧勬簮
- , "HDeptID": d.data[i].HDeptID, "HDeptName": d.data[i].鐢熶骇杞﹂棿, "HUnitID": d.data[i].HUnitID
- , "HUnitName": d.data[i].璁￠噺鍗曚綅, "HQty": d.data[i].鐢熶骇浠诲姟鍗曟暟閲�, "HSTATUS": HSTATUS
- , "HPlanBeginDate": Format(new Date(d.data[i].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd"), "HPlanEndDate": Format(new Date(d.data[i].璁″垝瀹屽伐鏃ユ湡), "yyyy-MM-dd")
+ "HRelationQty": d.data[i].鍏宠仈鏁伴噺, "HRelationMoney": d.data[i].鍏宠仈閲戦, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ , "HBarCode": d.data[i].鏉″舰鐮�, "HBarCodeStatus_Old": d.data[i].鍘熺姸鎬�, "HBarCodeStatus_New": d.data[i].鏂扮姸鎬�
}
)
+ HBarCodeStatusVal.push(d.data[i].鏂扮姸鎬�);
}
option.data = rowdata;
table.render(option);
+ for (let j = 0; j < d.data.length; j++) {
+ //$("#HBarCodeStatus_Old" + (j+1)).val(d.data[j].鍘熺姸鎬�)
+ $("#HBarCodeStatus_New" + (j + 1)).val(d.data[j].鏂扮姸鎬�)
+ }
form.render('select');
}
})
--
Gitblit v1.9.1