From d6582f83bcf225ca770f94d58c01df07bde7cff8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 24 七月 2023 08:57:03 +0800
Subject: [PATCH] 1
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 14
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 10
WebTM/views/home/console.html | 3
WebTM/views/Baseset/基础资料/Gy_InspectValueList.html | 119 +++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 980 +++++++++++++++++++++++++++++++++++++++++-
WebTM/views/Baseset/基础资料/Gy_SampleSchemeListView.html | 119 +++++
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 74 ++-
WebTM/WebTM.csproj | 2
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_AR.html | 4
9 files changed, 1,265 insertions(+), 60 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1b5cb46..97ed701 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -118,6 +118,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectValueList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
@@ -128,6 +129,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_SampleSchemeListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SellStyle.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SettleStyle.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValueList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValueList.html"
new file mode 100644
index 0000000..a011f51
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValueList.html"
@@ -0,0 +1,119 @@
+锘�<!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="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;
+
+ var titleData = ["hmainid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ form.on('submit(HQuery)', function () {//閫夋嫨
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ RoadQuery($('#Value').val());
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var ajaxLoad = layer.load();
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetGy_InspectValue',
+ type: "GET",
+ data: { "InspectValue": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SampleSchemeListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SampleSchemeListView.html"
new file mode 100644
index 0000000..fa10034
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SampleSchemeListView.html"
@@ -0,0 +1,119 @@
+锘�<!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="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;
+
+ var titleData = ["hmainid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ form.on('submit(HQuery)', function () {//閫夋嫨
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ RoadQuery($('#Value').val());
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var ajaxLoad = layer.load();
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetGy_SampleScheme',
+ type: "GET",
+ data: { "SampleScheme": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 2d578cc..2e66af0 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -362,7 +362,8 @@
function get_Display() {
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
$.ajax({
- url: "http://localhost:8082/API//Web/Xt_UserFastMenu_Init",
+ //url: "http://localhost:8082/API//Web/Xt_UserFastMenu_Init",
+ url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init",
type: "GET",
async: false,
data: { "HMakeName": sessionStorage["HUserName"] },
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 f3f2919..112c192 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"
@@ -128,7 +128,7 @@
<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="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly value="1">
</div>
</div>
<div class="layui-inline">
@@ -271,7 +271,313 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">妫�楠岄」鐩�</li>
+ <li>鎶芥牱妫�楠�</li>
+ <li>妫�娴嬪��</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--妫�楠岄」鐩�-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鎶芥牱妫�楠�-->
+ <div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>
+ <div class="layui-row">
+ <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="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <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="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:30px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱鏂规</span>
+ </label>
+ </div>
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:70px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱妫�楠�</span>
+ </label>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <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="HSampleSchemeName" id="HSampleSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckSampleScheme" id="btnSearchCheckSampleScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" 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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+ </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="HSampleDamageQty" id="HSampleDamageQty" style="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <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="HSamplingType" id="HSamplingType" style="background-color:#efefef4d;" readonly>
+ </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="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <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="HInspectionLevel" id="HInspectionLevel" style="background-color:#efefef4d;" readonly>
+ </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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
+ </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="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <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="HStrictness" id="HStrictness" style="background-color:#efefef4d;" readonly>
+ </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="HSampleUnRightQty" id="HSampleUnRightQty" style="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">AQL</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HAQL" id="HAQL" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <!--<table class="layui-hide" id="samplingTable" lay-filter="samplingTable"></table>-->
+ </div>
+ <div class="layui-tab-item" style="height:590px">
+ <!--妫�娴嬪��-->
+ <div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>
+ <div class="left" style="width:50%;height:450px;float:left;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">椤圭洰搴忓彿</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HInspectResult" lay-filter="HInspectResult">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鏍锋湰涓嶅悎鏍兼暟</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleUnRightQty" id="HSampleUnRightQty" value="0" style="">
+ </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="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎸囨爣</span>
+ </label>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HStatus" lay-filter="HStatus">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">姣旇緝绗�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HComparator" lay-filter="HComparator">
+ <option value="绛変簬" selected="selected">=</option>
+ <option value="澶т簬">></option>
+ <option value="灏忎簬"><</option>
+ <option value="澶т簬绛変簬">>=</option>
+ <option value="灏忎簬绛変簬"><=</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">*妫�楠屽��</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HInspectValBName" id="HInspectValBName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchInspectValB" id="btnSearchInspectValB" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HInspectValB" id="HInspectValB" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">*鐩爣鍊�</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HTargetValBName" id="HTargetValBName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTargetValB" id="btnSearchTargetValB" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HTargetValB" id="HTargetValB" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓婇檺鍊�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓嬮檺鍊�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓婂亸宸�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓嬪亸宸�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="right" style="width:50%;height:450px;float:left;">
+ <table class="layui-hide" id="ValueTable" lay-filter="ValueTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -296,9 +602,31 @@
<script type="text/html" id="HResult">
<select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岀粨鏋�)-->
+ <script type="text/html" id="HInSpectResult">
+ <select name="HInSpectResult" lay-filter="HInSpectResult" id="HInSpectResult{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
<option value="鍚堟牸">鍚堟牸</option>
<option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect_Sub">
+ <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+ <input type="checkbox" name="HKeyInspect" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
</script>
<script>
@@ -317,6 +645,12 @@
//鍏敤鍙橀噺
var rowdata = [];
var option = [];
+ var rowdata_Value = [];
+ var option_Value = [];
+
+ var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
+ var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
+ var checkobj = ""; //澶嶉�夋
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -344,7 +678,7 @@
if (OperationType == 1) {
$("#HInterID").val("");
$("#HBillNo").val("");
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -412,7 +746,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -517,7 +851,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
};
switch (obj.event) {
@@ -527,6 +861,7 @@
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
}
form.render('select');
break;
@@ -546,6 +881,7 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
}
form.render('select');
}
@@ -560,21 +896,84 @@
//鏂板鎸夐挳
form.on('submit(btn-AddNew)', function (data) {
- window.location.reload();
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('QC_Add_Edit_FirstPieceCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=2');
+ });
});
+ //棣栬鎸夐挳
+ form.on('submit(btn_FirstRow)', function (data) {
+ if ($("#HEntryID").val() == 1) {
+ layer.msg("褰撳墠宸叉槸棣栬");
+ }
+
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", 1);
+ $("[name='HQCCheckItemID']").attr("value", option_Check[0].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[0].妫�楠岄」鐩�);
+ } else {
+ layer.msg("褰撳墠宸叉槸棣栬");
+ }
+ });
+
+ //鏈鎸夐挳
+ form.on('submit(btn_LastRow)', function (data) {
+ if ($("#HEntryID").val() == option_Check.length) {
+ layer.msg("褰撳墠宸叉槸鏈");
+ return;
+ }
+
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", option_Check.length);
+ $("[name='HQCCheckItemID']").attr("value", option_Check[option_Check.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[option_Check.length - 1].妫�楠岄」鐩�);
+ } else {
+ layer.msg("褰撳墠宸叉槸鏈");
+ return;
+ }
+ });
+
+ //涓婁竴琛屾寜閽�
+ form.on('submit(btn_PreviousRow)', function (data) {
+ if ($("#HEntryID").val() == 1 || $("#HEntryID").val() == 0) {
+ layer.msg("褰撳墠宸叉槸棣栬");
+ return;
+ }
+
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", $("#HEntryID").val() - 1);
+ $("[name='HQCCheckItemID']").attr("value", option_Check[$("#HEntryID").val() - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[$("#HEntryID").val() - 1].妫�楠岄」鐩�);
+ }
+ });
+
+ //涓嬩竴琛屾寜閽�
+ form.on('submit(btn_NextRow)', function (data) {
+ if ($("#HEntryID").val() == option_Check.length) {
+ layer.msg("褰撳墠宸叉槸鏈");
+ return;
+ }
+
+ if (option_Check.length > 0) {
+ $("[name='HEntryID']").attr("value", Number($("#HEntryID").val()) + 1);
+ $("[name='HQCCheckItemID']").attr("value", option_Check[$("#HEntryID").val() - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", option_Check[$("#HEntryID").val() - 1].妫�楠岄」鐩�);
+ }
+ });
//閫�鍑�
function get_Exit() {
- if (OperationType == 1) {
- parent.layui.admin.events.closeThisTabs();
- } else if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- } else if (OperationType == 3) {
- var index = parent.layer.getFrameIndex(window.name);
- parent.layer.close(index);
- }
+ Pub_Close(1);
+
+ //if (OperationType == 1) {
+ // parent.layui.admin.events.closeThisTabs();
+ //} else if (OperationType == 2) {
+ // var index = parent.layer.getFrameIndex(window.name);
+ // parent.layer.close(index);
+ //} else if (OperationType == 3) {
+ // var index = parent.layer.getFrameIndex(window.name);
+ // parent.layer.close(index);
+ //}
}
//琛屽唴浜嬩欢
@@ -669,6 +1068,9 @@
//淇濆瓨
function set_SaveBill(data) {
+ console.log($("#HKeyInspect").val());
+ console.log($("#HKeyInspect2").val());
+ return;
if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -691,7 +1093,9 @@
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] ;
+ var sSubValue = JSON.stringify(table.cache['ValueTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
+
var index = layer.load();
$.ajax({
type: "POST",
@@ -727,17 +1131,91 @@
//缂栬緫鏃跺姞杞借〃澶�
function RoadBillMain(linterid) {
+ var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
+ url: GetWEBURL() + "/GetQC_FirstPieceCheckDetail",
type: "GET",
- data: { "HInterID": linterid },
- success: function (d) {
- // console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
+ data: { "HID": linterid },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HICMOBillNo": data.HICMOBillNo
+ , "HICMOQty": data.HICMOQty
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HMaterID": data.浜у搧ID
+ , "HProcExchQty": data.HProcExchQty
+ , "HProcExchBillNo": data.HProcExchBillNo
+ , "HProcExchInterID": data.HProcExchInterID
+ , "HProcExchEntryID": data.HProcExchEntryID
+ , "HFirstCheckEmp": data.妫�楠屽憳ID
+ , "HFirstCheckEmpName": data.妫�楠屽憳鍚嶇О
+
+ //, "HQCCheckProjectID": data.HManagerID
+ //, "HPSStyleID": data.HPSStyleID
+
+ , "HRemark": data.琛ㄥご澶囨敞
+ //, "HSSID": data.HSSID
+
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+ data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HQCStd": data[i].HQCStd, "HUnit": data[i].HUnit, "HQCNote": data[i].HQCNote, "HResult": data[i].HResult,
+ "HMax": data[i].HMax, "HMin": data[i].HMin, "HAvg": data[i].HAvg, "HRemark": data[i].HRemark
+ }
+ )
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ for (let j = 0; j < data.length; j++) {
+ $("#HResult" + (j + 1)).val(data[j].HResult)
+ }
+ form.render('select');
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
})
}
+
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchCheckProject)', function () {
@@ -778,6 +1256,218 @@
});
});
+ //琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
+ form.on('submit(btnSearchCheckItemID)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠岄」鐩垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
+ $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+ form.on('submit(btnSearchUnit)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/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);
+ $("#HUnit").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+ form.on('submit(btnSearchInspectValB)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectValB").val(checkStatus.data[0].hmainid);
+ $("#HInspectValBName").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+ form.on('submit(btnSearchTargetValB)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐩爣鍊煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTargetValB").val(checkStatus.data[0].hmainid);
+ $("#HTargetValBName").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
+ form.on('submit(btnSearchCheckSampleScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(checkStatus.data[0].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(checkStatus.data[0].妫�楠屾按骞�);
+ $("#HStrictness").val(checkStatus.data[0].涓ユ牸搴�);
+ $("#HAQL").val(checkStatus.data[0].AQL);
+ $("#HSampleQty").val(checkStatus.data[0].鏍锋湰閲�);
+ $("#HAcceptQty").val(checkStatus.data[0].鍏佽鏁�);
+
+ $("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
+ $("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
+ $("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
+
+ rowdata_Value = [];
+ for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+ console.log($("#HEntryID").val());
+ console.log(checkStatus.data);
+ console.log(option.data);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
function get_CheckItem() {
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
@@ -786,6 +1476,22 @@
success: function (result) {
option.data = result.data;
table.render(option);
+
+ for (var i = 1; i <= result.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ option_Check = result.data;
+
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").click();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
}
})
}
@@ -996,8 +1702,8 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false
}];
option = {
elem: '#mainTable'
@@ -1007,12 +1713,15 @@
, cellMinWidth: 150
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HResult', title: '缁撹', templet: '#HResult' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect_Sub', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
- , { field: 'HResult', title: '缁撹', templet: '#HResult' }
, { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
@@ -1030,6 +1739,7 @@
$.each(option.data, function (index, value) {
if (value.LAY_TNDEX == dataIndex) {
$cr.find('input').val(value.HResult);
+ $cr.find('input').val(value.HAnalysisMethod);
}
});
});
@@ -1041,6 +1751,48 @@
//鍔犺浇绌鸿〃鏍�
option.data = rowdata;
table.render(option);
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ rowdata_Value = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ option_Value = {
+ elem: '#ValueTable'
+ //, toolbar: '#toolbarDemo_Value'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: 'HSEQ', title: '搴忓彿' }
+ , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
+ , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text' }
+ , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
+ , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , done: function (res, curr, count) {
+ option_Value.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_Value.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HInSpectResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
}
//琛岄�夋嫨澶勭悊锛堢粨璁猴級
@@ -1054,6 +1806,184 @@
}
});
});
+
+ //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+ form.on('select(HInSpectResult)', 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.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HAnalysisMethod)', 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.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ if (data.value == 1) { //濡傛灉閫変腑瀹氭�у垎鏋愶紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
+ option_Value.cols[0][3].hide = false; //瀹氭��
+ option_Value.cols[0][4].hide = true; //瀹氶噺
+ option_Value.cols[0][5].hide = true; //鍏朵粬
+ } else if (data.value == 2) { //濡傛灉閫変腑瀹氶噺鍒嗘瀽锛屽垯闅愯棌瀹氭�с�佸叾浠栧垎鏋�
+ option_Value.cols[0][4].hide = false; //瀹氶噺
+ option_Value.cols[0][3].hide = true; //瀹氭��
+ option_Value.cols[0][5].hide = true; //鍏朵粬
+ } else if (data.value == 3) { //濡傛灉閫変腑鍏朵粬鍒嗘瀽锛屽垯闅愯棌瀹氶噺銆佸畾鎬у垎鏋�
+ option_Value.cols[0][5].hide = false; //鍏朵粬
+ option_Value.cols[0][3].hide = true; //瀹氭��
+ option_Value.cols[0][4].hide = true; //瀹氶噺
+ }
+ table.render(option_Value);
+ });
+
+
+ //鐩戝惉涓嬫媺妗嗙紪杈�
+ form.on('select(HResult)', function (data) {
+ //鑾峰彇褰撳墠琛宼r瀵硅薄
+ var elem = data.othis.parents('tr');
+ //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+ var Guid = elem.first().find('td').eq(1).text();
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+ //$("#HInSpectResult" + Guid).val(selectValue);
+ $("[name='HResult']").val(selectValue);
+ $("[name='HInspectResult']").val(selectValue);
+ form.render('select');
+ })
+
+ //鐩戝惉涓嬫媺妗嗙紪杈�
+ form.on('select(HInspectResult)', function (data) {
+ //鑾峰彇褰撳墠琛宼r瀵硅薄
+ var elem = data.othis.parents('tr');
+ //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+ var Guid = elem.first().find('td').eq(1).text();
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+ //$("#HInSpectResult" + Guid).val(selectValue);
+ $("[name='HResult']").val(selectValue);
+ form.render('select');
+ })
+
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //$("#HKeyInspect").val(data.elem.checked);
+ $("[name='HKeyInspect']").attr("value", data.elem.checked);
+
+ if ($("#HKeyInspect").val() == 'true') {
+ //$("[name='HKeyInspect']").attr("checked", true);
+ $("[name='HKeyInspect']").prop("checked", true);
+ } else {
+ //$("[name='HKeyInspect']").attr("checked", false);
+ $("[name='HKeyInspect']").prop("checked", false);
+ }
+ form.render('checkbox');//鍒锋柊鍊�
+ });
+
+ //鐐瑰嚮妫�楠岄」鐩浜嬩欢
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ check_row(obj);
+ //鑾峰彇褰撳墠閫変腑琛屽彿
+ var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
+ //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
+ createArr(rowIndex);
+
+ //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+ var table_value = table.cache['ValueTable'];
+
+ Array.some(item => {
+ console.log("==============item===============");
+ console.log(item);
+ })
+
+ for (let i = 0; i < table_value.length; i++) {
+
+ }
+
+ //console.log(arr_value_add);
+ console.log(Array);
+ console.log(table_value);
+ });
+
+ //鏀瑰彉閫変腑琛岄鑹�
+ function check_row(obj) {
+ if (checkobj != "") {
+ checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //$('#HKeyInspect2').attr("checked", false);
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ var a = $('#HKeyInspect' + (i + 1)).prop("checked");
+ num.push(a);
+ }
+
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ checkobj = obj;
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ for (var i = 0; i < option.data.length; i++) {
+
+ if (num[i]) {
+ $('#HKeyInspect' + (i + 1)).prop("checked", true);
+ } else {
+ $('#HKeyInspect' + (i + 1)).prop("checked", false);
+ }
+ }
+ form.render('checkbox');
+ }
+
+ function createArr(rowIndex) {
+ var arr_value = table.cache['ValueTable']; //鑾峰彇妫�娴嬪�煎崟鍏冩牸鏁版嵁
+
+ arr_value_add = []; //鏂板琛屽彿瀛楁
+ arr_value.map((item, index) => {
+ arr_value_add.push(Object.assign({}, item, { rowNum: rowIndex }))
+ })
+
+ if (Array.length > 0) {//濡傛灉鏁扮粍涓嶄负绌哄垯閬嶅巻鏁扮粍
+ var whetherAdd = false; //鏄惁宸茬粡娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍
+ //閬嶅巻鏁扮粍
+ Array.some(item => {
+ if (item[0].rowNum == rowIndex) {
+ whetherAdd = true;
+ return true;//璺冲嚭閬嶅巻
+ } else {
+ whetherAdd = false;
+ }
+ })
+ //娌℃湁娣诲姞杩囧綋鍓嶈鍙风殑鏁扮粍鍒欐坊鍔犺繘鍘�
+ if (whetherAdd == false) {
+ Array.push(arr_value_add);
+ }
+ } else {
+ Array.push(arr_value_add);//鏁扮粍涓虹┖鍒欎笉鍋氬垽鏂紝鐩存帴鎶婃暟鎹坊鍔犺繘鏁扮粍
+ }
+ }
+
//浠ヤ笂涓簂ayui妯″潡
});
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_FirstPieceCheckBillList.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_FirstPieceCheckBillList.html"
index 0da7f56..7d5241e 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_FirstPieceCheckBillList.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_FirstPieceCheckBillList.html"
@@ -64,6 +64,7 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -211,6 +212,9 @@
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
break;
+ case 'btn-Add':
+ set_AddNew();
+ break;
case 'btn-Edit':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -242,29 +246,33 @@
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
- type: "GET",
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
- success: function (result) {
- console.log('gouba' + result);
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
+ type: "GET",
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
@@ -276,8 +284,6 @@
break;
};
});
-
-
///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillNo(sqlWhere) {
@@ -389,6 +395,28 @@
_cur_page = 1;
RoadHBillNo(sqlWhere);
});
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板棣栦欢妫�楠屽崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './QC_Add_Edit_FirstPieceCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ //get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
var $ = layui.$, active = {
f_Query: function () { //鏌ヨ
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
index 7b95482..a729470 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
@@ -122,6 +122,7 @@
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">閮ㄩ棬:</label>
<div class="layui-input-block">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" disabled="disabled">
+ <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" value="0" style="width:100px">
</div>
</div>
</div>
@@ -167,7 +168,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
//鑾峰彇鍙傛暟
function getUrlVars() {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index d328cbc..511d9ef 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -959,21 +959,21 @@
}, function () { window.location.reload(); });//鏂板
}
else {
- layer.msg(data.Message, { icon: 5 });
+ layer.confirm(data.Message, { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
layer.closeAll("loading");
},
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ layer.confirm("閿欒:" + err, { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
});
}
else {
- layer.msg("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
+ layer.confirm("鏁版嵁涓嶅畬鏁达紝涓嶅厑璁告彁浜�:", { icon: 5 });
//鐏板害鎻愪氦鎸夐挳Saver
document.getElementById("Saver").disabled = false;
}
@@ -1131,11 +1131,13 @@
//, toolbar: '#toolbarDemo'
, defaultToolbar: []
, page: true
- , limit: 100
+ , limit: 3000
+ , totalRow: true
, where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQty', title: '閲嶉噺', width: 150, totalRow: true }
+ , { field: 'HAuxQty', title: '绠辨暟', width: 150, totalRow: true }
, { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -1152,7 +1154,7 @@
, done: function () {
layer.closeAll("loading");
}
- })
+ })
//娓呯┖鏁伴噺
$("#HQty").val("");
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 309cbad..0f75249 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -1249,6 +1249,7 @@
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
var HSourceBillType = $("#HBillType").val()
+ var sBillType = '1201'
if (HSourceBillNo == "" || sInterID <= 0) {
layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1256,13 +1257,14 @@
//
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
- url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_POStockIn_Json",
type: "GET",
- data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ //data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HSupID").val(result.data[0].HSupID);
- $("#HSupName").val(result.data[0].HSupName);
+ $("#HSupID").val(result.data.hSPIDField);
+ $("#HSupName").val(result.data.hSupNameField);
sessionStorage["SourceFlag"] = true;
layer.load(3);
element.tabChange('tab-POStockInBill', '2');
--
Gitblit v1.9.1