From 9b4c25b3f5867341305d4d8efb4d1e9990498c8f Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 17 一月 2022 09:10:59 +0800
Subject: [PATCH] 工艺路线 完善
---
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html | 14
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 634 +++++++++++++++++++++++++++++++++++++++++------
WebTM/views/Baseset/基础资料/Gy_LineCenter.html | 102 +++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 8
WebTM/WebTM.csproj | 1
5 files changed, 663 insertions(+), 96 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 19edff7..ec432f5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -86,6 +86,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_LineCenter.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_LineCenter.html"
new file mode 100644
index 0000000..20fbff0
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_LineCenter.html"
@@ -0,0 +1,102 @@
+锘�<!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-header"></div>-->
+ <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>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></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 () {//閫夋嫨鍗曚綅
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHReasonValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ // , url: '/demo/table/user/'
+ , data: []
+ , 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 }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/Gy_LineCenter_Json",
+ async: true,
+ data: { "BadReason": Value },
+ //data: { "Value": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index f4035ee..2bef85f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -328,12 +328,12 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: '瀛愮淮淇」鐩�', title: '缁翠慨椤圭洰', edit: 'text', event: "HRepairID"}
- , { field: 'HRepairID', title: '缁翠慨椤圭洰id', hide: true}
+ , { field: '瀛愮淮淇」鐩�', title: '缁翠慨椤圭洰', edit: 'text', event: "HRepairID" }
+ , { field: 'HRepairID', title: '缁翠慨椤圭洰id', hide: true }
, { field: '瀛愮淮淇」鐩唬鐮�', title: '缁翠慨椤圭洰浠ｇ爜' }
, { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
- , { field: '瀛愯礋璐ｄ汉浠ｇ爜', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerID"}//, hide: true
- , { field: 'HManagerID', title: 'id', width: 115, hide: true}//, hide: true
+ , { field: '瀛愯礋璐ｄ汉浠ｇ爜', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerID" }//, hide: true
+ , { field: 'HManagerID', title: 'id', width: 115, hide: true }//, hide: true
, { field: '瀛愯礋璐ｄ汉', title: '璐熻矗浜�', width: 115 }
, { field: 'HMoney', title: '缁翠慨璐圭敤', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
@@ -341,7 +341,7 @@
]]
};
//鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{ "瀛愮淮淇」鐩�":"","HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "", "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HMoney": 0, "HRemark": "" }];
+ var rowdata = [{ "瀛愮淮淇」鐩�": "", "HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "", "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HMoney": 0, "HRemark": "" }];
option.data = rowdata;
table.render(option);
@@ -398,7 +398,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
- var NewRow = { "瀛愮淮淇」鐩�": "","HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "", "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HMoney": 0, "HRemark": "" };
+ var NewRow = { "瀛愮淮淇」鐩�": "", "HRepairID": 0, "瀛愮淮淇」鐩唬鐮�": "", "HRepairExplanation": "", "瀛愯礋璐ｄ汉浠ｇ爜": "", "HManagerID": 0, "瀛愯礋璐ｄ汉": "", "HMoney": 0, "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
@@ -716,7 +716,7 @@
obj.event = "";
return false;
}
-
+
})
}
//淇濆瓨鏁版嵁
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 1f74f3f..de102f8 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -9,6 +9,11 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.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>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -19,12 +24,28 @@
.btn-title {
font-size: 16px;
}
- /*.table-select {
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
- }*/
+ }
+
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
</style>
+
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -75,6 +96,12 @@
<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍥惧彿鐗堟湰</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -87,18 +114,24 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;width:90%" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 105px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" readonly>
</div>
- </div>-->
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎬昏鍥惧彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -114,7 +147,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -123,11 +156,17 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃堕棿鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 182px;">
+ <div class="layui-input-block" style="margin-left: 120px;width: 172px;">
<select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
<option value="灏忔椂">灏忔椂</option>
<option value="澶�">澶�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏉愯川</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -162,6 +201,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鎴愬搧缂栧彿</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -181,6 +226,12 @@
<label class="layui-form-label" style="width: 85px;">宸ヤ环</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鐗堟湰</label>
+ <div class="layui-input-block" style="margin-left: 105px;">
+ <input type="text" class="layui-input" name="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -311,6 +362,7 @@
</div>
</div>
</div>
+
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -327,17 +379,50 @@
<!--<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 type="text/html" id="HSupColor">
- {{# if(d.HSupFlag === "true"){ }}
- <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
- {{# } else { }}
- <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
- {{# } }}
+
+ <!--琛屼笅鎷夐�夋嫨(宸ュ簭绫诲瀷)-->
+ <script type="text/html" id="HProcType">
+ <select name="HProcType" lay-filter="HProcType" id="HProcType{{d.LAY_TABLE_INDEX+1}}">
+ <option value="涓诲伐搴�">涓诲伐搴�</option>
+ <option value="杈呭姪宸ュ簭">杈呭姪宸ュ簭</option>
+ </select>
</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 type="text/html" id="HSupFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--澶嶉�夋 涓嬮亾娴佽浆宸ュ簭-->
+ <script type="text/html" id="HNextProcFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HNextProcFlag" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--澶嶉�夋 娴佽浆宸ュ簭-->
+ <script type="text/html" id="HFlowProc">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HFlowProc" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--澶嶉�夋 鏍囧噯瀹氶-->
+ <script type="text/html" id="HStdFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HStdFlag" lay-filter="HStdFlag" id="HStdFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--澶嶉�夋 鑷姩绉昏浆-->
+ <script type="text/html" id="HAutoTrunFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HAutoTrunFlag" lay-filter="HAutoTrunFlag" id="HAutoTrunFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
<script>
layui.config({
@@ -361,7 +446,17 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
+ "HProcNo": "", "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
+ , "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "HWorkQty": 0, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
+ , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
+ , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
+ , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
+ , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ , "HProcWorkNum": ""
}];
//#endregion
@@ -386,6 +481,8 @@
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
+ linteridSub = -1;
+ OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
@@ -408,28 +505,83 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- , cellMinWidth: 90
+ , cellMinWidth: 120
+ , height: 400
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text' }
- , { field: 'HProcID', title: '宸ュ簭ID' }//, hide: true
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', width: 115 }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', edit: 'text' }
- , { field: 'HSupID', title: '渚涘簲鍟咺D' }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', edit: 'text' }
- , { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: '#HSupColor', event: "HSupFlagEvent" }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }
- , { field: 'HPassRate', title: '鑹巼', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
+ , { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
+ , { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
+ , { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+ , { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
+ , { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
+ , { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
+ , { field: 'HChangeMould', title: '鎹㈡ā鏃堕棿', edit: 'text' }
+ , { field: 'HPackStd', title: '鍛ㄨ浆绠辨爣鍑�', edit: 'text' }
+ , { field: 'HPack', title: '鍛ㄨ浆绠�', edit: 'text' }
+ , { field: 'HPutArea', title: '鏆傛斁鍖�', edit: 'text' }
+ , { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
+ , { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
+ , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
+ , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }//涓嶅～
+ , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', edit: 'text', event: "CheckHCenterID" }//f7
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', edit: 'text', width: 110, event: "CheckHSupID" }//f7
+ , { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
+ , { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
+ , { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
+ , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+ , { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
+ , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text' }
+ , { field: 'HReadyTime', title: '鍑嗗鏃堕棿', edit: 'text' }
+ , { field: 'HQueueTime', title: '鎺掗槦鏃堕棿', edit: 'text' }
+ , { field: 'HMoveTime', title: '杞Щ鏃堕棿', edit: 'text' }
+ , { field: 'HNextProcFlag', title: '涓嬮亾娴佽浆宸ュ簭', templet: "#HNextProcFlag" }//chenbox
+ , { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
+ , { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
+ , { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
+ , { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
+ , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+ , { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
+ , { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
+ , { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
+ , { field: 'HBeginDayQty', title: '寮�宸ヤ綑閲忥紙澶╂暟锛�', edit: 'text' }
+ , { field: 'HBeginFixQty', title: '寮�宸ヤ綑閲忥紙鍥烘暟锛�', edit: 'text' }
+ , { field: 'HFixWorkDays', title: '涓婇亾鍥哄畾澶╂暟', edit: 'text' }
+ , { field: 'HTrunWorkDays', title: '涓婇亾寰幆鍛ㄦ湡', edit: 'text' }
+ , { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
+ , { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
+ , { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
+ , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+ , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
+ , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
+ , { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
//, done: function (res, curr, count) {
- // $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');
+ // option.data = res.data;
+ // //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ // $('.layui-form-select').find('input').unbind("blur");
+ // //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ // $('tr').each(function (e) {
+
+ // var $cr = $(this);
+ // var dataIndex = $cr.attr("data-index");
+ // $.each(option.data, function (index, value) {
+ // //alert(value)
+ // if (value.LAY_TNDEX == dataIndex) {
+ // $cr.find('input').val(value.HProcType);
+ // }
+ // });
+ // });
//}
- };
+ }
+
//鍒濆鍔犺浇琛ㄦ牸
option.data = rowdata;
table.render(option);
@@ -468,15 +620,86 @@
get_checkRoutingGroup();
});
-
+
//鏄惁榛樿宸ヨ壓
form.on('checkbox(checkboxHStandard)', function (data) {
$("#HStandard").val(data.elem.checked);
});
- //鏄惁鍚敤
- //form.on('checkbox(checkboxHUseFlag)', function (data) {
- // $("#HUseFlag").val(data.elem.checked);
- //});
+
+ //#region 澶嶉�夋
+ //濮斿鍗忓姪
+ form.on('checkbox(HSupFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HSupFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //涓嬮亾娴佽浆宸ュ簭
+ form.on('checkbox(HNextProcFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HNextProcFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //娴佽浆宸ュ簭
+ form.on('checkbox(HFlowProc)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HFlowProc = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏍囧噯瀹氶
+ form.on('checkbox(HStdFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鑷姩绉昏浆
+ form.on('checkbox(HAutoTrunFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAutoTrunFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
+ //琛岄�夋嫨澶勭悊锛堝伐搴忕被鍨嬶級
+ form.on('select(HProcType)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HProcType = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -484,15 +707,51 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- //"HProcNo": "", "宸ュ簭": "", "HProcID": "0", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "0", "渚涘簲鍟嗕唬鐮�": ""
- //, "渚涘簲鍟�": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
- "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
+ "HProcNo": "", "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
+ , "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
+ , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+ , "HWorkQty": 0, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
+ , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
+ , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
+ , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
+ , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ , "HProcWorkNum": ""
};
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
+
table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ console.log(option.data[i - 1].HSupFlag)
+ $('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
+ //濮斿鍗忓姪
+ if (option.data[i - 1].HSupFlag) {
+ $('#HSupFlag' + i + '').attr("checked", true);
+ }
+ //涓嬮亾娴佽浆宸ュ簭
+ if (option.data[i - 1].HNextProcFlag) {
+ $('#HNextProcFlag' + i + '').attr("checked", true);
+ }
+ //娴佽浆宸ュ簭
+ if (option.data[i - 1].HFlowProc) {
+ $('#HFlowProc' + i + '').attr("checked", true);
+ }
+ //鏍囧噯瀹氶
+ if (option.data[i - 1].HStdFlag) {
+ $('#HStdFlag' + i + '').attr("checked", true);
+ }
+ //鑷姩绉昏浆
+ if (option.data[i - 1].HAutoTrunFlag) {
+ $('#HAutoTrunFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -508,7 +767,31 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
+ //濮斿鍗忓姪
+ if (option.data[i - 1].HSupFlag) {
+ $('#HSupFlag' + i + '').attr("checked", true);
+ }
+ //涓嬮亾娴佽浆宸ュ簭
+ if (option.data[i - 1].HNextProcFlag) {
+ $('#HNextProcFlag' + i + '').attr("checked", true);
+ }
+ //娴佽浆宸ュ簭
+ if (option.data[i - 1].HFlowProc) {
+ $('#HFlowProc' + i + '').attr("checked", true);
+ }
+ //鏍囧噯瀹氶
+ if (option.data[i - 1].HStdFlag) {
+ $('#HStdFlag' + i + '').attr("checked", true);
+ }
+ //鑷姩绉昏浆
+ if (option.data[i - 1].HAutoTrunFlag) {
+ $('#HAutoTrunFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
}
break;
}
@@ -516,37 +799,9 @@
//琛屽唴浜嬩欢
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);
- }
- });
- }
- //鍗曞嚮鏀瑰彉澶栧崗鏍囪鍊�
- if (obj.event === 'HSupFlagEvent') {
- var flag = obj.data.HSupFlag;
- if (flag === "false") {
- flag = "true";
- }
- else if (flag === "true") {
- flag = "false";
- }
- else {
- flag = "true";
- }
- obj.update({
- HSupFlag: flag
- });
- }
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
});
$('#HName').on('keydown', function (event) {//宸ヨ壓璺嚎鍚嶇О
@@ -557,9 +812,9 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data);
- }
+ //if (AllowLoadData(data)) {
+ set_AddNew(data);
+ //}
});
//閫夋嫨涓嶈壇鍘熷洜
@@ -673,7 +928,8 @@
//window.close();//鍏抽棴褰撳墠椤�
})
- form.on('submit(Saver)', function (data) {//淇濆瓨
+
+ form.on('submit(Saver)', function (data) { //淇濆瓨
//debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -718,6 +974,8 @@
});
+
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -742,6 +1000,7 @@
$("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
$("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
$("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(checkStatus.data[0].HModel);//瑙勬牸鍨嬪彿
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -852,14 +1111,14 @@
, btn2: function (index, layero) { }
})
}
-
+
//宸ヨ壓璺嚎澶х被閫夋嫨椤甸潰
function get_checkRoutingGroup() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '宸ヤ綔涓績琛�'//鏍囬
+ , title: '宸ヨ壓璺嚎澶х被鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_RoutingGroup.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
@@ -888,6 +1147,158 @@
vars[hash[0]] = hash[1];
}
return vars;
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(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);
+ }
+ });
+ }
+ }
+
+ //琛屽唴鍒犻櫎蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //浜х嚎涓績
+ if (obj.event == "CheckHCenterID_S") {
+ //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浜х嚎涓績鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_LineCenter.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HCenterID_SName": checkStatus.data[0].HName
+ , "HCenterID_S": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //宸ュ簭
+ if (obj.event == "CheckHProcID") {
+ //鎵撳紑浜哄憳琛� 灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_ProcList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ュ簭": checkStatus.data[0].宸ュ簭
+ , "HProcID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //宸ヤ綔涓績
+ if (obj.event == "CheckHCenterID") {
+ //鎵撳紑浜哄憳琛� 灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "浜哄憳鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ヤ綔涓績": checkStatus.data[0].宸ヤ綔涓績
+ , "HCenterID": checkStatus.data[0].HItemID
+ , "宸ヤ綔涓績浠ｇ爜": checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //渚涘簲鍟�
+ if (obj.event == "CheckHSupID") {
+ //鎵撳紑浜哄憳琛� 灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "渚涘簲鍟嗗垪琛�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "渚涘簲鍟�": checkStatus.data[0].HName
+ , "HSupID": checkStatus.data[0].HItemID
+ , "渚涘簲鍟嗕唬鐮�": checkStatus.data[0].HNumber
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
}
//缂栬緫 椤甸潰璧嬪��
@@ -919,8 +1330,8 @@
, "HUnitName": d.data[0].璁￠噺鍗曚綅
, "HUnitID": d.data[0].hunitid
, "HMainTimeUnit": d.data[0].杩愯鏃堕棿鍗曚綅
- , "HMainProcIDName": d.data[0].宸ュ簭
- , "HMainProcID": d.data[0].hprocid
+ , "HMainProcIDName": d.data[0].宸ュ簭鍚嶇О
+ , "HMainProcID": d.data[0].HMainProcID
, "HMainCenterIDName": d.data[0].宸ヤ綔
, "HMainCenterID": d.data[0].HMainCenterID
, "HGroupIDName": d.data[0].鐝粍
@@ -933,29 +1344,70 @@
, "HDelSourceRate": d.data[0].鍑忚祫婧愬噺閲�
, "HRemark": d.data[0].琛ㄥご澶囨敞
, "HStandard": d.data[0].榛樿宸ヨ壓 == 1 ? true : false
+ , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+ , "HPicNumVer": d.data[0].鍥惧彿鐗堟湰
+ , "HPicNumAssemble": d.data[0].鎬昏鍥惧彿
+ , "HMaterTexture": d.data[0].鏉愯川
+ , "HProductNum": d.data[0].鎴愬搧缂栧彿
+ , "HVerNum": d.data[0].鐗堟湰
});
//瀛愯〃 璧嬪��
var rowdata = [{
- "HProcNo": d.data[0].宸ュ簭鍙�, "HProcID": d.data[0].hprocid, "HSupID": d.data[0].HSupID, "HSupFlag": d.data[0].濮斿鏍囪 == 1 ? true : false, "HWorkQty": d.data[0].鍔犲伐鏁伴噺, "HPassRate": d.data[0].鑹巼, "HRemark": d.data[0].琛ㄤ綋澶囨敞
+ "HProcNo": d.data[0].宸ュ簭鍙�, "HProcID_S": d.data[0].宸ユ, "HProcType": d.data[0].宸ュ簭绫诲瀷, "HCenterID_S": d.data[0].HCenterID_S, "HCenterID_SName": d.data[0].浜х嚎涓績
+ , "HWorkQty_S": d.data[0].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[0].浜х嚎浜烘暟, "HMouldNo": d.data[0].妯″叿缂栧彿, "HChangeMould": d.data[0].鎹㈡ā鏃堕棿, "HPackStd": d.data[0].鍛ㄨ浆绠辨爣鍑�
+ , "HPack": d.data[0].鍛ㄨ浆绠�, "HPutArea": d.data[0].鏆傛斁鍖�, "HMyWorkDays": d.data[0].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[0].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[0].宸ュ簭
+ , "HProcID": d.data[0].hprocid, "宸ヤ綔涓績浠ｇ爜": d.data[0].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[0].HCenterID, "宸ヤ綔涓績": d.data[0].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[0].HSupID
+ , "渚涘簲鍟嗕唬鐮�": d.data[0].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[0].渚涘簲鍟�, "HSupFlag": d.data[0].濮斿鏍囪 == 0 ? false : true, "HTimeUnit": d.data[0].鏃堕棿鍗曚綅, "HUnitTime": d.data[0].杩愯鏃堕棿
+ , "HWorkQty": d.data[0].鍔犲伐鏁伴噺, "HPassRate": d.data[0].鑹巼, "HOverRate": d.data[0].瓒呴姣斾緥, "HReadyTime": d.data[0].鍑嗗鏃堕棿, "HQueueTime": d.data[0].鎺掗槦鏃堕棿
+ , "HMoveTime": d.data[0].杞Щ鏃堕棿, "HNextProcFlag": d.data[0].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[0].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[0].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[0].鍙搷浣滆澶囨暟
+ , "HFixPrice": d.data[0].鐝骇瀹氶, "HProcPrice": d.data[0].鍔犲伐鍗曚环, "HBadPrice": d.data[0].涓嶅悎鏍煎崟浠�, "HWasterPrice": d.data[0].鎶ュ簾鍗曚环, "HStdFlag": d.data[0].鏍囧噯瀹氶
+ , "HBeginDayQty": d.data[0].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[0].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[0].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[0].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[0].鏈亾鍑嗗鏃堕棿
+ , "HICMOReadyTimes": d.data[0].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[0].鑷姩绉昏浆, "HTechnologyParameter": d.data[0].宸ヨ壓鍙傛暟, "HPicNum": d.data[0].鍥剧焊缂栧彿, "HProcCheckNote": d.data[0].鏈伐搴忕‘璁よ褰�
+ , "HProcWorkNum": d.data[0].绋嬪簭鍙�
}];
option.data = rowdata;
table.render(option);
+ if (d.data[0].濮斿鏍囪) {
+ $('#HSupFlag1').attr("checked", true);
+ }
+ if (d.data[0].HNextProcFlag) {
+ $('#HNextProcFlag1').attr("checked", true);
+ }
+ if (d.data[0].娴佽浆宸ュ簭) {
+ $('#HFlowProc1').attr("checked", true);
+ }
+ if (d.data[0].鏍囧噯瀹氶) {
+ $('#HStdFlag1').attr("checked", true);
+ }
+ if (d.data[0].鑷姩绉昏浆) {
+ $('#HAutoTrunFlag1').attr("checked", true);
+ }
+ form.render('checkbox');
+ $('#HProcType1').find("option[value='" + d.data[0].宸ュ簭绫诲瀷+ "']").attr("selected", true);
+ form.render('select');
}
})
}
//淇濆瓨HMaker
function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(num);
var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
var index = layer.load();
-
$.ajax({
type: "POST",
url: GetWEBURL() + "/Gy_RoutingBill/AddBill",
@@ -994,7 +1446,11 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(data) {
-
+
+ if ($("#HMaterNumber").val() == "") {
+ layer.msg("浜у搧浠ｇ爜娌℃湁閫夋嫨");
+ return false;
+ }
if ($("#HUnitName").val() == "") {
layer.msg("璁￠噺鍗曚綅娌℃湁閫夋嫨");
return false;
@@ -1015,7 +1471,7 @@
layer.msg("璇峰嬀閫夐粯璁ゅ伐鑹�");
return false;
}
-
+
return true;
//if ($("#HBillNo").val() == '') {
// layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 8708c97..03f1fde 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -277,6 +277,10 @@
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
})
}
//#endregion
@@ -296,6 +300,10 @@
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
--
Gitblit v1.9.1