From 8d1cb699a4d67c99ce4e64c09c3678d713eb53eb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 13 十月 2021 13:35:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 78 ++++++++++----
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillList.html | 4
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html | 157 +++++++++++++++++++++++++++----
4 files changed, 197 insertions(+), 50 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
index 80c896f..72c729a 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
@@ -74,7 +74,7 @@
<div class=" layui-inline">
<label class="layui-form-label">鏀瑰埗椤圭洰</label>
<div class="layui-input-inline">
- <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HRepairName" id="HRepairName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HRepairList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -86,7 +86,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏀瑰埗閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -96,7 +96,7 @@
<div class=" layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -106,7 +106,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐢宠浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -116,7 +116,7 @@
<div class="layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -151,19 +151,19 @@
<div class=" layui-inline">
<label class="layui-form-label">璁″垝宸ユ椂</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPlanTimes" id="HPlanTimes">
+ <input class="layui-input" name="HPlanTimes" id="HPlanTimes" value="0">
</div>
</div>
<div class=" layui-inline">
<label class="layui-form-label">瀹為檯宸ユ椂</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HTimes" id="HTimes">
+ <input class="layui-input" name="HTimes" id="HTimes" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏀瑰埗鏁伴噺</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HChangeNum" id="HChangeNum">
+ <input class="layui-input" name="HChangeNum" id="HChangeNum" value="0">
</div>
</div>
<div class="layui-inline">
@@ -180,7 +180,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏂扮墿鏂�</label>
<div class="layui-input-inline">
- <input type="text" name="HNewMaterName" id="HNewMaterName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HNewMaterName" id="HNewMaterName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HNewMaterID" id="HNewMaterID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HNewMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -308,15 +308,18 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ debugger;
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
} else {
+ debugger;
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -600,11 +603,10 @@
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
-
- //if (!AllowLoadData(sMainStr))//鏁版嵁楠岃瘉
- //{
- // return false;
- //}
+ if (!AllowLoadData(sMainStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -705,8 +707,19 @@
}
});
//閫�鍑�
- form.on('submit(Exit)', function (data) {//
- Pub_Close(1);
+ form.on('submit(Exit)', function (data) {
+ if (closeType == 0) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
+ if (closeType == 1) {
+ //鍏抽棴寮圭獥
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (closeType == 2) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
});
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
@@ -739,7 +752,7 @@
elem: '#HDate'
, elem: '#HMakeDate'
, elem: '#HRepairBeginDate'
- , elem:'#HRepairEndDate'
+ , elem: '#HRepairEndDate'
});
}
//鏃犳簮鍗曟柊澧�
@@ -785,7 +798,7 @@
var data = result.data.h_v_Sc_MouldRepairChangeBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
- ,"HInterID": data.hmainid
+ , "HInterID": data.hmainid
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HRepairID": data.HRepairID
@@ -825,7 +838,7 @@
, "HUpDater": data.淇敼浜�
, "HDeleteMan": data.浣滃簾浜�
, "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
@@ -856,12 +869,29 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ if ($("#HRepairID").val() == '' || $("#HRepairID").val() == null) {
+ layer.msg("鏀瑰埗椤圭洰涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("鏀瑰埗閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
+ layer.msg("渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+ layer.msg("鐢宠浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
+ layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HNewMaterID").val() == '' || $("#HNewMaterID").val() == null) {
+ layer.msg("鏂扮墿鏂欎笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
else {
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.html"
index b746b93..7bfb315 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.html"
@@ -271,7 +271,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
+ content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -296,7 +296,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index ba80bef..aeb2adb 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -68,7 +68,7 @@
<div class="layui-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -80,7 +80,7 @@
<div class="layui-inline">
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -90,7 +90,7 @@
<div class="layui-inline">
<label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -100,7 +100,7 @@
<div class="layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -110,7 +110,7 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -119,6 +119,26 @@
</div>
</div>
<div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ョ被鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HSupTypeID" id="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+ <option value="1">渚涘簲鍟�</option>
+ <option value="2">瀹㈡埛</option>
+ <option value="3">杞﹂棿閮ㄩ棬</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" 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">
@@ -131,6 +151,8 @@
<input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -272,6 +294,64 @@
}
$("#HWHName").val(checkStatus.data[0].HName);
$("#HWHID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ function getSupType() {
+ var type = $("#HSupTypeID").val();
+ console.log(type)
+ switch (type) {
+ case '1':
+ return "SupplierInformation";
+ break;
+ case '2':
+ return "CustomerInformation";
+ break;
+ case '3':
+ return "DeptInformation";
+ break;
+ }
+ }
+ //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
+ form.on('submit(HSupList)', function () {
+ debugger;
+ if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
+ return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ var url = '../../PublicPage/' + getSupType() + '.html';
+ //alert(url);
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '寰�鏉ュ崟浣嶅垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: [url, '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupName").val(checkStatus.data[0].HName);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -597,14 +677,14 @@
, { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
- , { field: 'HPropertyCode', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HPropertyCode', width: 100 }
- , { field: 'HPropertyName', title: '杈呭姪灞炴�у悕绉�', edit: 'text', width: 100 }
+ , { field: 'HPropertyCode', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HPropertyCode', width: 120 }
+ , { field: 'HPropertyName', title: '杈呭姪灞炴�у悕绉�', edit: 'text', width: 120 }
, { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
- , { field: 'HSecUnitCode', title: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HSecUnitCode', width: 100 }
- , { field: 'HSecUnitName', title: '杈呭姪璁￠噺鍗曚綅鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HSecUnitCode', title: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HSecUnitCode', width: 120 }
+ , { field: 'HSecUnitName', title: '杈呭姪璁￠噺鍗曚綅鍚嶇О', edit: 'text', width: 120 }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
- , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', edit: 'text', width: 120 }
, { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
, { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
@@ -613,12 +693,13 @@
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 100 }
- , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
, { field: 'HSPID', title: '浠撲綅浠ｇ爜', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 100 }
, { field: 'HSPName', title: '浠撲綅鍚嶇О', edit: 'text', width: 100 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+
];
option = {
id: 'mainTable'
@@ -694,6 +775,9 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.澶囨敞 //澶囨敞
+ , "HSupTypeID": data.寰�鏉ョ被鍨� //閫夊崟鍙�
+ , "HSupName": data.寰�鏉ュ崟浣� //鎽樿
+ , "HSupID": data.HSupID //澶囨敞
});
} else {
@@ -1048,26 +1132,59 @@
}
//闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) {
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
+
+
+ if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ layer.msg("浠撳簱涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- 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;
}
if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- 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;
}
-
- if (typeof (sSubStr) == "undefined" || sSubStr == "") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
+ layer.msg("璐熻矗浜轰笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("閮ㄩ棬涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
+ layer.msg("寰�鏉ュ崟浣嶄笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ layer.msg("鍒楄〃鏄庣粏璁板綍涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
if (sSubStr[i].HMaterID == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HUnitID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HDesignLife == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁捐瀵垮懡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HQty == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,瀹炲彂鏁伴噺淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index d6c1ab8..56c5e1f 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -68,7 +68,7 @@
<div class="layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="ZRPerson" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -78,7 +78,7 @@
<div class="layui-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
@@ -88,7 +88,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍙戣揣鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="FHPerson" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -98,7 +98,7 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" 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>
--
Gitblit v1.9.1