From 2c8495761613444f81576d9c09599ca32b769214 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期六, 08 一月 2022 16:46:52 +0800
Subject: [PATCH] 工艺路线 编辑 工艺路线大类 查询
---
WebTM/views/Baseset/基础资料/Gy_RoutingGroup.html | 128 +++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 641 ++++++++++++++++++++++++++++++++----------------
WebTM/views/index.html | 1
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 8
WebTM/WebTM.csproj | 1
5 files changed, 559 insertions(+), 220 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0a7573b..d9c0d6e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -87,6 +87,7 @@
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ProcessExchangeBillListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckItemListView.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingGroup.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingGroup.html"
new file mode 100644
index 0000000..fcd8874
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingGroup.html"
@@ -0,0 +1,128 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ヨ壓璺嚎澶х被鍒楄〃</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+
+ <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>
+</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>
+ <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>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var Type = params[params[0]];
+
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ form.on('submit(FH)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ switch (Type) {
+ case "Repair":
+ parent.GetRepairValue(data);
+ break;
+ case "Repair2":
+ parent.GetRepairValue2(data);
+ break;
+ case "Repair3":
+ parent.GetRepairValue3(data);
+ break;
+ case "Repair4":
+ parent.GetRepairValue4(data);
+ break;
+ case "Repair5":
+ parent.GetRepairValue5(data);
+ break;
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '宸ヨ壓璺嚎澶х被ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '宸ヨ壓璺嚎澶х被浠g爜' }
+ , { field: 'HName', width: 200, title: '宸ヨ壓璺嚎澶х被鍚嶇О', sort: true }
+ ]]
+ , page: true
+ });
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ else {
+ Value = " and HName like'%" + Where + "%' ";
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_RoutingGroup/list",
+ async: true,
+ data: { "sWhere": 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);
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1ab5aea..98885a6 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -279,6 +279,7 @@
</dl>
</dd>
<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
+ <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
<!--<dd>
<a>宸ヨ壓璺嚎</a>
<dl class="layui-nav-child">
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 0768681..a7f565c 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"
@@ -58,21 +58,21 @@
<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="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID">
- <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
</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="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 32px;">
</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="HName" id="HName">
+ <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
</div>
</div>
</div>
@@ -80,7 +80,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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>
</button>
@@ -89,24 +89,24 @@
<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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
</div>
</div>
- <div class="layui-inline">
+ <!--<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>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<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="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HUnitID" id="HUnitID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" 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>
</button>
</div>
@@ -114,8 +114,9 @@
<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="text" class="layui-input" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <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="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>
</button>
</div>
@@ -123,7 +124,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏃堕棿鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 120px;width: 182px;">
- <select name="" id="">
+ <select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
<option value="灏忔椂">灏忔椂</option>
<option value="澶�">澶�</option>
</select>
@@ -134,7 +135,8 @@
<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="text" class="layui-input" name="HMainProcID" id="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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>
</button>
@@ -143,8 +145,9 @@
<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="text" class="layui-input" name="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" 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>
</button>
</div>
@@ -152,8 +155,9 @@
<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="text" class="layui-input" name="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" 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>
</button>
</div>
@@ -163,20 +167,20 @@
<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="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
</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="HMainUnitTime" id="HMainUnitTime" value="0">
- <input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">
+ <input type="text" class="layui-input" name="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">
+ <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
</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="HMainPrice" id="HMainPrice" value="0">
+ <input type="text" class="layui-input" name="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
</div>
</div>
</div>
@@ -184,19 +188,19 @@
<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="HStdSourceQty" id="HStdSourceQty" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0"> <!--style="background-color:#efefef4d;"-->
</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="HAddSourceRate" id="HAddSourceRate" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
</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="HDelSourceRate" id="HDelSourceRate" value="0" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
</div>
</div>
</div>
@@ -204,13 +208,14 @@
<div class="layui-inline" style="width: 56%;">
<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="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ <input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
+ <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 70px;">
- <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" title="鏄惁榛樿宸ヨ壓" lay-skin="primary" lay-filter="checkboxHStandard">
- <input type="hidden" value="false" name="HStandard" id="HStandard">
+ <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
+ <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
</div>
@@ -340,6 +345,9 @@
}).extend({
index: 'lib/index' //涓诲叆鍙fā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -347,28 +355,34 @@
, form = layui.form
, element = layui.element;
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HReasonName, ReasonID, EmpName, SQProcName,
+ ProcID, ZRProcName, QRName;
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ var rowdata = [{
+ "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
+ }];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
var params = getUrlVars();
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
@@ -385,14 +399,10 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid);
- RoadBillSub(linterid);
+ RoadBillMain(linterid, linteridSub);
+ //RoadBillSub(linterid);
}
- //鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{
- "HProcNo": "", "宸ュ簭": "", "HProcID": "0", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "HSupID": "0", "渚涘簲鍟嗕唬鐮�": ""
- , "渚涘簲鍟�": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
- }];
+
var option = {
elem: '#mainTable'
@@ -424,14 +434,49 @@
option.data = rowdata;
table.render(option);
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫夋嫨浜у搧浠g爜鎸夐挳
+ form.on('submit(btnSearchMater)', function () {
+ get_checkSearchMater();
+ });
+
+ //閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchProc)', function () {
+ get_checkSearchProc();
+ });
+
+ //閫夋嫨璁¢噺鍗曚綅鎸夐挳
+ form.on('submit(btnUnit)', function () {
+ get_checkUnit();
+ });
+
+ //閫夋嫨鐢熶骇鐝粍鎸夐挳
+ form.on('submit(btnGroup)', function () {
+ get_checkGroup();
+ });
+
+ //閫夋嫨宸ヤ綔涓績鎸夐挳
+ form.on('submit(btnWorkCenter)', function () {
+ get_checkWorkCenter();
+ });
+
+ //閫夋嫨宸ヨ壓璺嚎澶х被鎸夐挳
+ form.on('submit(btnRoutingGroup)', function () {
+ get_checkRoutingGroup();
+ });
+
+
//鏄惁榛樿宸ヨ壓
form.on('checkbox(checkboxHStandard)', function (data) {
$("#HStandard").val(data.elem.checked);
});
//鏄惁鍚敤
- form.on('checkbox(checkboxHUseFlag)', function (data) {
- $("#HUseFlag").val(data.elem.checked);
- });
+ //form.on('checkbox(checkboxHUseFlag)', function (data) {
+ // $("#HUseFlag").val(data.elem.checked);
+ //});
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -439,8 +484,9 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcNo": "", "宸ュ簭": "", "HProcID": "0", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "HSupID": "0", "渚涘簲鍟嗕唬鐮�": ""
- , "渚涘簲鍟�": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
+ //"HProcNo": "", "宸ュ簭": "", "HProcID": "0", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "HSupID": "0", "渚涘簲鍟嗕唬鐮�": ""
+ //, "渚涘簲鍟�": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
+ "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -509,66 +555,14 @@
}
});
-
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- //var tableData = data.field;
- data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Gy_RoutingBill/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("鎻愪氦鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+
+
+ if (AllowLoadData(data)) {
+ add(data);
+ }
});
-
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
- {
- $.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
- type: "GET",
- data: { "HInterID": linterid },
- success: function (d) {
- // console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
- }
- })
- }
-
-
-
//閫夋嫨涓嶈壇鍘熷洜
form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
@@ -712,14 +706,11 @@
}
});
});
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
+
// if (value != '') {
if (!/^\d+$/.test(value)) {
return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
@@ -729,109 +720,325 @@
});
- });
- //瀹氫箟鍏ㄥ眬鍙橀噺
- var HReasonName, ReasonID, EmpName, SQProcName,
- ProcID, ZRProcName, QRName
- ;
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
- function GetHPlanValue(obj) { //杩斿洖宸ュ簭璁″垝鍗�
- $("#HMainSourceInterID").val(obj[0].hmainid);
- $("#HMainSourceEntryID").val(obj[0].hsubid);
- $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HMaterID").val(obj[0].HMaterID);
- $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);
- $("#HMater").val(obj[0].鐗╂枡鍚嶇О);
- $("#HCenterID").val(obj[0].HCenterID);
- $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績);
- $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
- $("#HPlanQty").val(obj[0].璁″垝鏁伴噺);
+ //#endregion
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
- }
- 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 AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ //浜у搧閫夋嫨椤甸潰
+ function get_checkSearchMater() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../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"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+ $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMainProcID").val(checkStatus.data[0].HItemID);//宸ュ簭id
+ $("#HMainProcIDName").val(checkStatus.data[0].宸ュ簭);//宸ュ簭id
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //璁¢噺鍗曚綅閫夋嫨椤甸潰
+ function get_checkUnit() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁¢噺鍗曚綅琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HUnitID").val(checkStatus.data[0].HItemID);//璁¢噺鍗曚綅id
+ $("#HUnitName").val(checkStatus.data[0].HName);//璁¢噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //鐢熶骇鐝粍閫夋嫨椤甸潰
+ function get_checkGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐝粍琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+ $("#HGroupIDName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁¢噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ヤ綔涓績閫夋嫨椤甸潰
+ function get_checkWorkCenter() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ヤ綔涓績琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMainCenterID").val(checkStatus.data[0].HItemID);//宸ヤ綔涓績id
+ $("#HMainCenterIDName").val(checkStatus.data[0].宸ヤ綔涓績);//璁¢噺鍗曚綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //宸ヨ壓璺嚎澶х被閫夋嫨椤甸潰
+ function get_checkRoutingGroup() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ヤ綔涓績琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_RoutingGroup.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HRoutingGroupID").val(checkStatus.data[0].HItemID);//宸ヨ壓璺嚎澶х被id
+ $("#HRoutingGroupIDName").val(checkStatus.data[0].HName);//宸ヨ壓璺嚎澶х被鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
}
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return vars;
+ }
+
+ //缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ {
+ var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (d) {
+
+ //alert(JSON.stringify(d.data[0]))
+ //return false;
+
+ var IsHStopflag = d.data[0].榛樿宸ヨ壓;
+ if (IsHStopflag == 1) {
+ $("input[name='checkboxHStandard']").prop("checked", true);
+ }
+ //涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": d.data[0].鍗曟嵁鍙�
+ , "HInterID": d.data[0].hmainid
+ , "HDate": Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HName": d.data[0].宸ヨ壓鍚嶇О
+ , "HMaterNumber": d.data[0].鐗╂枡浠g爜
+ , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+ , "HMaterID": d.data[0].hmaterid
+ , "HUnitName": d.data[0].璁¢噺鍗曚綅
+ , "HUnitID": d.data[0].hunitid
+ , "HMainTimeUnit": d.data[0].杩愯鏃堕棿鍗曚綅
+ , "HMainProcIDName": d.data[0].宸ュ簭
+ , "HMainProcID": d.data[0].hprocid
+ , "HMainCenterIDName": d.data[0].宸ヤ綔
+ , "HMainCenterID": d.data[0].HMainCenterID
+ , "HGroupIDName": d.data[0].鐝粍
+ , "HGroupID": d.data[0].HMainGroupID
+ , "HMainWorkQty": d.data[0].鍔犲伐鏁伴噺
+ , "HMainUnitTime": d.data[0].涓昏繍琛屾椂闂�
+ , "HMainPrice": d.data[0].宸ヤ环
+ , "HStdSourceQty": d.data[0].鏍囧噯璧勬簮鏁�
+ , "HAddSourceRate": d.data[0].鍔犺祫婧愬閲�
+ , "HDelSourceRate": d.data[0].鍑忚祫婧愬噺閲�
+ , "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HStandard": d.data[0].榛樿宸ヨ壓 == 1 ? true : false
+ });
+
+ //瀛愯〃 璧嬪��
+ 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].琛ㄤ綋澶囨敞
+ }];
+ option.data = rowdata;
+ table.render(option);
+
+ }
+ })
+ }
+ //淇濆瓨HMaker
+ function add(data) {
+
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
+
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_RoutingBill/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("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+
+ if ($("#HUnitName").val() == "") {
+ layer.msg("璁¢噺鍗曚綅娌℃湁閫夋嫨");
return false;
}
- }
- else {
+ if ($("#HMainProcIDName").val() == "") {
+ layer.msg("宸ュ簭娌℃湁閫夋嫨");
+ return false;
+ }
+ if ($("#HMainCenterIDName").val() == "") {
+ layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
+ return false;
+ }
+ if ($("#HGroupIDName").val() == "") {
+ layer.msg("鐢熶骇鐝粍娌℃湁閫夋嫨");
+ return false;
+ }
+ if ($("#HStandard").val() == "false") {
+ layer.msg("璇峰嬀閫夐粯璁ゅ伐鑹�");
+ return false;
+ }
+
return true;
+ //if ($("#HBillNo").val() == '') {
+ // layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HInterID").val() == '') {
+ // layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (typeof (sSubStr) == "undefined") {
+ // layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+
}
- }
+
+ //#endregion
+
+ });
+
+
</script>
</body>
</html>
\ No newline at end of file
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 c11d630..8708c97 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"
@@ -160,7 +160,7 @@
, cellMinWidth: 90
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- //{ field: 'hmainid', title: 'hmainid', width: 110 }
+ /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
, { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
@@ -276,7 +276,7 @@
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
})
}
//#endregion
@@ -287,13 +287,15 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].HItemID;
+ var linteridSub = data[0].hsubid;
+
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
, title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
--
Gitblit v1.9.1