From 24733cc31830046ed3bc41d597d7deac03201c18 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 12 二月 2025 13:52:02 +0800
Subject: [PATCH] 生产用料清单新增 修改功能完善
---
WebTM/views/生产管理/生产投料单/Sc_PPBomBill.html | 150 ++++++++++++++++++++++++++++++++++++++++---------
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 4
2 files changed, 123 insertions(+), 31 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\212\225\346\226\231\345\215\225/Sc_PPBomBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
index 815dc31..361e778 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
@@ -64,21 +64,27 @@
<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" value="0">
- <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input type="date" class="layui-input" name="HDate" id="HDate">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杈呭姪瀛楁</label>
+ <label class="layui-form-label">鐢熶骇璁㈠崟</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
+ <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HICMOEntrySEQ" id="HICMOEntrySEQ" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="BtnHICMOBill" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -119,6 +125,16 @@
<input class="layui-input" name="HQty" id="HQty" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label" style="width: 80px;">缁勭粐*</label>
+ <div class="layui-input-block" style="width: 190px;">
+ <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs7 layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
@@ -128,8 +144,6 @@
</div>
</div>
</div>
-
-
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -248,7 +262,6 @@
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
var allVal;
//#endregion
@@ -263,7 +276,7 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+ Organ();
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
@@ -350,6 +363,10 @@
form.on('submit(HMaterList)', function () {
get_checkMater();
});
+ //閫夋嫨鐢熶骇璁㈠崟
+ form.on('submit(BtnHICMOBill)', function () {
+ get_checkHICMOBill();
+ });
//閫夋嫨璁￠噺鍗曚綅鎸夐挳
form.on('submit(HUnitList)', function () {
get_checkUnit();
@@ -386,6 +403,19 @@
});
}
});
+
+ $(document).ready(function () {
+
+ $("#HQty").on("input", function (e) {
+ currentValue = $(this).val(); // 鏇存柊褰撳墠鍊�
+
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["HQty"] = e.delegateTarget.value;
+ }
+ table.render(option);
+ });
+ });
+
//#endregion
@@ -454,10 +484,10 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cg_POOrderBill/cx",
+ url: GetWEBURL() + "/Sc_PPBomBill/Editlist",
type: "GET",
data: {
- "HInterID": linterid
+ "sWhere": "and hmainid="+linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -466,40 +496,42 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
- , "HQty": formatDate(data.鏁伴噺)
- //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HICMOBillNo": data.鐢熶骇浠诲姟鍗曞彿
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HICMOEntrySEQ": data.HICMOEntrySEQ
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterID": data.HMaterID
, "HDeptName": data.閮ㄩ棬
, "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
+ , "HUnitName": data.涓昏〃璁￠噺鍗曚綅
+ , "HUnitID": data.HUnitID
+ , "HQty": data.鐢熶骇鏁伴噺
+ , "HPRDORGID": data.HPRDORGID
, "HRemark": data.琛ㄥご澶囨敞
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡
, "HCheckDate": data.瀹℃牳鏃ユ湡
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
});
+
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "HMaterNumber": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID, "HUnitNumber": data.璁￠噺鍗曚綅浠ｇ爜
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd")
+ "HMaterID": result.data[i].HMaterID, "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿, "HUnitID": result.data[i].hunitid2, "HUnitNumber": result.data[i].璁￠噺鍗曚綅浠ｇ爜
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅, "HQty": result.data[i].鏁伴噺, "HRemark": result.data[i].琛ㄤ綋澶囨敞
+ , "HWHID": result.data[i].HWHID, "浠撳簱": result.data[i].浠撳簱, "HSPID": result.data[i].HSPID, "浠撲綅": result.data[i].浠撲綅
+ , "HBASEUNITID": result.data[i].HBASEUNITID, "鍩烘湰璁￠噺鍗曚綅": result.data[i].鍩烘湰璁￠噺鍗曚綅
}
)
}
@@ -539,7 +571,7 @@
$.ajax({
type: "POST",
- url: GetWEBURL() + "Sc_PPBomBill/PPBomBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Sc_PPBomBill/sc_PPBomBillAdd", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -589,12 +621,18 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ var hqty = $("#HQty").val();
+
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": checkStatus.data[0].HItemID
, "HMaterNumber": checkStatus.data[0].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "HUnitNumber": checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ , "HQty": hqty
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -679,7 +717,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"浠撲綅": checkStatus.data[0].浠撲綅鍚嶇О
- ,"HSPID": checkStatus.data[0].HItemID
+ , "HSPID": checkStatus.data[0].HMainID
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -740,6 +778,28 @@
}
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
function get_checkMater() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -763,6 +823,38 @@
})
}
+ function get_checkHICMOBill() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璁㈠崟鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+ $("#HICMOEntrySEQ").val(checkStatus.data[0].鏄庣粏琛屽彿);
+ $("#HMaterID").val(checkStatus.data[0].HMaterID);
+ $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+ $("#HUnitID").val(checkStatus.data[0].HUnitID);
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].鐢熶骇杞﹂棿);
+ $("#HQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
function get_checkUnit() {
layer.open({
type: 2//寮圭獥绫诲瀷
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index 73ae227..af7eabf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -339,12 +339,12 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鏀舵枡閫氱煡鍗�'
+ , title: '缂栬緫鐢熶骇鐢ㄦ枡鍗�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , content: './Sc_PPBomBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
--
Gitblit v1.9.1