From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 309 +++++++++++++++++++++++++++++++++------------------
1 files changed, 198 insertions(+), 111 deletions(-)
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_NoTable.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_NoTable.html"
index 6370904..59b25e3 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_NoTable.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_NoTable.html"
@@ -101,7 +101,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
+ <label class="layui-form-label" style="width: 60px;">閿�鍞鍗曠被鍨�</label>
<div class="layui-input-inline">
<select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
<option style="color:blue;" selected="selected" value=""></option>
@@ -110,15 +110,54 @@
</select>
</div>
</div>
+ <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="HSTATUS" lay-filter="HSTATUS" id="HSTATUS">
+ <option value="1">璁″垝</option>
+ <option value="2">璁″垝纭</option>
+ <option value="3">涓嬭揪</option>
+ <option value="4" selected>寮�宸�</option>
+ <option value="5">瀹屽伐</option>
+ <option value="6">缁撴</option>
+ <option value="7">缁撶畻</option>
+ </select>
+ </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; width: 185px;">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞槸鍚﹀彇搴撳瓨</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 70px;">
+ <select name="HIsStockQty_SeOrderBill" lay-filter="HIsStockQty_SeOrderBill" id="HIsStockQty_SeOrderBill">
+ <option value="0" selected>鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鏄惁鍙栧簱瀛�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 70px;">
<select name="HIsStockQty" lay-filter="HIsStockQty" id="HIsStockQty">
<option value="0" selected>鍚�</option>
<option value="1">鏄�</option>
</select>
+ </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="HQty" lay-verify="HQty" id="HQty" style="width:70px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅*</label>
+ <div class="layui-input-block" style="margin-left: 71px;">
+ <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnit" id="btnHUnit" 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">
@@ -131,24 +170,18 @@
</button>
</div>
</div>
- <div class="layui-inline" style="width: 520px;">
+ <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="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 43%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 85px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;margin-right: 85px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</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="HQty" lay-verify="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: 71px;">
@@ -168,73 +201,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="HModel" lay-verify="HModel" id="HModel" style="display: inline-block;">
- </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: 75px;">
- <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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;">璁￠噺鍗曚綅*</label>
- <div class="layui-input-block" style="margin-left: 71px;">
- <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnit" id="btnHUnit" 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;">涓氬姟鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS">
- <option value="1">璁″垝</option>
- <option value="2">璁″垝纭</option>
- <option value="3">涓嬭揪</option>
- <option value="4" selected>寮�宸�</option>
- <option value="5">瀹屽伐</option>
- <option value="6">缁撴</option>
- <option value="7">缁撶畻</option>
- </select>
- </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="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" 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="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" 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;">
- <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" id="HAuxQty" 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: 80px;">
- <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <input type="text" class="layui-input" name="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -244,37 +211,61 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇骞呭</label>
+ <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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" value="0">
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" 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: 75px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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: 50px;">杈呮暟閲�</label>
+ <div class="layui-input-inline" style="margin-left: 1px;">
+ <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" style="width:70px" id="HAuxQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:-140px;">
+ <label class="layui-form-label" style="width: 30px;">杈呭姪鍗曚綅</label>
+ <div class="layui-input-inline" style="margin-left: 1px;margin-top:10px;">
+ <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 30%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="padding: 0 10px;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:-100px;">
<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="HColorRemark" lay-verify="HColorRemark" id="HColorRemark">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-block" style="margin-left: 115px;">
- <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁″垝瀹屽伐鏈�</label>
+ <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="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
+ <input type="text" class="layui-input" name="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
- <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <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="HWidth_New" lay-verify="HWidth_New" id="HWidth_New" 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="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
</div>
</div>
</div>
@@ -297,6 +288,18 @@
<input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 115px;">
+ <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
+ </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="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 56%;">
@@ -306,9 +309,11 @@
</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="HRemark_New" lay-verify="HRemark_New" id="HRemark_New">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
+ <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -457,6 +462,12 @@
</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;">
+ <input type="text" class="layui-input" name="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
<!--闅愯棌瀛楁-->
@@ -498,6 +509,7 @@
var option = [];
var num = 0;
+ var HIsStockQtyTemp = "0"; //璁板綍鏄惁鍙栧簱瀛樺��
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -553,6 +565,7 @@
}
HfBtn();
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -679,6 +692,21 @@
$("#HSTOCKINORGID").val(data.value);
});
+ //#region 鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HIsStockQty)', function (data) {
+ var HIsStockQtyTemp1 = $("#HIsStockQty").val();
+ $("#HIsStockQty").val(HIsStockQtyTemp);
+ form.render("select");
+ layer.confirm("纭畾瑕佷慨鏀规槸鍚﹀彇搴撳瓨鍚�?", function (index) {
+ var wait = layer.load();
+ $("#HIsStockQty").val(HIsStockQtyTemp1);
+ HIsStockQtyTemp = $("#HIsStockQty").val();
+ form.render("select");
+ layer.close(wait);
+ layer.closeAll();
+ })
+ });
+ //#endregion
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -761,7 +789,7 @@
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -787,7 +815,7 @@
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../BaseSet/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -815,7 +843,7 @@
, area: ['90%', '90%']//澶у皬
, title: "鐢熶骇杞﹂棿鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -825,7 +853,7 @@
}
//鑾峰彇鏁版嵁
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -841,7 +869,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -851,7 +879,7 @@
}
//鑾峰彇鏁版嵁
$("#HCenterID").val(checkStatus.data[0].HItemID);
- $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -926,7 +954,7 @@
, area: ['90%', '90%']//澶у皬
, title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -936,7 +964,7 @@
}
//鑾峰彇鏁版嵁
$("#HUnitID").val(checkStatus.data[0].HItemID);
- $("#HUnitName").val(checkStatus.data[0].HName);
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -952,7 +980,7 @@
, area: ['90%', '90%']//澶у皬
, title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -962,7 +990,7 @@
}
//鑾峰彇鏁版嵁
$("#HAuxUnit").val(checkStatus.data[0].HItemID);
- $("#HAuxUnitName").val(checkStatus.data[0].HName);
+ $("#HAuxUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1034,6 +1062,8 @@
, "HSourceBillType": "1401"
, "HMainSourceBillSubType": data.HBillSubType
+ , "HPlanOrderProcNo": data.鍗曟嵁鍙�
+
, "HEmpID": data.HEmpID
, "HEmpName": data.涓氬姟鍛�
, "HCusID": data.HCusID
@@ -1053,13 +1083,16 @@
, "HCusMaterNumber": data.瀹㈡埛鐗╂枡缂栫爜
, "HCusModel": data.瀹㈡埛瑙勬牸鍨嬪彿
, "HCusMaterName": data.瀹㈡埛鐗╂枡鍚嶇О
- , "HIsStockQty": data.鏄惁鍙栧簱瀛�=="Y"?1:0
+ , "HIsStockQty": data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0
+ , "HIsStockQty_SeOrderBill": data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0
});
+ HIsStockQtyTemp = data.鏄惁鍙栧簱瀛� == "Y" ? 1 : 0;
//绂佹淇敼閿�鍞鍗曞彿
$('#btnHSeOrder').prop('disabled', true);
- $('#HIsStockQty').prop('disabled', true);
+ //$('#HIsStockQty').prop('disabled', true);
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
$('#btnHCus').prop('disabled', true);
$('#btnHMater').prop('disabled', true);
$('#btnHUnit').prop('disabled', true);
@@ -1194,6 +1227,7 @@
, "HUnitName": d.data[0].璁￠噺鍗曚綅
, "HSTATUS": HSTATUS
, "HIsStockQty": d.data[0].HIsStockQty
+ , "HIsStockQty_SeOrderBill": d.data[0].HIsStockQty_SeOrderBill ? 1 : 0
, "HBomID": d.data[0].HBomID
, "HBomName": d.data[0].BOM鍗曠紪鐮�
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd")
@@ -1214,7 +1248,7 @@
, "HOrderPickRemark": d.data[0].璁㈠崟鍖呰澶囨敞
, "HWidth_New": d.data[0].鐢熶骇骞呭
, "HWeight_New": d.data[0].鐢熶骇鍏嬮噸
- , "HRemark_New": d.data[0].鐢熶骇鐧藉澂瑕佹眰
+ , "HRemark_New": d.data[0].鐢熶骇瑙勬牸
//鍏朵粬淇℃伅
, "hmakers": OperationType == 2 ? "" : d.data[0].鍒跺崟浜�
, "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -1224,12 +1258,16 @@
, "hupdatedate": OperationType == 2 ? "" : d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
, "hdeleteman": OperationType == 2 ? "" : d.data[0].浣滃簾浜�
, "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HPlanOrderProcNo": d.data[0].HPlanOrderProcNo
});
form.render('select');
+ HIsStockQtyTemp = d.data[0].HIsStockQty;
+
if (d.data[0].婧愬崟涓诲唴鐮� != 0 && d.data[0].HSourceBillType=="1401") {
$('#btnHSeOrder').prop('disabled', true);
- $('#HIsStockQty').prop('disabled', true);
+ //$('#HIsStockQty').prop('disabled', true);
+ $('#HIsStockQty_SeOrderBill').prop('disabled', true);
$('#btnHCus').prop('disabled', true);
$('#btnHMater').prop('disabled', true);
$('#btnHUnit').prop('disabled', true);
@@ -1620,6 +1658,55 @@
}
//#endregion
+
+ //璁￠噺鍗曚綅
+ function GetUnitValue(obj) {
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+ //涓氬姟鍛�
+ function GetHEmpValue(obj) {
+ $("#HEmpID").val(obj[0].HItemID);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ }
+ //瀹㈡埛
+ function GetHCusNameValue(obj) {
+ $("#HCusID").val(obj[0].HItemID);
+ $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
+ }
+ //鐗╂枡
+ function GetMaterValue(obj) {
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);
+ $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
+ $("#HUnitID").val(obj[0].HUnitID);//璁￠噺鍗曚綅id
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+ $("#HWidth").val(obj[0].骞呭);//骞呭
+ $("#HWeight").val(obj[0].鍏嬮噸);//鍏嬮噸
+ $("#HColorRemark").val(obj[0].鏌撹壊瑕佹眰);//鏌撹壊瑕佹眰
+ $("#HRemark").val(obj[0].澶囨敞);//澶囨敞
+ }
+ //杈呭姪璁￠噺鍗曚綅
+ function GetAuxiliaryUnitValue(obj) {
+ $("#HAuxUnit").val(obj[0].HItemID);
+ $("#HAuxUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+ //宸ヤ綔涓績
+ function GetWorkCenterValue(obj) {
+ $("#HCenterID").val(obj[0].HItemID);
+ $("#HCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ }
+ //bom
+ function GetICBomValue(obj) {
+ $("#HBomID").val(obj[0].hmainid);
+ $("#HBomName").val(obj[0].鍗曟嵁鍙�);
+ }
+ //鐢熶骇杞﹂棿
+ function GetHDeptNameValue(obj) {
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1