From 0e84962e6d8070c5cd68d2ae7e190fbd1ee7e584 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 01 九月 2025 16:59:02 +0800
Subject: [PATCH] 修改 销售出库单 价格查询 显示内容 生产领料单 生产领料单(羊毛染色) 生产领料单(毛尖) 添加仓库字段 生产领料单(毛尖) 添加软剂公式
---
WebTM/views/领料发货/销售出库/Kf_SellOutBillList_YP.html | 35 --
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 14
WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html | 341 +++++++++++++++++++++------------
WebTM/views/WMS扫码模块/条码查询/Gy_BarCodeBill_QiaoYi_PDA.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html | 25 ++
WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html | 118 ++++++++--
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 37 +--
9 files changed, 350 insertions(+), 225 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 86284e3..3a00714 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -9,6 +9,7 @@
/*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
@@ -30,7 +31,6 @@
//var WEBURL = "http://192.168.6.5:8082/API/"; //鑸滄垚
/*var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌*/
//var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //閲戝竻
- //var WEBURL = "http://localhost:81/API";
//var WEBURL = "http://172.16.1.85/API/"; //杩﹀崡
return WEBURL
}
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
index 01193df..51cbb28 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\235\241\347\240\201\346\237\245\350\257\242/Gy_BarCodeBill_QiaoYi_PDA.html"
@@ -533,7 +533,7 @@
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "WEBSController/GetGy_BarCodeBill_QiaoYi_PDA_Json",
+ url: GetWEBURL() + "/WEBSController/GetGy_BarCodeBill_QiaoYi_PDA_Json",
type: "GET",
data: {
sBarCode: HBarCode, sBarCodeOutDate: HBarCodeOutDate, sCustomerName: HCustomerName,
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index c9d262a..87dd62d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -315,6 +315,7 @@
<option value="鏌撴枡">鏌撴枡</option>
<option value="鍔╁墏">鍔╁墏</option>
<option value="鍔╁墏锛堟寜娴嗛噸绠楋級">鍔╁墏锛堟寜娴嗛噸绠楋級</option>
+ <option value="杞墏">杞墏</option>
</select>
</div>
</div>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 9612a2a..bb7415f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -924,17 +924,15 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍒濆鍖栭〉澶у皬
+ // 鍒濆鍖栭〉澶у皬
DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"],optionPage);
+
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option, 1)
+ // get_FastQuery(table, option, 1)
//鍔犺浇涓氬姟鍛�
//get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
/*DisPlay_HideColumn();*/
-
-
-
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -3151,8 +3149,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -3315,7 +3313,7 @@
get_FastQuery()
form.render("select");
}
- }
+ },
})
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index f67953f..560ae3b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -31,18 +31,20 @@
gap: 10px;
}
- .balance-content .innerBox{
+ .balance-content .innerBox {
flex: 1;
display: flex;
flex-direction: row;
gap: 10px;
align-items: center;
}
+
.balance-content .left {
width: 16em;
display: flex;
justify-content: right;
}
+
.balance-content .right {
flex: 1;
}
@@ -2250,33 +2252,14 @@
data: { "user": sessionStorage["Czybm"], "HInterID": data[0]["hmainid"] },
success: function (data1) {
if (data1.count == 1) {
- var balanceContent = "<div class='balance-content'>" +
- "<div class='innerBox'><div class='left'>鍗曟嵁鍙�:</div><div class='right'>" + checkStatus.data[0]['鍗曟嵁鍙�'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>璧峰垵浣欓:</div><div class='right'>" + data1.data[0]['HBeginBalance'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>瀹㈡埛褰撳墠淇＄敤棰濆害:</div><div class='right'>" + data1.data[0]['HCreditRating_Now'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>瀹㈡埛浣欓:</div><div class='right'>" + data1.data[0]['HCusBalance'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鏀舵鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閫�娆炬�婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveBackMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鍑哄簱鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HSellOutMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鍏朵粬搴旀敹鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveOtherMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閫�璐ф�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSellOutBackMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閿�鍞嚭搴撴�婚噾棰�:</div><div class='right'>" + data1.data[0]['HMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈崟閿�鍞嚭搴撳搴旈攢鍞鍗曟�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSeOrderMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閿�鍞鍗曟�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSeOrderMoney_sum'] + "</div></div>" +
- "</div>"
-
- layer.open({
- type: 1, // page 灞傜被鍨�
- area: ['500px', 'auto'],
- title: '浠锋牸淇℃伅',
- shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: true, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�
- maxmin: true, // 鍏佽鍏ㄥ睆鏈�灏忓寲
- anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: balanceContent
- });
-
layer.close(ajaxLoad);
+ if (data1.data[0].HBack == 0) {
+ // 浣欓鍏呰冻
+ layer.alert("瀹㈡埛浣欓鍏呰冻!", { icon: 6 });
+ } else {
+ // 浣欓涓嶅厖瓒�
+ layer.alert(data1.data[0]["HRemark"], { icon: 5 });
+ }
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
index deea386..3c42abe 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
@@ -2246,33 +2246,14 @@
data: { "user": sessionStorage["Czybm"], "HInterID": data[0]["hmainid"] },
success: function (data1) {
if (data1.count == 1) {
- var balanceContent = "<div class='balance-content'>" +
- "<div class='innerBox'><div class='left'>鍗曟嵁鍙�:</div><div class='right'>" + checkStatus.data[0]['鍗曟嵁鍙�'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>璧峰垵浣欓:</div><div class='right'>" + data1.data[0]['HBeginBalance'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>瀹㈡埛褰撳墠淇＄敤棰濆害:</div><div class='right'>" + data1.data[0]['HCreditRating_Now'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>瀹㈡埛浣欓:</div><div class='right'>" + data1.data[0]['HCusBalance'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鏀舵鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閫�娆炬�婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveBackMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鍑哄簱鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HSellOutMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡鍏朵粬搴旀敹鎬婚噾棰�:</div><div class='right'>" + data1.data[0]['HReceiveOtherMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閫�璐ф�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSellOutBackMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閿�鍞嚭搴撴�婚噾棰�:</div><div class='right'>" + data1.data[0]['HMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈崟閿�鍞嚭搴撳搴旈攢鍞鍗曟�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSeOrderMoney'] + "</div></div>" +
- "<div class='innerBox'><div class='left'>鏈湡閿�鍞鍗曟�婚噾棰�:</div><div class='right'>" + data1.data[0]['HSeOrderMoney_sum'] + "</div></div>" +
- "</div>"
-
- layer.open({
- type: 1, // page 灞傜被鍨�
- area: ['500px', '500px'],
- title: '浠锋牸淇℃伅',
- shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: true, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�
- maxmin: true, // 鍏佽鍏ㄥ睆鏈�灏忓寲
- anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: balanceContent
- });
-
- layer.close(ajaxLoad);
+
+ if(data1.data.HBack == 0){
+ // 浣欓鍏呰冻
+ layer.alert("瀹㈡埛浣欓鍏呰冻!", { icon: 6 });
+ }else {
+ // 浣欓涓嶅厖瓒�
+ layer.alert(data1["HRemark"], { icon: 5 });
+ }
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
index 8ae43d4..6163d4d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
@@ -71,8 +71,7 @@
id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
- <input id="HBillSubType" name="HBillSubType" type="hidden"
- value="姣涘皷" />
+ <input id="HBillSubType" name="HBillSubType" type="hidden" value="姣涘皷" />
</div>
</div>
<div class="layui-inline">
@@ -137,6 +136,21 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">浠撳簱<label style="color:red"> *
+ </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -145,7 +159,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">姘村啿<label style="color:red"> *
+ <label class="layui-form-label">鑺辨<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
<input type="text" name="HWaterRush" id="HWaterRush" class="layui-input"
@@ -225,6 +239,13 @@
value="" style="float:left;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绫虫暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HLong" id="HLong" class="layui-input" value="0"
+ style="float:left;">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -286,7 +307,7 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
@@ -300,7 +321,7 @@
style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -324,13 +345,13 @@
autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">绫虫暟</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLong" lay-verify="HLong" id="HLong"
- autocomplete="off" value="0">
+ autocomplete="off" value="">
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">鍗曟《閲嶉噺</label>
<div class="layui-input-inline">
@@ -897,18 +918,22 @@
var HWaterRate = $("#HWaterRate").val();
var HWeight = $("#HWeight").val();
var HWaterQty = HWeight * HWaterRate;
+ var HLong = $("#HLong").val()
+
$("#HWaterQty").val(HWaterQty);
for (var i = 0; i < option.data.length; i++) {
var HMaterRuleType = option.data[i].HMaterRuleType;
var HMaterRuleExternType1 = option.data[i].HMaterRuleExternType1;
if (HMaterRuleExternType1 == "鏌撴枡") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
} else if (HMaterRuleExternType1 == "鍔╁墏") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
} else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
- option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
+ } else if (HMaterRuleExternType1 == "杞墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
+ }
//if (HMaterRuleExternType == '姣涘皷') {
// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
//}
@@ -916,6 +941,33 @@
table.render(option);
});
//#endregion
+
+ //#region 绫虫暟鍙樻洿锛岃绠楀瓙琛ㄩ噸閲�
+ $("#HLong").on('input change', function (data) {
+ var HWaterRate = $("#HWaterRate").val();
+ var HWeight = $("#HWeight").val();
+ var HWaterQty = HWeight * HWaterRate;
+ var HLong = $("#HLong").val();
+ $("#HWaterQty").val(HWaterQty);
+
+ for (var i = 0; i < option.data.length; i++) {
+ var HMaterRuleType = option.data[i].HMaterRuleType;
+ var HMaterRuleExternType1 = option.data[i].HMaterRuleExternType1;
+ if (HMaterRuleExternType1 == "鏌撴枡") {
+ HQty = dealDoubleToFixed(HRate * HWeight);
+ } else if (HMaterRuleExternType1 == "鍔╁墏") {
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ } else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ } else if (HMaterRuleExternType1 == "杞墏") {
+ option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HLong * 0.001);
+ }
+
+ }
+ table.render(option);
+ });
+ //#endregion
+
//#region 甯冮噸鍙樻洿锛岃绠楀瓙琛ㄩ噸閲�
$("#HWeight").on('input change', function (data) {
@@ -933,7 +985,7 @@
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
} else if (HMaterRuleType == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
- }
+ }
//if (HMaterRuleExternType == '姣涘皷') {
// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
//}
@@ -1138,14 +1190,18 @@
var HQty = 0;
var HMaterRuleType = obj.data.HMaterRuleType;
var HMaterRuleExternType1 = obj.data.HMaterRuleExternType1;
+ var HLong = $("#HLong").val()
+
if (HMaterRuleExternType1 == "鏌撴枡") {
- HQty = dealDoubleToFixed(HRate * HWeight);
+ HQty = dealDoubleToFixed(HRate * HWeight);
} else if (HMaterRuleExternType1 == "鍔╁墏") {
- HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
+ HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
} else if (HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
- HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
- }
+ HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
+ } else if (HMaterRuleExternType1 == "杞墏") {
+ HQty = dealDoubleToFixed(HRate * HLong * 0.001);
+ }
//if (HMaterRuleExternType == '姣涘皷') {
// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
//}
@@ -1233,7 +1289,7 @@
$("#XDH").val("");
$("#HVerNo").val("");
- $("#HLong").val("");
+ $("#HLong").val("0");
$("#HSingleWeight").val("0");
$("#HMaterSumWeight").val("0");
}
@@ -1467,8 +1523,8 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- //"HWHID": data.HWHIDMain //浠撳簱ID
- //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ "HWHID": data.HWHIDMain //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1478,7 +1534,7 @@
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
- "HBillNo": data.鍗曟嵁鍙�
+ ,"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
@@ -1743,13 +1799,17 @@
//鏍规嵁鐗╂枡鐨� 鐗╂枡鍏紡 璁＄畻 閲嶉噺
var HWeight = $("#HWeight").val();
var HWaterQty = $("#HWaterQty").val();
+ var HLong = $("#HLong").val()
+
if (option.data[rowIndex + i].HMaterRuleExternType1 == "鏌撴枡") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "鍔╁墏") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
} else if (option.data[rowIndex + i].HMaterRuleExternType1 == "鍔╁墏锛堟寜娴嗛噸绠楋級") {
- option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
- }
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
+ } else if (option.data[rowIndex + i].HMaterRuleExternType1 == "杞墏") {
+ option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HLong * 0.001);
+ }
//if (option.data[rowIndex + i].HMaterRuleExternType == "姣涘皷") {
// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
//}
@@ -2058,10 +2118,10 @@
temp = $("#HWeight").val() + "";
if (temp == "") {
- layer.msg("娴嗛噸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娴嗛噸涓嶈兘涓虹┖锛�", { ic娴嗛噸on: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
} else if (!ref.test(temp)) {
- layer.msg("甯冮噸锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娴嗛噸锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -2116,10 +2176,10 @@
temp = $("#HWaterRush").val() + "";
if (temp == "") {
- layer.msg("姘村啿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鑺辨涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
} else if (!ref.test(temp)) {
- layer.msg("姘村啿锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鑺辨锛氳杈撳叆闈炶礋鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
index a48518b..58b2b7d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
@@ -140,6 +140,21 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">浠撳簱<label style="color:red"> *
+ </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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">瀹㈡埛</label>
<div class="layui-input-inline">
<input class="layui-input" name="HCusName" lay-verify="HCusName"
@@ -294,7 +309,7 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
@@ -308,7 +323,7 @@
style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -1557,8 +1572,8 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- //"HWHID": data.HWHIDMain //浠撳簱ID
- //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ "HWHID": data.HWHIDMain //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1568,7 +1583,7 @@
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
- "HBillNo": data.鍗曟嵁鍙�
+ , "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index 8c3be7a..e07cf7c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫鐢熶骇棰嗘枡鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
@@ -15,17 +17,17 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
-
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
.layui-form-item .layui-inline {
margin-top: 5px;
margin-bottom: 5px;
margin-right: 0px;
}
- /*end*/
+ /*end*/
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -34,12 +36,20 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
- <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">鏂板</button>
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" id="exit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- <button type="button" id="preview-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button>
- <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
+ <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Copy">澶嶅埗</button>
+ <button type="button" id="addnew-btn"
+ class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Add">鏂板</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="exit-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="preview-btn"
+ class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="planview">棰勮</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="print">鎵撳嵃</button>
</div>
</div>
@@ -54,69 +64,107 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
<input id="HBillSubType" name="HBillSubType" type="hidden" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> *
+ </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 class="layui-input" name="HDate" id="HDate" autocomplete="off"
+ model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">杞﹂棿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">杞﹂棿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HDeptName" id="HDeptName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="Department" 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">宸ヨ壓鍗曞彿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">宸ヨ壓鍗曞彿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="" style="float: left; width: 150px;">
- <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
- <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchProcExchBill" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HProcExchBillNo" id="HProcExchBillNo"
+ class="layui-input" value="" style="float: left; width: 150px;">
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID"
+ lay-verify="HProcExchInterID" value="0">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID"
+ lay-verify="HProcExchEntryID" value="0">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchProcExchBill" 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-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇璁㈠崟鍙�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo"
+ id="HICMOBillNo" readonly="readonly" autocomplete="off">
<input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">棰滆壊<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰滆壊<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HMaterName" lay-verify="HMaterName"
+ id="HMaterName" readonly="readonly" autocomplete="off">
<input id="HMaterID" name="HMaterID" type="hidden" value="0" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
+ <label class="layui-form-label">浠撳簱<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCusName" lay-verify="HCusName" id="HCusName" readonly="readonly" autocomplete="off">
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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">瀹㈡埛<label style="color:red"> *
+ </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCusName" lay-verify="HCusName"
+ id="HCusName" readonly="readonly" autocomplete="off">
<input id="HCusID" name="HCusID" type="hidden" value="0" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">姘村啿<label style="color:red"> * </label></label>
+ <label class="layui-form-label">姘村啿<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HWaterRush" id="HWaterRush" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HWaterRush" id="HWaterRush" class="layui-input"
+ value="" style="float:left;">
</div>
</div>
</div>
@@ -124,56 +172,72 @@
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸1</label>
<div class="layui-input-inline">
- <input type="text" name="HModel" id="HModel" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HModel" id="HModel" class="layui-input"
+ value="" style="float:left;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸2</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HModel2" lay-verify="HModel2" id="HModel2" autocomplete="off">
+ <input class="layui-input" name="HModel2" lay-verify="HModel2"
+ id="HModel2" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">甯冮噸<label style="color:red"> * </label></label>
+ <label class="layui-form-label">甯冮噸<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HWeight" id="HWeight" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HWeight" id="HWeight" class="layui-input"
+ value="" style="float:left;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏈洪��<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鏈洪��<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMachineSpeed" id="HMachineSpeed" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HMachineSpeed" id="HMachineSpeed"
+ class="layui-input" value="" style="float:left;">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鎵撴祮浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鎵撴祮浜�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMaterEmpName" id="HMaterEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMaterEmpID" id="HMaterEmpID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHMaterEmp" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMaterEmpName" id="HMaterEmpName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMaterEmpID" id="HMaterEmpID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="btnSearchHMaterEmp" 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">姘存瘮<label style="color:red"> * </label></label>
+ <label class="layui-form-label">姘存瘮<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HWaterRate" id="HWaterRate" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HWaterRate" id="HWaterRate" class="layui-input"
+ value="" style="float:left;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">姘撮噺<label style="color:red"> * </label></label>
+ <label class="layui-form-label">姘撮噺<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HWaterQty" id="HWaterQty" class="layui-input" value="" style="float:left;" readonly="readonly" autocomplete="off">
+ <input type="text" name="HWaterQty" id="HWaterQty" class="layui-input"
+ value="" style="float:left;" readonly="readonly" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍙暟</label>
<div class="layui-input-inline">
- <input type="text" name="HPieceQty" id="HPieceQty" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HPieceQty" id="HPieceQty" class="layui-input"
+ value="" style="float:left;">
</div>
</div>
</div>
@@ -181,7 +245,8 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
</div>
</div>
@@ -190,38 +255,53 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">棰嗘枡鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">棰嗘枡鍛�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HSecManagerName" id="HSecManagerName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HSecManagerList" 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">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HKeeperList" 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">涓荤<label style="color:red"> * </label></label>
+ <label class="layui-form-label">涓荤<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMangerName" id="HMangerName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManger" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMangerName" id="HMangerName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID"
+ class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HManger" 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-form-item">
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
@@ -230,17 +310,19 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div> -->
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;">
+ <input type="text" name="HSourceBillType" id="HSourceBillType"
+ class="layui-input" value="" style="float:left;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value=""
+ style="float:left;">
</div>
</div>
</div>
@@ -248,25 +330,29 @@
<div class="layui-inline">
<label class="layui-form-label">鑺辩増鍙�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HVerNo" lay-verify="HVerNo" id="HVerNo" autocomplete="off">
+ <input class="layui-input" name="HVerNo" lay-verify="HVerNo" id="HVerNo"
+ autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绫虫暟</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HLong" lay-verify="HLong" id="HLong" autocomplete="off" value="0">
+ <input class="layui-input" name="HLong" lay-verify="HLong" id="HLong"
+ autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟《閲嶉噺</label>
<div class="layui-input-inline">
- <input type="text" name="HSingeWeight" id="HSingeWeight" class="layui-input" value="0" style="float:left;">
+ <input type="text" name="HSingeWeight" id="HSingeWeight"
+ class="layui-input" value="0" style="float:left;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鎬绘祮閲嶉噺</label>
<div class="layui-input-inline">
- <input type="text" name="HMaterSumWeight" id="HMaterSumWeight" class="layui-input" value="0" style="float:left;">
+ <input type="text" name="HMaterSumWeight" id="HMaterSumWeight"
+ class="layui-input" value="0" style="float:left;">
</div>
</div>
</div>
@@ -310,10 +396,10 @@
</div>
<script type="text/html" id="barDemo">
<!--<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>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script>
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -329,7 +415,7 @@
, laydate = layui.laydate
, element = layui.element;
- //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1204";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
@@ -396,7 +482,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
console.log(NewRow);
switch (obj.event) {
//搴撳瓨鏌ヨ
@@ -736,7 +822,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMangerName").val(checkStatus.data[0].HName);
+ $("#HMangerName").val(checkStatus.data[0].HName);
$("#HManagerID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -890,10 +976,10 @@
//#region 淇濆瓨
form.on('submit(Saver)', function (data) {
var refSav = "";
- if (OperationType == 1 || OperationType==2) {
+ if (OperationType == 1 || OperationType == 2) {
refSav = "Add";
}
- if (OperationType==3) {
+ if (OperationType == 3) {
refSav = "Update";
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
@@ -1253,15 +1339,15 @@
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, hide: true}
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, hide: true }
, { field: 'HRate', title: '鐢ㄩ噺鈥�', edit: 'text', width: 100 }
, { field: 'HQty', title: '閲嶉噺', width: 100 }
, { field: 'HWeight', title: '瀹為檯绉伴噸', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true}
- , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true}
- , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true}
+ , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120, hide: true }
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1316,7 +1402,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HWeight": "0"}];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HWeight": "0" }];
table.render(option);
}
//#endregion
@@ -1362,10 +1448,10 @@
//#endregion
//#region 缂栬緫鑾峰彇琛ㄥご
- function set_EditForm(linterid){
+ function set_EditForm(linterid) {
$.ajax({
url: GetWEBURL() + "Kf_MateOutBill/Kf_MateOutBillListCheckDetai",
- async:false,
+ async: false,
type: "GET",
data: {
"HID": linterid
@@ -1375,10 +1461,10 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-
+
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- //"HWHID": data.HWHIDMain //浠撳簱ID
- //, "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ "HWHID": data.HWHIDMain //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
//, "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
//, "HSecManagerName": data.棰嗘枡鍛� //楠屾敹鍛樺悕绉�
//, "HKeeperID": data.HKeeperID //淇濈鍛業D
@@ -1387,8 +1473,8 @@
//, "HMangerName": data.涓荤 //淇濈鍛樺悕绉�
//, "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
//, "XDH": "" //閫夊崟鍙�
-
- "HBillNo": data.鍗曟嵁鍙�
+
+ , "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
@@ -1436,7 +1522,7 @@
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Kf_MateOutBill/Kf_MateOutBillListProjectDetai',
- async:false,
+ async: false,
type: "GET",
data: { "sqlWhere": " and hmainid=" + linterid },
success: function (result) {
@@ -1536,7 +1622,7 @@
table.render(option);
break;
}
- }
+ }
} else {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
}
@@ -1554,7 +1640,7 @@
for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
//濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
- if (i == option.data.length-1) {
+ if (i == option.data.length - 1) {
layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
return;
}
@@ -1567,8 +1653,8 @@
table.render(option);
break;
}
- }
- }else {
+ }
+ } else {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
}
}
@@ -1669,14 +1755,14 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- ,"HMaterCode" : OptionData.鐗╂枡浠ｇ爜
- , "HMaterName" :OptionData.鐗╂枡鍚嶇О
- ,"HMaterSpec" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"HUnitName" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "HMaterCode": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterSpec": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
}
});
}
@@ -1717,11 +1803,11 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HPropertyID" :OptionData.HItemID
- ,"HPropertyCode" : OptionData.HNumber
- , "杈呭姪灞炴��" :OptionData.HName
- })
+ obj.update({
+ "HPropertyID": OptionData.HItemID
+ , "HPropertyCode": OptionData.HNumber
+ , "杈呭姪灞炴��": OptionData.HName
+ })
}
});
}
@@ -1763,10 +1849,10 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
}
});
}
@@ -2022,7 +2108,7 @@
return Result = false;
}
-
+
//#endregion
@@ -2048,7 +2134,7 @@
return Result = false;
}
temp = sSubStr[i].HRate + "";
- if (temp == "" || temp *1 == "0") {
+ if (temp == "" || temp * 1 == "0") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢ㄩ噺涓虹┖鎴栦负0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
} else if (!ref.test(temp)) {
@@ -2137,7 +2223,7 @@
var resultData = {};
$.ajax({
url: GetWEBURL() + "Kf_MateOutBill/getMainDataByHProcExchBillNo",
- async:false,
+ async: false,
type: "GET",
data: {
"HProcExchBillNo": HProcExchBillNo
@@ -2186,7 +2272,7 @@
});
- function GetHDeptNameValue(obj) //杩斿洖杞﹂棿
+ function GetHDeptNameValue(obj) //杩斿洖杞﹂棿
{
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
@@ -2196,15 +2282,15 @@
{
$("#HMaterEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HMaterEmpID").val(obj[0].HItemID);
- }
+ }
- //鍙屽嚮杩斿洖鐗╂枡
- function GetGyMaterial(data) {
- OptionData = data
- }
- //鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(data) {
+ OptionData = data
+ }
+ //鍙屽嚮杩斿洖璁￠噺鍗曚綅
+ function GetGyUnit(data) {
+ OptionData = data
}
@@ -2231,7 +2317,8 @@
}
}
}
- //#endregion
+ //#endregion
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1