From be8d1a9e80b7b725daa8ce5f1dd9257dade9065d Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 七月 2021 14:58:05 +0800
Subject: [PATCH] 首检20210720v1
---
WebTM/views/Baseset/基础资料/Gy_MaterialList.html | 11
WebTM/views/Baseset/基础资料/Gy_QCCheckItemListView.html | 99 ++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/Baseset/基础资料/Sc_ICMOBillListView2.html | 9
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 546 ++++++++++++++++++++------------------------
WebTM/WebTM.csproj | 3
6 files changed, 357 insertions(+), 315 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8e68569..f841eb6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -83,8 +83,9 @@
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
- <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\WMSBarCodeDetailsList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RepairList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ScrapReasonList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e8bcf45..7980c71 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
锘縡unction 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://192.168.2.21:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃紝璇峰嬁鏇存敼
//var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣�
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
@@ -10,7 +10,7 @@
//var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
+ //var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
return WEBURL
}
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
index 91afb32..0937922 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList.html"
@@ -60,10 +60,10 @@
, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
{ type: 'radio' }
- , { field: 'HItemID', width: 150, title: '鐗╂枡ID', hide: true }
- , { field: 'HNumber', width: 150, title: '鐗╂枡浠ｇ爜' }
- , { field: 'HName', width: 150, title: '鐗╂枡鍚嶇О', sort: true }
- , { field: 'HModel', width: 150, title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HItemID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', sort: true }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
]]
, page: true
});
@@ -73,6 +73,7 @@
if (Value == null) {
Value = '';
}
+ var index = layer.load();
$.ajax({
type: "get",
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
@@ -90,8 +91,10 @@
}
});
+ layer.close(index);
},
error: function (result) {
+ layer.close(index);
console.log(result);
//layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
}
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckItemListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckItemListView.html"
new file mode 100644
index 0000000..0612bdc
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckItemListView.html"
@@ -0,0 +1,99 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="ck-table"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#ck-table'
+ , data: []
+ , cellMinWidth: 80
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: 'HItemID', hide: true }
+ , { field: '浠ｇ爜', title: '浠ｇ爜' }
+ , { field: '鍚嶇О', title: '鍚嶇О' }
+ , { field: '妫�楠岄」鐩被鍒�', title: '妫�楠岄」鐩被鍒�' }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var index = layer.load();
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetGy_QCCheckItem",
+ async: true,
+ data: { "CheckItem": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('ck-table', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
index 152c6db..95d37e4 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView2.html"
@@ -21,7 +21,6 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
</div>
</div>
</form>
@@ -43,14 +42,6 @@
form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
//var sMainStr = JSON.stringify(table.cache['ck-table']);
RoadQuery($('#Value').val());
- });
- form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
- //var sMainStr = JSON.stringify(table.cache['ck-table']);
- var checkStatus = table.checkStatus('ck-table')
- , data = checkStatus.data;
- parent.GetICMOBillValue(data);
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
});
RoadQuery($('#Value').val());
table.render({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 37a5823..c760f9c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -132,13 +132,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗D</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0">
+ <input type="text" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗″瓙ID</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
+ <input type="text" class="layui-input" name="HProcExchEntryID" id="HProcExchEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -164,8 +164,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HLastResult" value="鍚堟牸" title="鍚堟牸">
- <input type="radio" name="HLastResult" value="涓嶅悎鏍�" title="涓嶅悎鏍�">
+ <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
</div>
@@ -278,6 +278,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
//鍏敤鍙橀噺
var rowdata = [];
@@ -314,7 +315,6 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HBillNo = params[params[2]]; //鑾峰彇鍗曟嵁鍙�
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -331,6 +331,8 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
}
});
}
@@ -346,8 +348,12 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
}
});
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation();
}
else if (OperationType == 3) {
RoadBillMain(linterid);
@@ -356,17 +362,46 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ function LoadingInformation() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationInBill/get_Display',
+ type: "GET",
+ data: { "sWhere": "and HInterID = " + linterid },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchInterID").val(data.HProcExchInterID);
+ $("#HProcExchEntryID").val(data.HProcExchEntryID);
+ $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HICMOBillNo").val(data.浠诲姟鍗�);
+ $("#HICMOInterID").val(data.HICMOInterID);
+ $("#HICMOQty").val(data.HICMOQty);
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "妫�楠岄」鐩�": "", "妫�楠屾爣鍑�": "", "鍗曚綅": "", "妫�楠岃褰�": "", "缁撹": "",
- "鏈�澶у��": "", "鏈�灏忓��": "", "骞冲潎鍊�": "", "澶囨敞": "", "婧愬崟涓诲唴鐮�": "",
- "HSourceEntryID": "", "婧愬崟鍗曞彿": "", "婧愬崟绫诲瀷": "", "鍏宠仈鏁伴噺": "", "鍏宠仈閲戦": "",
- "琛屽叧闂汉": "", "鍏抽棴鏃堕棿": "", "鎵嬪伐鍏抽棴": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "",
+ "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "",
+ "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -411,108 +446,72 @@
}
});
}
- //鍗曞嚮鏀瑰彉鏄惁濮斿鍊�
- if (obj.event === 'isEntrustCheck') {
- var flag = obj.data.isEntrust;
- var flagValue = obj.data.isEntrustValue;
- if (flagValue === "false") {
- flagValue = "true";
- flag = "鏄�";
- }
- else if (flagValue === "true") {
- flagValue = "false";
- flag = "鍚�";
- }
- else {
- flagValue = "false";
- flag = "鍚�";
- }
- obj.update({
- isEntrust: flag
- , isEntrustValue: flagValue
+
+ 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();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
});
}
- if (obj.event === 'HProcCheck') {//宸ュ簭
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 宸ュ簭: subProcName
- , hprocid: subProcID
- , HProcNumber: subProcNumber
+
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HQCCheckItemID') //妯″叿淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠岄」鐩垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html', '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({
+ 妫�楠岄」鐩�: checkStatus.data[0].鍚嶇О
+ , HQCCheckItemID: checkStatus.data[0].HItemID
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
});
}
- })
- }
- if (obj.event === 'HSupCheck') {//渚涘簲鍟�
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '渚涘簲鍟嗗垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 渚涘簲鍟�: subSupName
- , HSupID: subSupID
- , 渚涘簲鍟嗕唬鐮�: subSupNumber
- });
- }
- })
- }
- if (obj.event === 'HWorkCenterCheck') {//宸ヤ綔涓績
- var _obj = obj;
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鍔犲伐涓績鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
- , resize: false
- , end: function () {
- _obj.update({
- 宸ヤ綔涓績: subWorkCenterName
- , HCenterID: subWorkCenterID
- , 宸ヤ綔涓績浠ｇ爜: subWorkCenterNumber
- });
- }
- })
- }
- //鍗曞嚮鏀瑰彉涓嶅彲缂栬緫鍊�
- if (obj.event === 'isEditCheck') {
- var flag = obj.data.isEdit;
- var flagValue = obj.data.isEditValue;
- if (flagValue === "false") {
- flagValue = "true";
- flag = "鏄�";
+
+ obj.event = "";
+ return false;
+
}
- else if (flagValue === "true") {
- flagValue = "false";
- flag = "鍚�";
- }
- else {
- flagValue = "false";
- flag = "鍚�";
- }
- obj.update({
- isEdit: flag
- , isEditValue: flagValue
- });
- }
+ })
});
//淇濆瓨鎸夐挳
@@ -533,28 +532,24 @@
if ($("#HFirstCheckEmp").val() == 0 ) {
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
- }
- //if (!$("#HPlanBeginDate").val()) {
- // layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
+ }
//if (!$("#HPlanEndDate").val()) {
// layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
- //var sSubTable = table.cache['mainTable'];
- //for (var i = 0; i < sSubTable.length; i++) {
- // if (!sSubTable[i].hprocid) {
- // var indexRow = i + 1;
- // layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- // }
- // if (!sSubTable[i].HSupID) {
- // var indexRow = i + 1;
- // layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- // }
- //}
+ var sSubTable = table.cache['mainTable'];
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HQCCheckItemID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!sSubTable[i].HSourceEntryID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝婧愬崟瀛愬唴鐮佷笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType;
@@ -591,7 +586,8 @@
});
}
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ //缂栬緫鏃跺姞杞借〃澶�
+ function RoadBillMain(linterid)
{
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -602,62 +598,87 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
}
})
}
-
- //閫夋嫨浜у搧寮圭獥
- form.on('submit(btnSearchMater)', function () {//浜у搧
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
-
-
- //閫夋嫨宸ュ簭娴佽浆鍗�
+ //琛ㄥご淇℃伅宸ュ簭娴佽浆鍗″脊绐�
form.on('submit(btnSearchProcExch)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭娴佽浆鍗″垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭娴佽浆鍗″垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+ $("#HProcExchEntryID").val(checkStatus.data[0].hsubid);
+ $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //閫夋嫨鐢熶骇浠诲姟鍗�
+ //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
form.on('submit(btnSearchICMOBill)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢熶骇浠诲姟鍗曞垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇浠诲姟鍗曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
//琛ㄥご淇℃伅閫夋嫨妫�楠屽憳寮圭獥
@@ -736,59 +757,44 @@
});
});
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
+ //琛ㄥご淇℃伅浜у搧寮圭獥
+ form.on('submit(btnSearchMater)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- // }
- });
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -801,36 +807,37 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "妫�楠岄」鐩�": "", "妫�楠屾爣鍑�": "", "鍗曚綅": "", "妫�楠岃褰�": "", "缁撹": "",
- "鏈�澶у��": "", "鏈�灏忓��": "", "骞冲潎鍊�": "", "澶囨敞": "", "婧愬崟涓诲唴鐮�": "",
- "HSourceEntryID": "", "婧愬崟鍗曞彿": "", "婧愬崟绫诲瀷": "", "鍏宠仈鏁伴噺": "", "鍏宠仈閲戦": "",
- "琛屽叧闂汉": "", "鍏抽棴鏃堕棿": "", "鎵嬪伐鍏抽棴": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "",
+ "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "",
+ "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": ""
}];
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , cellMinWidth: 90
+ , cellMinWidth: 150
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text' }
- , { field: '妫�楠屾爣鍑�', title: '妫�楠屾爣鍑�', edit: 'text' }
- , { field: '鍗曚綅', title: '鍗曚綅', edit: 'text' }
- , { field: '妫�楠岃褰�', title: '妫�楠岃褰�', edit: 'text' }
- , { field: '缁撹', title: '缁撹', edit: 'text' }
- , { field: '鏈�澶у��', title: '鏈�澶у��', edit: 'text' }
- , { field: '鏈�灏忓��', title: '鏈�灏忓��', edit: 'text' }
- , { field: '骞冲潎鍊�', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
- , { field: '澶囨敞', title: '澶囨敞', edit: 'text' }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HResult', title: '缁撹', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�' }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
- , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦' }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- , { field: '鍏抽棴鏃堕棿', title: '鍏抽棴鏃堕棿' }
- , { field: '鎵嬪伐鍏抽棴', title: '鎵嬪伐鍏抽棴' }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' }
+ , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺' }
+ , { field: 'HRelationMoney', title: '鍏宠仈閲戦' }
+ , { field: 'HCloseMan', title: '琛屽叧闂汉' }
+ , { field: 'HEntryCloseDate', title: '鍏抽棴鏃堕棿' }
+ , { field: 'HCloseType', title: '鎵嬪伐鍏抽棴' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
, text: {
@@ -853,66 +860,7 @@
ZRProcName, QRName;
- //杩斿洖鐢熶骇浠诲姟鍗�
- function GetICMOBillValue(obj) {
- var data = obj[0];
- $("#HICMOInterID").val(data.hmainid);
- $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
- $("#HICMOEntryID").val(data.HEntryID);
- $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
- $("#HMaterID").val(data.hmaterid);
- $("#HMaterName").val(data.鐗╂枡鍚嶇О);
- $("#HMaterID2").val(data.hmaterid);
- $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
- $("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
- $("#HModel").val(data.瑙勬牸鍨嬪彿);
- $("#HBatchNo").val(data.鎵瑰彿);
- $("#HUnitID").val(data.hunitid);
- $("#HUnitName").val(data.璁￠噺鍗曚綅鍚嶇О);
- $("#HUnitNumber").val(data.璁￠噺鍗曚綅浠ｇ爜);
- $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
- $("#HQty").val(data.娴佽浆鍗℃暟閲�);
- $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
- $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
- $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
- $("#HWorkShopID").val(data.hdeptid);
- $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
- $("#HProdMaterCode").val(data.浜у搧CODE);
- $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
- $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
- $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
- $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
- $("#HProdMaterName").val(data.浜у搧鍚嶇О);
- $("#HCusName").val(data.瀹㈡埛鍚嶇О);
- $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
- $("#HImportNote").val(data.閲嶈鎻愮ず);
- //txtHBillNo.Text = sBillNo;
- //GetICMOBillDetail(obj[0].hmainid);
- }
- //杩斿洖宸ュ簭娴佽浆鍗�
- function GetProcessExchangeValue(obj) {
- var data = obj[0];
- $("#HICMOInterID").val(data.hmainid);
- $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
- $("#HICMOEntryID").val(data.HEntryID);
- $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
- }
-
-
- //杩斿洖浜у搧
- function GetHMaterNameValue(obj) {
- $("#HMaterName2").val(obj[0].HName);
- $("#HMaterID2").val(obj[0].HItemID);
- $("#HMaterNumber2").val(obj[0].HNumber);
- $("#HMaterHModel2").val(obj[0].HModel);
- }
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1