From a2cd6bd886c3cfc45e8e60972e838f99f0762425 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 13 十月 2021 10:16:00 +0800
Subject: [PATCH] 往来单位
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html | 4 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 110 +++++++++++++++++++++++-------------
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 31 +++++-----
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html | 6 +
4 files changed, 93 insertions(+), 58 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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
index 4ad0900..95149bc 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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
@@ -415,6 +415,21 @@
}
});
});
+ 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;
@@ -1138,21 +1153,7 @@
}
//#endregion
- 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;
- }
- }
+
});
</script>
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_MouldScrapInBillList.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_MouldScrapInBillList.html"
index 3f05704..be96c39 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_MouldScrapInBillList.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_MouldScrapInBillList.html"
@@ -199,6 +199,10 @@
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 200 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+ , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
+ , { field: '寰�鏉ョ被鍨嬪悕绉�', title: '寰�鏉ョ被鍨�', width: 200 }
+ , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
, { field: '澶囨敞', title: '澶囨敞', width: 200 }
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 ab11039..d6c1ab8 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"
@@ -63,16 +63,6 @@
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
</div>
</div>
- <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="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Customer" 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">
@@ -118,6 +108,26 @@
</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">
<input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
@@ -129,6 +139,9 @@
<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">
@@ -231,9 +244,30 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ 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(Customer)', function () {
+ 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', //鍔犱笂杈规
@@ -242,7 +276,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/CustomerInformation.html', 'yes'],
+ content: [url, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -254,7 +288,6 @@
}
$("#HSupName").val(checkStatus.data[0].HName);
$("#HSupID").val(checkStatus.data[0].HItemID);
- //console.log("aa" + checkStatus.data[0].HName);//閫変腑鐨勫��
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -269,7 +302,6 @@
}
});
});
-
//琛ㄥご淇℃伅璐熻矗浜哄脊绐�
form.on('submit(ZRPerson)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -516,7 +548,10 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
-
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -576,8 +611,10 @@
}
});
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
-
+ }
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -602,15 +639,15 @@
, { 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: 'HSecUnitRate', title: '鎹㈢畻鐜�', edit: 'text', width: 100 }
, { 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 }
@@ -619,8 +656,8 @@
, { 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: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 100 }
, { field: 'HSPName', title: '浠撲綅鍚嶇О', edit: 'text', width: 100 }
@@ -707,6 +744,9 @@
, "XDH": "0" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.澶囨敞 //澶囨敞
+ , "HSupTypeID": data.寰�鏉ョ被鍨�
+ , "HSupName": data.寰�鏉ュ崟浣�
+ , "HSupID": data.HSupID
});
} else {
@@ -1043,35 +1083,20 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
}
});
}
-
obj.event = "";
return false;
-
}
})
}
-
- // 闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- var Result = true;
-
- return Result;
- }
-
//#endregion
-
});
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
- if ($("#HSupID").val() == '' || $("#HSupID").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;
@@ -1086,6 +1111,10 @@
}
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 == "[]") {
@@ -1115,7 +1144,6 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戣揣浠撳簱淇℃伅涓虹┖!", { 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_MouldScrapOutBillList.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_MouldScrapOutBillList.html"
index 6c124db..fc15e16 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_MouldScrapOutBillList.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_MouldScrapOutBillList.html"
@@ -208,8 +208,6 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
- , { field: '寰�鏉ュ崟浣嶄唬鐮�', title: '寰�鏉ュ崟浣嶄唬鐮�', width: 200 }
- , { field: '寰�鏉ュ崟浣嶅悕绉�', title: '寰�鏉ュ崟浣嶅悕绉�', width: 200 }
, { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
, { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
, { field: '璐熻矗浜哄悕绉�', title: '璐熻矗浜哄悕绉�', width: 200 }
@@ -222,6 +220,10 @@
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+ , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
+ , { field: '寰�鏉ョ被鍨嬪悕绉�', title: '寰�鏉ョ被鍨�', width: 200 }
+ , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
, { field: '澶囨敞', title: '澶囨敞', width: 200 }
--
Gitblit v1.9.1