From 4405a1a3a5444795c19eb8a577f27078f0b810fa Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 12 十月 2021 10:30:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBill.html | 26
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 1052 ++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html | 4
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 3
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 25
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/index.html | 5
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 13
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 9
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBill.html | 87 +++
10 files changed, 1,170 insertions(+), 56 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8c20031..916ca49 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,7 +2,7 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 23fbba9..81f2072 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -458,7 +458,8 @@
<dd>
<a>鍩虹寤烘ā</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">鍣ㄥ叿鍒嗙被</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">鍣ㄥ叿鍒嗙被</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">鍣ㄥ叿鍒嗙被缁存姢</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">鍣ㄥ叿涓绘。</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。缁存姢</a></dd>
</dl>
@@ -468,7 +469,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
- <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html ">鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢</a></dd>
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/Gy_MouldType.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/Gy_MouldType.html"
index 4ab6a34..4649630 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/Gy_MouldType.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/Gy_MouldType.html"
@@ -216,12 +216,13 @@
}
//鏌ヨ
function get_Display(sWhere) {
+ var ModRightNameSelect = 'Gy_MouldTypeList';
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Gy_ModelType/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -276,14 +277,20 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level + ''],
-
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
});
}
//鍒犻櫎
function set_DeleteBill() {
- var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
+ var ModRightNameDelete = 'Gy_MouldType_Delete';
if (TagId != "") {
layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
index 79b00bd..63cecc7 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
@@ -102,7 +102,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">鑱屽憳</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" 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;">
@@ -139,9 +139,19 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
+ <input type="text" name="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayType" id="HPayType" style="padding-left: 32px;">
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -301,8 +311,8 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCheck', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 190 }
+ //, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
, { field: 'HProcID', title: 'HProcID', edit: 'text', width: 100, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck", width: 100 }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', edit: 'text', width: 100 }
@@ -325,6 +335,14 @@
};
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HChecker").val(sessionStorage["HUserName"]);
+ $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCloseMan").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HProcID": "", "HProcNumber": "", "HProcName": ""
@@ -426,13 +444,13 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/MouldInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
@@ -442,7 +460,6 @@
HMaterID: checkStatus.data[0].HItemID,
HMaterCode: checkStatus.data[0].HNumber,
HMaterName: checkStatus.data[0].HName,
- HMaterSpec: checkStatus.data[0].HModel,
HDesignLife: 0, //璁捐瀵垮懡
HLeaveLife: 0, //鍓╀綑瀵垮懡
@@ -660,9 +677,11 @@
, "HGroupID": data.HGroupID //鐝粍ID
, "HGroupName": data.鐝粍 //鐝粍鍚嶇О
, "HEmpID": data.HEmpID //涓荤ID
- , "HEmpName": data.涓荤 //涓荤鍚嶇О
+ , "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
, "HDeptID": data.HDeptID //閮ㄩ棬ID
, "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HPayID": data.HPayID
+ , "HPayTypeName": data.宸ヨ祫绫诲瀷
, "HSourceBillType": "" //婧愬崟绫诲瀷
, "Box2": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
@@ -794,13 +813,13 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
@@ -820,7 +839,43 @@
}
});
});
+ //琛ㄥご淇℃伅宸ヨ祫绫诲瀷寮圭獥
+ form.on('submit(PayType)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヨ祫绫诲瀷鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷);
+ $("#HPayID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (OperationType == 1) {
@@ -857,7 +912,7 @@
return [year, month, day].join('-');
}
//淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
@@ -867,20 +922,12 @@
$.ajax({
type: "POST",
url: GetWEBURL() + "/Pay_SingleBalBill/AddBill",
- //url:"http://localhost:12761/Gy_RoutingBill/AddBill",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
+
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 037c364..f514717 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -157,6 +157,9 @@
, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
, { field: '鑱屽憳浠g爜', title: '鑱屽憳浠g爜', width: 180 }
, { field: '鑱屽憳', title: '鑱屽憳', width: 125 }
+ , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
+ , { field: '宸ヨ祫浠g爜', title: '宸ヨ祫浠g爜', width: 180 }
+ , { field: '宸ヨ祫绫诲瀷', title: '宸ヨ祫绫诲瀷', width: 125 }
, { field: '鎽樿', title: '鎽樿', width: 125 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
index 5705e4a..9baa79b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBill.html"
@@ -421,13 +421,13 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/MouldInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
@@ -435,14 +435,13 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HMaterID: checkStatus.data[0].HItemID,
- HMaterCode: checkStatus.data[0].HNumber,
- HMaterName: checkStatus.data[0].HName,
- HMaterSpec: checkStatus.data[0].HModel,
+ HMaterCode: checkStatus.data[0].鐗╂枡浠g爜,
+ HMaterName: checkStatus.data[0].鐗╂枡,
- HDesignLife: 0, //璁捐瀵垮懡
- HLeaveLife: 0, //鍓╀綑瀵垮懡
- HQty: 1, //瀹炴敹鏁伴噺
- HMoney: 0, //閲戦
+ //HDesignLife: 0, //璁捐瀵垮懡
+ //HLeaveLife: 0, //鍓╀綑瀵垮懡
+ //HQty: 1, //瀹炴敹鏁伴噺
+ //HMoney: 0, //閲戦
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -789,17 +788,17 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
@@ -815,7 +814,6 @@
}
});
});
-
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (OperationType == 1) {
@@ -841,7 +839,7 @@
return [year, month, day].join('-');
}
//淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
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 cc5dfb8..1b82dc0 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"
@@ -77,7 +77,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>
@@ -89,7 +89,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>
@@ -99,7 +99,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>
@@ -109,7 +109,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>
@@ -137,7 +137,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="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>
@@ -658,11 +658,11 @@
, { 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: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 100 }
- , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠g爜', 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: '鏀舵枡浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 100 }
- , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HSPCode', title: '鏀舵枡浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 120 }
+ , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', edit: 'text', width: 120 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
];
option = {
@@ -1027,7 +1027,11 @@
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
});
-
+ ////琛ㄥご浠撳簱涓虹┖鏃� 缁戝畾鏄庣粏琛屼粨搴撲俊鎭�
+ //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ // $("#HWHName").val(checkStatus.data[0].HName);
+ // $("#HWHID").val(checkStatus.data[0].HItemID);
+ //}
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) {
@@ -1132,6 +1136,7 @@
}
return Result;
}
+
//#endregion
function getSupType() {
var type = $("#HSupTypeID").val();
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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
new file mode 100644
index 0000000..7a0980e
--- /dev/null
+++ "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_MouldProdOutBillEdit.html"
@@ -0,0 +1,1052 @@
+锘�<!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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
+
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <!--<ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>-->
+ <!--<li>鍏朵粬淇℃伅</li>-->
+ <!--</ul>-->
+ <h1 style="text-align:center;"><b>鍣ㄥ叿棰嗙敤鍗�</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <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" /><!--鍒跺崟浜�-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <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="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>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-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="" 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>
+ <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="" 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>
+ <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="" 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>
+ <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">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </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;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">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ </div>
+ </div>
+ <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>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </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>
+ </script>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙fā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+ var hID = params[params[1]];//缂栬緫鏌ョ湅
+
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+
+ });
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+ var tableReload = table.reload;
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+ , { 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: '鍙戞枡浠撳簱浠g爜', 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: '浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 100 }
+ , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
+ table.render(option);
+ }
+ else {
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + hID },
+ success: function (result) {
+ //console.log(result);
+ //console.log('gouba' + result);
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ var rowid = 0;
+ var rows = 0;
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ //layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event === 'HMaterCode') //妯″叿淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍣ㄥ叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/MouldInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterCode: checkStatus.data[0].HNumber,
+ HMaterName: checkStatus.data[0].HName,
+ HMaterSpec: checkStatus.data[0].HModel,
+
+ HDesignLife: 0, //璁捐瀵垮懡
+ HLeaveLife: 0, //鍓╀綑瀵垮懡
+ HQty: 1, //瀹炴敹鏁伴噺
+ HMoney: 0, //閲戦
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ if (obj.event === 'HWHCode') //浠撳簱浠g爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HWHID: checkStatus.data[0].HItemID,
+ HWHCode: checkStatus.data[0].HNumber,
+ HWHName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HSPCode') //浠撲綅浠g爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撲綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareLocationInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSPID: checkStatus.data[0].HItemID,
+ HSPCode: checkStatus.data[0].HNumber,
+ HSPName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //鐩戝惉鍗曞厓鏍肩紪杈�
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ switch (field) {
+ case "HDesignLife": //璁捐瀵垮懡
+ value = isNaN(value) ? 0 : value;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDesignLife: value, //璁捐瀵垮懡
+ HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HLeaveLife": //鍓╀綑瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+ obj.update({
+ HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HUseLife": //浣跨敤瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ value = isNaN(value) ? 0 : value;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HQty": //瀹炲彂鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HPrice": //鍗曚环
+ value = isNaN(value) ? 0 : value;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HMoney": //閲戦
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ default:
+ }
+ });
+
+
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ {
+ //alert(hID);
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": hID
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MouldProdOutHouseBillList[0];
+ console.info(data);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HWHID": data.HWHID //浠撳簱ID
+ , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
+ , "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
+ , "HKeeperID": data.hkeeperid //淇濈鍛業D
+ , "HKeeperName": data.鍙戞枡浜� //淇濈鍛樺悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (hID == null || hID == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3802' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
+
+ //琛ㄥご淇℃伅浠撳簱寮圭獥
+ form.on('submit(WareHouse)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWHID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ //琛ㄥご淇℃伅楠屾敹鍛樺脊绐�
+ form.on('submit(HSecManagerList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManagerName").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅淇濈鍛樺脊绐�
+ form.on('submit(HKeeperList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
+ form.on('submit(HSupList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ 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) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //鎵撳嵃Printing
+ form.on("submit(view)", function (data) {
+ if (hID != "" || hID != null) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯$増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hID.toString() + '&MyMsg=' + hID.toString() + '&Type=HMouldProdOutBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+ }
+
+ });
+ //鎵撳嵃Printing
+ form.on("submit(print)", function (data) {
+ if (hID != "" || hID != null) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯$増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hID.toString() + '&MyMsg=' + hID.toString() + '&Type=HMouldProdOutBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ debugger;
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr;
+
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldProdOutBill/SaveGetMouldProdOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+
+ });
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HReasonName, ReasonID, EmpName, SQProcName,
+ ProcID, ZRProcName, QRName
+ ;
+ function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HReasonName = obj[0].HName;
+ ReasonID = obj[0].HItemID;
+ }
+ //杩斿洖鐗╂枡
+ function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
+ $("#HMater").val(obj[0].HName);
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDepName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖鍗曚綅
+ function GetHUnitNameValue(obj) {
+ $("#HUName").val(obj[0].HName);
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitNumber").val(obj[0].HNumber);
+ }
+
+ function GetHKeeperValue(obj) { //杩斿洖璐d换浜�
+ EmpName = obj[0].HName;
+ // $("#HEmpName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
+ // SQProcName = obj[0].宸ュ簭;
+ // ProcID = obj[0].HItemID;
+ // //$("#HSQProcName").val(obj[0].宸ュ簭);
+ // //$("#HProcID").val(obj[0].HItemID);
+ //}
+ function GetHZRValue(obj) { //杩斿洖璐d换宸ュ簭
+ ZRProcName = obj[0].宸ュ簭;
+ //$("#HZRProcName").val(obj[0].宸ュ簭);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //HWorker
+ function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
+ QRName = obj[0].HName;
+ //$("#HQRName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //寰�鏉ュ崟浣�
+ 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;
+ }
+ }
+ 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: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").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 (typeof (sSubStr) == "undefined" || 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: "娓╅Θ鎻愮ず" });
+ 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;
+ }
+ //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
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_MouldProdOutBillList.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_MouldProdOutBillList.html"
index 56fd297..3186a2f 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_MouldProdOutBillList.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_MouldProdOutBillList.html"
@@ -246,7 +246,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -270,7 +270,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.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\347\256\241\347\220\206/Gy_MouldFileList.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\347\256\241\347\220\206/Gy_MouldFileList.html"
index 1e9161f..7b43180 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\347\256\241\347\220\206/Gy_MouldFileList.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\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -225,11 +225,12 @@
//鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
+ var ModRightNameSelect = 'Gy_MouldFileList';
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Gy_Mould/list1',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -319,13 +320,13 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
-
+ var ModRightNameDelete = 'Gy_MouldFile_Delete';
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
url: GetWEBURL() + '/Gy_Mould_Edit/Delete_Json',
- data: { "hmainid": HInterID },
+ data: { "hmainid": HInterID, "ModRightNameDelete": ModRightNameDelete, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -366,7 +367,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID,"IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
--
Gitblit v1.9.1