From 6c29ea7fdc629157ec97711bea34a8e9d59d18a4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 06 五月 2024 17:14:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 42
WebTM/views/车间管理/工序流转卡/MES_ColorRecordBillList.html | 2
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 67 +
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 30
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 56 +
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html | 484 +++++++++++++-
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 52 +
WebTM/views/质量管理/基础建模/Gy_ErrType.html | 8
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 2
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 2
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 41 +
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 2
WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrMsgBackType.html | 77 +
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 733 ++++++++++++++++++++--
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 168 ++++
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 26
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Xs_SeOrderBill.aspx | 2
WebTM/views/质量管理/基础建模/Add_Edit_Gy_ErrType.html | 35
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 74 +
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 2
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBill.html | 41 +
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 3
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 2
26 files changed, 1,672 insertions(+), 285 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 8e64bfb..f4df6b3 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1583,6 +1583,9 @@
<File Include="views/PlateBinding.html">
<publishTime>04/28/2024 08:36:23</publishTime>
</File>
+ <File Include="views/PlateBinding.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
</File>
@@ -1973,6 +1976,12 @@
<File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_PDA.html">
<publishTime>04/28/2024 08:36:23</publishTime>
</File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBillList_PDA.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_PDA.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html">
<publishTime>04/28/2024 08:42:16</publishTime>
</File>
@@ -2164,6 +2173,9 @@
</File>
<File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
<publishTime>04/28/2024 08:36:23</publishTime>
+ </File>
+ <File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
</File>
<File Include="views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html">
<publishTime>04/15/2024 13:00:47</publishTime>
@@ -5339,6 +5351,12 @@
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
<publishTime>04/28/2024 08:36:24</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CodingReport.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
@@ -5951,6 +5969,18 @@
<File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html">
<publishTime>04/28/2024 08:36:24</publishTime>
</File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_ProjectClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Gy_ProjectClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html">
+ <publishTime>04/26/2024 12:59:07</publishTime>
+ </File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html">
<publishTime>04/15/2024 13:00:49</publishTime>
</File>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
index eecbc50..ba5aff3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
@@ -23,13 +23,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -37,7 +33,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
@@ -46,23 +42,49 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
+ <label class="layui-form-label" style="">椤圭洰绫诲埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HQCCheckClassList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妫�楠岄」鐩被鍒�</label>
+ <label class="layui-form-label">鍒嗘瀽鏂规硶<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod">
+ <option value="1" selected="selected">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
- <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HQCCheckClassList" style="width:40px;">
+ <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnUnit" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶芥牱鏂规</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSampleSchemeName" id="HSampleSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnSampleScheme" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -74,16 +96,96 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <label class="layui-form-label">缂洪櫡绛夌骇</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HDefectLevel" lay-filter="HDefectLevel" id="HDefectLevel">
+ <option value="1">鑷村懡缂洪櫡</option>
+ <option value="2">閲嶇己闄�</option>
+ <option value="3" selected="selected">杞荤己闄�</option>
+ </select>
</div>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" >
+ <div class="layui-inline">
+ <label class="layui-form-label">璐ㄩ噺鏍囧噯</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HQualityStdName" id="HQualityStdName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HQualityStdID" id="HQualityStdID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnQualityStd" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屾柟娉�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectMethodName" id="HInspectMethodName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectMethodID" id="HInspectMethodID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectMethod" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屼华鍣�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectInstruMentName" id="HInspectInstruMentName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectInstruMentID" id="HInspectInstruMentID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectInstruMent" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">妫�楠屼緷鎹�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInspectBasisName" id="HInspectBasisName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HInspectBasisID" id="HInspectBasisID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn layuiadmin-btn-order" lay-filter="HbtnInspectBasis" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁绯荤粺棰勮</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HISsystemSet" id="HISsystemSet" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲嶇偣妫�鏌�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐮村潖鎬ф楠�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HDestructInspect" id="HDestructInspect" lay-skin="primary" title="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</div>
</div>
</div>
@@ -100,8 +202,9 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
-//鑾峰彇鍙傛暟
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -117,7 +220,7 @@
var hID = params[params[0]];//缂栬緫鏌ョ湅
var HType = params[params[1]]; //鍗曟嵁鐘舵�併�佸眰绾�
var TagParentId = params[params[2]]; //鐖剁骇ID
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -143,9 +246,10 @@
- form.on('submit(Cancel)', function () {
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
//sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
+ //parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
@@ -153,11 +257,20 @@
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ if (!AllowLoadData()) {
+ return;
+ }
+
var ModRightNameAdd = 'Gy_QCCheckItem_Edit';
var user = sessionStorage["HUserName"];
var arr = new Array();
var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ data.field.HStopflag = isEndCheck;//
+
+ data.field.HISsystemSet = document.getElementById("HISsystemSet").checked;
+ data.field.HKeyInspect = document.getElementById("HKeyInspect").checked;
+ data.field.HDestructInspect = document.getElementById("HDestructInspect").checked;
hID = hID == "" ? 0 : hID;
data.field.HItemID = hID == "" ? 0 : hID;
@@ -237,28 +350,69 @@
if (HType == "Modify") {
$.ajax({
- url: GetWEBURL() + "/Gy_CheckItem/xg",
+ url: GetWEBURL() + "/Gy_CheckItem/xg_View",
//url: "http://localhost:12761/Gy_Department/xg",
type: "GET",
data: {
"HInterID": hID
},
success: function (d) {
- console.log(d);
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
+ $("#HNumber").val(d.data[0].妫�楠岄」鐩唬鐮�);
+ $("#HName").val(d.data[0].妫�楠岄」鐩悕绉�);
+ $("#HHelpCode").val(d.data[0].鍔╄鐮�);
$("#HQCCheckClassID").val(d.data[0].HQCCheckClassID);
- $("#HQCCheckClassName").val(d.data[0].HQCCheckClassName);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HDefaultResult").val(d.data[0].HDefaultResult);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ $("#HQCCheckClassName").val(d.data[0].妫�楠岄」鐩被鍒悕绉�);
+ $("#HRemark").val(d.data[0].澶囨敞);
+ $("#HDefaultResult").val(d.data[0].榛樿缁撹);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
+
+ $("#HUnitName").val(d.data[0].鍗曚綅鍚嶇О);
+ $("#HUnitID").val(d.data[0].HUnitID);
+ $("#HSampleSchemeName").val(d.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(d.data[0].HSampleSchemeID);
+ $("#HQualityStdName").val(d.data[0].璐ㄩ噺鏍囧噯鍚嶇О);
+ $("#HQualityStdID").val(d.data[0].HQualityStdID);
+ $("#HInspectMethodName").val(d.data[0].妫�楠屾柟娉曞悕绉�);
+ $("#HInspectMethodID").val(d.data[0].HInspectMethodID);
+ $("#HInspectInstruMentName").val(d.data[0].妫�楠屼华鍣ㄥ悕绉�);
+ $("#HInspectInstruMentID").val(d.data[0].HInspectInstruMentID);
+ $("#HInspectBasisName").val(d.data[0].妫�楠屼緷鎹悕绉�);
+ $("#HInspectBasisID").val(d.data[0].HInspectBasisID);
+
+ switch (d.data[0].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ d.data[0].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ d.data[0].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ d.data[0].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+
+ switch (d.data[0].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ d.data[0].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ d.data[0].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ d.data[0].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ $("#HAnalysisMethod").val(d.data[0].鍒嗘瀽鏂规硶);
+ $("#HDefectLevel").val(d.data[0].缂洪櫡绛夌骇);
+
+ $("input[name='HISsystemSet']").prop("checked", d.data[0].鏄惁绯荤粺棰勮 == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HKeyInspect']").prop("checked", d.data[0].閲嶇偣妫�鏌� == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HDestructInspect']").prop("checked", d.data[0].鐮村潖鎬ф楠� == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囪 == "1" ? true : false);//true:閫変腑 false:涓嶉�変腑
+
+ form.render("select");
+ form.render("checkbox");
}
});
@@ -286,7 +440,7 @@
title: '妫�楠岄」鐩被鍒垪琛�',
closeBtn: 1,
shift: 2,
- area: ['100%', '100%'],
+ area: ['80%', '80%'],
maxmin: true,
content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
@@ -314,6 +468,262 @@
}
});
});
+
+ //璁￠噺鍗曚綅寮圭獥
+ form.on('submit(HbtnUnit)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鎶芥牱鏂规寮圭獥
+ form.on('submit(HbtnSampleScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //璐ㄩ噺鏍囧噯寮圭獥
+ form.on('submit(HbtnQualityStd)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQualityStdName").val(checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О);
+ $("#HQualityStdID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屾柟娉曞脊绐�
+ form.on('submit(HbtnInspectMethod)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectMethodName").val(checkStatus.data[0].妫�楠屾柟娉曞悕绉�);
+ $("#HInspectMethodID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屼华鍣ㄥ脊绐�
+ form.on('submit(HbtnInspectInstruMent)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectInstruMentName").val(checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�);
+ $("#HInspectInstruMentID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //妫�楠屼緷鎹脊绐�
+ form.on('submit(HbtnInspectBasis)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectBasisName").val(checkStatus.data[0].妫�楠屼緷鎹悕绉�);
+ $("#HInspectBasisID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var HQCCheckClassID = $("#HQCCheckClassID").val();
+ var HAnalysisMethod = $("#HAnalysisMethod").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+ if (HQCCheckClassID == null || HQCCheckClassID == undefined || HQCCheckClassID == "0") {
+
+ layer.msg("璇烽�夋嫨椤圭洰绫诲埆锛�", { icon: 5 });
+ return false;
+ }
+ if (HAnalysisMethod == null || HAnalysisMethod == undefined || HAnalysisMethod == "") {
+ layer.msg("璇烽�夋嫨鍒嗘瀽鏂规硶锛�", { icon: 5 });
+ return false;
+ }
+ return true;
+ }
});
function GetQCCheckClassValue(obj) { //妫�楠岄」鐩被鍒�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index ff9bbef..30fb65c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -228,6 +228,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">涓�娆″悎鏍�<br/>鐜囨爣鍑嗗��</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HOnceRightRate" id="HOnceRightRate" autocomplete="off" onfocus="this.select();" value="0" style="margin-top:10px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
<div class="layui-input-inline ">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
@@ -634,6 +640,9 @@
, upload = layui.upload
, colorpicker = layui.colorpicker
+ //鍏敤瀛楁
+ var ref = /^[0-9]+\.?[0-9]*$/;
+
//鍒濆鍖栫晫闈�
@@ -643,32 +652,37 @@
$("#HItemID").val(0);
get_ReadConfigFile();
- // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
document.getElementById('testList').addEventListener('click', function () {
- // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
document.getElementById('HNumber').click();
+ if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鐗╂枡浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犲浘鐗囷紒', { time: 3 * 1000, icon: 3 });
+ }
});
- // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
document.getElementById('HNumber').addEventListener('change', function () {
var inputHNumber = document.getElementById('HNumber');
- var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
+ var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
if (hNumberValue == '') {
- // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
+ // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
layer.msg("鐗╂枡浠ｇ爜涓虹┖,鏃犳硶杩涜鍥剧墖涓婁紶");
this.value = '';
} else {
- // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
+ // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
PicUpload();
}
});
-
+
}
- else if (OperationType==2){
+ else if (OperationType == 2) {
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
$("#HItemID").val(0);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
}
else if (OperationType == 3) {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
@@ -772,6 +786,16 @@
//閫夋嫨宸℃妫�楠屾柟妗堟寜閽�
form.on('submit(HQCSchemeID_Patrol-BT)', function () {
get_checkHQCSchemeID_Patrol();
+ });
+
+ //鐩戝惉涓�娆″悎鏍肩巼鏍囧噯鍊�
+ $("#HOnceRightRate").blur(function (data) {
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ var value = $("#HOnceRightRate").val();
+ if (!ref.test(value)) {
+ layer.msg("涓�娆″悎鏍肩巼鏍囧噯鍊硷紝璇疯緭鍏�0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HOnceRightRate").val("0");
+ }
});
//閫夋嫨棰滆壊
@@ -905,6 +929,7 @@
, "HFootPrice": data.缁撶畻浠�
, "HTaxCost": data.鍚◣鎴愭湰浠�
, "HNoTaxCost": data.涓嶅惈绋庢垚鏈环
+ , "HOnceRightRate": data.涓�娆″悎鏍肩巼鏍囧噯鍊�
});
colorpicker.render({
@@ -1168,6 +1193,11 @@
}
}
+ if (!ref.test($("#HOnceRightRate").val())) {
+ layer.msg("涓�娆″悎鏍肩巼鏍囧噯鍊硷紝璇疯緭鍏�0-9姝ｇ‘鏁板瓧", { time: 3000, });
+ return;
+ }
+
//if ($("#HUnitGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
@@ -1222,7 +1252,7 @@
$("#HItemID").val(0);
$('#HNumber').val('');
$('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
- });
+ });
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -1574,7 +1604,7 @@
function set_ClearBill() {
}
-
+
//#region 鏂囦欢涓婁紶
function PicUpload() {
@@ -1769,10 +1799,10 @@
area: ['80%', '80%'],
shadeClose: true,
scrollbar: false,
- title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
- content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
cancel: function () {
- //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
}
});
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
index 83438a1..7e90b71 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
@@ -37,16 +37,7 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
- <div class="layui-colla-item">
- <div style="padding: 10px;">
- <!--<div class="layui-col-xs2">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
-
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- </div>
+ <div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
@@ -105,15 +96,12 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
</div>
</script>
</form>
@@ -212,6 +200,14 @@
switch (obj.event) {
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
};
});
@@ -403,7 +399,7 @@
title: '鏂板妫�楠岄」鐩�',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&Level=' + Level+''],
end: function () {
@@ -524,7 +520,7 @@
if (TagId != "") {
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妫�楠岄」鐩�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
@@ -550,7 +546,7 @@
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妫�楠岄」鐩�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
@@ -595,6 +591,42 @@
})
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_CheckItem/AuditGy_CheckItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Xs_SeOrderBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Xs_SeOrderBill.aspx"
index d10a2b0..7dc31d8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Xs_SeOrderBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Xs_SeOrderBill.aspx"
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"] + " order by hsubid asc");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 230a5b5..0bc4b20 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -232,6 +232,8 @@
var HModName = "Gy_SOPBillEdit";
var arr = [];
var HEntryID = 1;
+ var trindex = -1; //榛樿閫変腑琛屼笅鏍�
+ var checkobj = ""; //澶嶉�夋
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -273,16 +275,29 @@
//琛岀洃鍚簨浠�
table.on('row(mainTable)', function (obj) {
+ //绉婚櫎閫夋嫨鏂囦欢鎸夐挳
$("#ChoseFile").remove();
HEntryID = Number($(obj.tr).attr("data-index")) + Number(1);
//submitbtngroup 杩欎釜鏄笂浼犳寜閽殑鐖惰妭鐐� 鍔ㄦ�佹坊鍔犱笂浼犳寜閽� 瑙ｅ喅涓婁紶涓�娆′箣鍚巆hoose鏂规硶涓嶆墽琛岀殑bug
$("#submitbtngroup").append('<button type = "button" class="layui-btn layui-btn-primary" lay-submit lay-filter="ChoseFile" id="ChoseFile" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>');
+
+ if (trindex != -1) {
+ $("tr[data-index = " + (trindex) + "] ").removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ trindex = -1;
+ }
+ 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棰滆壊
+ }
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棰滆壊
@@ -291,8 +306,13 @@
layui.each(table.cache.mainTable, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
+ } else {
+ l.LAY_CHECKED = false;
}
});
+
+ trindex = Number($(obj.tr).attr("data-index"));
+
PicUpload();
});
//#endregion
@@ -448,22 +468,22 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
- //if (HMaterNumber == "") {
- // layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (HUnitName == "") {
- // layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
- // layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (option.data[0].宸ヤ綔涓績 == "") {
- // layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
+ if (HMaterNumber == "") {
+ layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HUnitName == "") {
+ layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
+ layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (option.data[0].宸ヤ綔涓績 == "") {
+ layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
$.ajax({
url: GetWEBURL() + '/Gy_SOPBill/Save',
type: "POST",
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 457afb3..9c6fd30 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -700,6 +700,9 @@
, { field: 'HWidth', title: '闂ㄥ箙', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', totalRow: true, sort: true, totalRow: true }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', totalRow: true, sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', totalRow: true, sort: true, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', totalRow: true, sort: true, totalRow: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
, { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true }
, { field: '鏄惁鍙栧簱瀛�', title: '鏄惁鍙栧簱瀛�', sort: true }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 6b58107..a3748fe 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 36484ee..8025c14 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 95px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 9b8fe05..bdaab34 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 71cf943..2cafb20 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -13,7 +13,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 95px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index c3e7b18..a29f66f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 6e7f173..e51039e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 42738a6..087fb75 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -8,7 +8,7 @@
<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">
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
index 9955767..bd2db11 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrMsgBackType.html"
@@ -33,14 +33,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -144,35 +144,36 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
+ if (AllowLoadData()) {
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
- var isEndCheck = document.getElementById("HStopflag").checked;
- isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveGy_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
- var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "SaveGy_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
}
- else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
+ });
+ }
});
//閫�鍑�
form.on('submit(Exit)', function (data) {//
@@ -231,12 +232,12 @@
$("#HNumber").val(data.寮傚父鍙嶉绫诲瀷浠ｇ爜);//浠ｇ爜
$("#HName").val(data.寮傚父鍙嶉绫诲瀷鍚嶇О);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
- $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-
+ form.render("select");
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -246,6 +247,22 @@
});
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val() //浠ｇ爜
+ var HName = $("#HName").val() //鍚嶇О
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+ return true;
+ }
+
//
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
index dfa04f5..d35e0a0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ErrType.html"
@@ -10,7 +10,6 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -18,12 +17,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -32,14 +28,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -77,12 +73,6 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
- </div>
- </div>
- <div class="layui-form-item">
<div class="layui-col-xs11">
<label class="layui-form-label"> 澶囨敞锛�</label>
<div class="layui-input-block">
@@ -90,6 +80,12 @@
<input type="hidden" class="layui-input" name="HOrgID" id="HOrgID" autocomplete="off">
<input type="hidden" class="layui-input" name="HMakeEmp" id="HMakeEmp" autocomplete="off">
</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
</div>
</div>
</div>
@@ -227,7 +223,7 @@
}
})
});
-
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -279,7 +275,7 @@
$("#HUSEORGID").val(data.HUSEORGID);//缁勭粐
$("#HUseFlag").val(data.浣跨敤鏍囪);//浣跨敤鏍囪
$("#HBarCode").val(data.鏉″舰鐮�);//鏉″舰鐮�
- $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪==" "?false:true));//true:閫変腑 false:涓嶉�変腑
+ $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪 == " " ? false : true));//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
} else {
@@ -315,8 +311,15 @@
//鏁版嵁楠岃瘉
function AllowLoadData() {
- if ($("#HHelpCode").val() == '') {
- layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ var HNumber = $("#HNumber").val() //浠ｇ爜
+ var HName = $("#HName").val() //鍚嶇О
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
return false;
}
return true;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
index 4240dc8..232d5b9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrType.html"
@@ -78,8 +78,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
@@ -456,8 +456,8 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_BadReason/AuditGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/Gy_ErrType/AuditGy_ErrType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 760bfa6..03f2025 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -12,10 +12,20 @@
.layui-form-label {
width: 85px;
}
+
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
</style>
</head>
<body>
-
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
@@ -47,7 +57,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏂规鍚嶇О</label>
+ <label class="layui-form-label">鏂规鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HName" id="HName" class="layui-input">
</div>
@@ -103,9 +113,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">榛樿鏂规</label>
+ <label class="layui-form-label">鎶芥牱鏂规</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ <input type="text" name="HSampleSchemeName" id="HSampleSchemeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSampleSchemeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -133,25 +147,33 @@
</div>
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿鏂规</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
- </script>
+ </script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
-
+
</form>
</div>
</div>
@@ -161,6 +183,40 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(缂洪櫡绛夌骇)-->
+ <script type="text/html" id="HDefectLevel">
+ <select name="HDefectLevel" lay-filter="HDefectLevel" id="HDefectLevel{{d.LAY_TABLE_INDEX+1}}">
+ <option value="1">鑷村懡缂洪櫡</option>
+ <option value="2">閲嶇己闄�</option>
+ <option value="3">杞荤己闄�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鐘舵��)-->
+ <script type="text/html" id="HStatus">
+ <select name="HStatus" lay-filter="HStatus" id="HStatus{{d.LAY_TABLE_INDEX+1}}">
+ <option value="0">涓嶅悎鏍�</option>
+ <option value="1" selected>鍚堟牸</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
+ </script>
+
+ <!--澶嶉�夋锛堢牬鍧忔�ф楠岋級-->
+ <script type="text/html" id="HDestructInspect">
+ <input type="checkbox" value="{{d.HDestructInspect}}" lay-skin="primary" id="HDestructInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDestructInspect" {{ d.HDestructInspect == 1 ? 'checked' : '' }}>
+ </script>
+
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -193,14 +249,12 @@
, element = layui.element;
var option;
var sBillType = "3320";
- //var TabRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -221,7 +275,16 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" };
+ var NewRow = {
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -238,6 +301,7 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
+ //#region 鍩虹璧勬枡鏀惧ぇ闀滄寜閽�
//琛ㄥご寮圭獥鐗╂枡淇℃伅
form.on('submit(HMaterList)', function () {
@@ -382,6 +446,43 @@
});
});
+ //琛ㄥご鎶芥牱鏂规淇℃伅
+ form.on('submit(HSampleSchemeList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//琛ㄥご鍗曚綅鍗曚綅
form.on('submit(HUnitList)', function () {//閫夋嫨鍗曚綅
//椤甸潰灞�-鑷畾涔�
@@ -419,12 +520,94 @@
}
});
});
+ //#endregion
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ Saver(data);
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (typeof (params[params[0]]) == "undefined") {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+
+ //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+ 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鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢己闄风瓑绾э級
+ form.on('select(HDefectLevel)', 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.HDefectLevel = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HStatus)', 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.HStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', 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.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //鏄惁鐮村潖鎬ф楠�
+ form.on('checkbox(HDestructInspect)', 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.HDestructInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁榛樿鏂规
+ form.on('checkbox(HStandard)', function (data) {
+ $("#HStandard").val(data.elem.checked);
+ });
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event === 'HQCCheckItemNumber') //淇濆吇椤圭洰淇℃伅
+ if (obj.event === 'HQCCheckItemNumber') //
{
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -473,7 +656,7 @@
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
-
+
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -483,6 +666,204 @@
}
});
}
+ if (obj.event === 'HQualityStdName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectMethodName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectInstruMentName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectInstruMentID: checkStatus.data[0].HItemID,
+ HInspectInstruMentName: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ HQCTool: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HSampleSchemeName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../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('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HSampleSchemeID: checkStatus.data[0].hmainid,
+ HSampleSchemeName: checkStatus.data[0].鎶芥牱鏂规鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+
obj.event = "";
return false;
@@ -490,9 +871,83 @@
})
}
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�*', edit: 'text', event: 'HQCCheckItemNumber' }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
+ , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
+
+ , { field: 'HQCTool', title: '妫�楠屽伐鍏凤紙浠櫒锛�', edit: 'text' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod' }
+ , { field: 'HDefectLevel', title: '缂洪櫡绛夌骇', templet: '#HDefectLevel' }
+ , { field: 'HDestructInspect', title: '鐮村潖鎬ф楠�', templet: '#HDestructInspect', unresize: false }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectInstruMentID', title: '妫�楠屼华鍣↖D', edit: 'text', hide: true }
+ , { field: 'HInspectInstruMentName', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentName' }
+ , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
+ , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+ , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', event: 'HSampleSchemeName' }
+ , { field: 'HStatus', title: '鐘舵��', templet: '#HStatus' }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�', edit: 'text' }
+ , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text' }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text' }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text' }
+ , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text' }
+ , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text' }
+ , { field: 'HTargetValKey', title: '鐩爣鍊糑ey', edit: 'text' }
+ , { field: 'HUpLimitKey', title: '涓婇檺鍊糑ey', edit: 'text' }
+ , { field: 'HDownLimitKey', title: '涓嬮檺鍊糑ey', edit: 'text' }
+ , { field: 'HUpOffSetKey', title: '涓婂亸宸甂ey', edit: 'text' }
+ , { field: 'HDownOffSetKey', title: '涓嬪亸宸甂ey', edit: 'text' }
+ , { field: 'HTargetValQ', title: '鐩爣鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpLimitQ', title: '涓婇檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HDownLimitQ', title: '涓嬮檺鍊兼暟閲�', edit: 'text' }
+ , { field: 'HUpOffSetQ', title: '涓婂亸宸暟閲�', edit: 'text' }
+ , { field: 'HDownOffSetQ', title: '涓嬪亸宸暟閲�', edit: 'text' }
+ , { field: 'HTargetValB', title: '鐩爣鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpLimitB', title: '涓婇檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownLimitB', title: '涓嬮檺鍊煎熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HUpOffSetB', title: '涓婂亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HDownOffSetB', title: '涓嬪亸宸熀纭�璧勬枡', edit: 'text' }
+ , { field: 'HTargetValTxt', title: '鐩爣鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HUpLimitTxt', title: '涓婇檺鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HDownLimitTxt', title: '涓嬮檺鍊兼枃鏈�', edit: 'text' }
+ , { field: 'HUpOffSetTxt', title: '涓婂亸宸枃鏈�', edit: 'text' }
+ , { field: 'HDownOffSetTxt', title: '涓嬪亸宸枃鏈�', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , limit: 100
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
//淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
+ function Saver(data) {
var isEndCheck = document.getElementById("HStandard").checked;
data.field.HStandard = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
@@ -526,56 +981,22 @@
layer.alert("閿欒:" + err, { icon: 5 });
}
});
- });
-
- //閫�鍑�
- form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
-
-
- //#endregion
-
- //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- //琛ㄥご
- columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text', hide: true }
- , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
- , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�', edit: 'text', event: 'HQCCheckItemNumber' }
- , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- ];
- option = {
- id: 'mainTable'
- , elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , page: false
- , cellMinWidth: 120
- , height: 500
- , limit:100
- , cols: [columns]
- , done: function (res, curr, count) {
-
- }
- };
-
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ }];
table.render(option);
}
@@ -583,7 +1004,16 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": "" }];
+ option.data = [{
+ "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": ""
+ , "HRemark": "", "HQCTool": "", "HAnalysisMethod": 1, "HDefectLevel": 3, "HDestructInspect": 0, "HKeyInspect": 0, "HQualityStdID": 0
+ , "HInspectMethodID": 0, "HInspectInstruMentID": 0, "HInspectBasisID": 0, "HSampleSchemeID": 0, "HStatus": 1, "HCompareSymbol": ""
+ , "HTargetVal": "", "HUpLimit": "", "HDownLimit": "", "HUpOffSet": "", "HDownOffSet": "", "HTargetValKey": "", "HUpLimitKey": ""
+ , "HDownLimitKey": "", "HUpOffSetKey": "", "HDownOffSetKey": "", "HTargetValQ": 0, "HUpLimitQ": 0, "HDownLimitQ": 0, "HUpOffSetQ": 0
+ , "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
+ , "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
+ , "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
+ }];
table.render(option);
}
@@ -619,8 +1049,17 @@
success: function (result) {
console.log(result);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Gy_QCCheckProjectList_NEW[0];
- $("input[name='HStandard']").prop("checked", data.HStandard);//true:閫変腑 false:涓嶉�変腑
+ var data = result.data.h_v_Gy_QCCheckProjectList_Edit[0];
+
+ //$("input[name='HStandard']").prop("checked", data.榛樿鏂规 == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
+
+ if (data.榛樿鏂规 == 1) {
+ $("input[name='HStandard']").prop("checked", true);
+ }
+ else {
+ $("input[name='HStandard']").prop("checked", false);
+ }
+
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
form.val("component-form-group", {
"HBillNo": data.鍗曟嵁鍙�
@@ -640,6 +1079,9 @@
, "HUnitID": data.HUnitID
, "HUnitNumber": data.鍗曚綅浠ｇ爜
, "HRemark": data.琛ㄥご澶囨敞
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HStandard": data.榛樿鏂规 == 1 ? true : false
});
@@ -675,8 +1117,111 @@
data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
- option.data = result.data;
+
+ var rowarr = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ switch (data[i].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[i].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[i].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+ switch (data[i].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[i].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[i].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[i].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[i].鐘舵��) {
+ case "鍚堟牸":
+ data[i].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[i].鐘舵�� = "0";
+ break;
+ }
+
+ rowarr.push({
+ "HPrjNo": (i + 1), "HQCCheckItemID": data[i].妫�楠岄」鐩甀D, "HQCCheckItemNumber": data[i].妫�楠岄」鐩唬鐮�,
+ "HQCCheckItemName": data[i].妫�楠岄」鐩�, "HQCStd": data[i].妫�楠屾爣鍑�, "HQCStdMax": data[i].鏈�澶ф楠屾爣鍑�,
+ "HQCUnit": data[i].妫�楠屽崟浣�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HQCTool": data[i].妫�楠屽伐鍏�,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HDefectLevel": data[i].缂洪櫡绛夌骇, "HDestructInspect": data[i].鐮村潖鎬ф楠� == 0 ? false : true,
+ "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HQualityStdID": data[i].HQualityStdID, "HInspectMethodID": data[i].HInspectMethodID,
+ "HInspectInstruMentID": data[i].HInspectInstruMentID, "HInspectBasisID": data[i].HInspectBasisID,
+ "HSampleSchemeID": data[i].HSampleSchemeID_sub, "HStatus": data[i].鐘舵��, "HCompareSymbol": data[i].姣旇緝绗�,
+ "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�,
+ "HDownOffSet": data[i].涓嬪亸宸�, "HTargetValKey": data[i].鐩爣鍊糑ey, "HUpLimitKey": data[i].涓婇檺鍊糑ey,
+ "HDownLimitKey": data[i].涓嬮檺鍊糑ey, "HUpOffSetKey": data[i].涓婂亸宸甂ey, "HDownOffSetKey": data[i].涓嬪亸宸甂ey,
+ "HTargetValQ": data[i].鐩爣鍊兼暟閲�, "HUpLimitQ": data[i].涓婇檺鍊兼暟閲�, "HDownLimitQ": data[i].涓嬮檺鍊兼暟閲�,
+ "HUpOffSetQ": data[i].涓婂亸宸暟閲�, "HDownOffSetQ": data[i].涓嬪亸宸暟閲�, "HTargetValB": data[i].鐩爣鍊煎熀纭�璧勬枡,
+ "HUpLimitB": data[i].涓婇檺鍊煎熀纭�璧勬枡, "HDownLimitB": data[i].涓嬮檺鍊煎熀纭�璧勬枡, "HUpOffSetB": data[i].涓婂亸宸熀纭�璧勬枡,
+ "HDownOffSetB": data[i].涓嬪亸宸熀纭�璧勬枡, "HTargetValTxt": data[i].鐩爣鍊兼枃鏈�, "HUpLimitTxt": data[i].涓婇檺鍊兼枃鏈�,
+ "HDownLimitTxt": data[i].涓嬮檺鍊兼枃鏈�, "HUpOffSetTxt": data[i].涓婂亸宸枃鏈�, "HDownOffSetTxt": data[i].涓嬪亸宸枃鏈�,
+ "HQualityStdName": data[i].璐ㄩ噺鏍囧噯鍚嶇О, "HInspectMethodName": data[i].妫�楠屾柟娉曞悕绉�, "HInspectInstruMentName": data[i].妫�楠屼华鍣ㄥ悕绉�,
+ "HInspectBasisName": data[i].妫�楠屼緷鎹悕绉�, "HSampleSchemeName": data[i].瀛愭娊鏍锋柟妗堝悕绉�
+ });
+ }
+
+ option.data = rowarr;
table.render(option);
+
+ for (var i = 1; i <= data.length; i++) {
+ switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+ case "瀹氭�у垎鏋�":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+ break;
+ case "瀹氶噺鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+ break;
+ case "鍏朵粬鍒嗘瀽":
+ data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+ break;
+ }
+ switch (data[(i - 1)].缂洪櫡绛夌骇) {
+ case "鑷村懡缂洪櫡":
+ data[(i - 1)].缂洪櫡绛夌骇 = "1";
+ break;
+ case "閲嶇己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "2";
+ break;
+ case "杞荤己闄�":
+ data[(i - 1)].缂洪櫡绛夌骇 = "3";
+ break;
+ }
+ switch (data[(i - 1)].鐘舵��) {
+ case "鍚堟牸":
+ data[(i - 1)].鐘舵�� = "1";
+ break;
+ case "涓嶅悎鏍�":
+ data[(i - 1)].鐘舵�� = "0";
+ break;
+ }
+
+ $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + (data[(i - 1)].缂洪櫡绛夌骇) + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + (data[(i - 1)].鐘舵��) + "']").attr("selected", true);
+
+ if (data[(i - 1)].鐮村潖鎬ф楠�) {
+ $('#HDestructInspect' + (i)).attr("checked", true);
+ }
+ if (data[(i - 1)].閲嶇偣妫�鏌�) {
+ $('#HKeyInspect' + (i)).attr("checked", true);
+ }
+ }
+
+ form.render("select");
+ form.render("checkbox");
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -742,6 +1287,62 @@
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
+ var HName = $("#HName").val(); //鏂规鍚嶇О
+
+ if (HName == null || HName == undefined || HName == "") {
+ layer.msg("璇疯緭鍏ユ柟妗堝悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ var sSubStr = table.cache['mainTable'];
+
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (!ref.test(sSubStr[i].HTargetValQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊兼暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetQ)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸暟閲� 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HTargetValB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 鐩爣鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婇檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownLimitB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬮檺鍊煎熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HUpOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓婂亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!ref.test(sSubStr[i].HDownOffSetB)) {
+ layer.msg("绗�" + (i + 1) + "琛� 涓嬪亸宸熀纭�璧勬枡 瀛楁锛岃杈撳叆姝ｇ‘鐨勬暟瀛�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HQCCheckItemID == 0 || sSubStr[i].HQCCheckItemID == null || sSubStr[i].HQCCheckItemID == undefined) {
+ layer.msg("绗�" + (i + 1) + "琛� 妫�楠岄」鐩负绌猴紝璇烽�夋嫨妫�楠岄」鐩�", { icon: 5, btn: ['纭'], time: 3000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
return Result;
}
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 2bba3eb..86e91ad 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -10,22 +10,18 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
-
</head>
<body>
-
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
<a lay-href="">涓婚〉</a>
</div>
</div>
-
<div class="layui-fluid">
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
-
<div class="layui-card-body">
<!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
<form class="layui-form" action="">
@@ -36,7 +32,6 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
-
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -64,11 +59,13 @@
<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" id="btn-Add" ><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" ><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</div>
@@ -140,18 +137,20 @@
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
- break;
- //瀹℃牳鎸夐挳
- case 'btn-Audit': set_CheckBill();
- break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_AbandonCheck();
- break;
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
//閫�鍑烘寜閽�
case 'btn_Exit': Pub_Close(1);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
};
});
@@ -375,15 +374,41 @@
}
}
- //瀹℃牳
- function set_CheckBill() {
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_QCCheckProject/AuditGy_QCCheckProject", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
}
-
- //鍙嶅鏍�
- function set_AbandonCheck() {
-
- }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 5d7d209..f68acd5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -212,13 +212,13 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
+ <input type="text" class="layui-input" value="0" name="HQty" id="HQty" onfocus="this.select();">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+ <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" onfocus="this.select();">
</div>
</div>
</div>
@@ -275,34 +275,64 @@
<input type="hidden" value="0" name="HTemporaryAreaID" id="HTemporaryAreaID">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ </div>
+ </div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ユ椂</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁惧娓呭崟</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">宸ユ椂</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁惧娓呭崟</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簾鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HWasterQty_Work" style="width:190px;" id="HWasterQty_Work" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏂欏簾鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HWasterQty_Mater" style="width:190px;" id="HWasterQty_Mater" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩斿伐鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HBackWorkQty" style="width:190px;" id="HBackWorkQty" onfocus="this.select();">
+ </div>
+ </div>
</div>
<div class="layui-row">
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓嶈壇鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" value="0" name="" id="">
- </div>
- </div>-->
+ <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
- </div>-->
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -613,7 +643,7 @@
var option;
var HModName = "Cj_StationOutBill";
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
-
+ var ref = /^[0-9]+\.?[0-9]*$/;
//杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
//$('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
@@ -757,6 +787,64 @@
//RoadBillSub(linterid);
}
+ //#region 鐩戝惉 鎶ュ簾鏁伴噺锛屾枡搴熸暟閲忥紝宸ュ簾鏁伴噺
+ $("#HWasterQty_Work").blur(function (data) { //宸ュ簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty_Work").val())) {
+ layer.msg("宸ュ簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty_Work").val("0");
+ }
+ //绂佺敤鎶ュ簾鏁伴噺瀛楁
+ if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+ $("#HWasterQty").attr("disabled", "disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty").removeAttr("disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+ }
+
+ $("#HWasterQty").val(Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val()));
+ });
+
+ $("#HWasterQty_Mater").blur(function (data) { //鏂欏簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty_Mater").val())) {
+ layer.msg("鏂欏簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty_Mater").val("0");
+ }
+ //绂佺敤鎶ュ簾鏁伴噺瀛楁
+ if ((Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val())) > 0) {
+ $("#HWasterQty").attr("disabled", "disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty").removeAttr("disabled");
+ document.getElementById('HWasterQty').style.backgroundColor = '#FFFFFF';
+ }
+
+ $("#HWasterQty").val(Number($("#HWasterQty_Work").val()) + Number($("#HWasterQty_Mater").val()));
+ });
+
+ $("#HWasterQty").blur(function (data) { //鎶ュ簾鏁伴噺
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ if (!ref.test($("#HWasterQty").val())) {
+ layer.msg("鎶ュ簾鏁伴噺锛岃杈撳叆0-9姝ｇ‘鏁板��", { time: 3000, });
+ $("#HWasterQty").val("0");
+ }
+ //绂佺敤宸ュ簾鏁伴噺锛屾枡搴熸暟閲忓瓧娈�
+ if ($("#HWasterQty").val() > 0) {
+ $("#HWasterQty_Work").attr("disabled", "disabled");
+ $("#HWasterQty_Mater").attr("disabled", "disabled");
+ document.getElementById('HWasterQty_Work').style.backgroundColor = '#efefef4d';
+ document.getElementById('HWasterQty_Mater').style.backgroundColor = '#efefef4d';
+ } else {
+ $("#HWasterQty_Work").removeAttr("disabled");
+ $("#HWasterQty_Mater").removeAttr("disabled");
+ document.getElementById('HWasterQty_Work').style.backgroundColor = '#FFFFFF';
+ document.getElementById('HWasterQty_Mater').style.backgroundColor = '#FFFFFF';
+ }
+ });
+ //#endregion
+
//鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
@@ -803,7 +891,12 @@
"HUpDater": data.HUpDater,
"HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
"HChecker": data.HChecker,
- "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
+ "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss"),
+ "HWasterQty_Work": data.宸ュ簾鏁伴噺,
+ "HWasterQty_Mater": data.鏂欏簾鏁伴噺,
+ "HBackWorkQty": data.杩斿伐鏁伴噺,
+ "HShiftsID": data.HShiftsID,
+ "HShiftsName": data.鐝鍚嶇О,
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
@@ -1529,6 +1622,31 @@
})
});
+ //鐢熶骇鐝
+ form.on('submit(BtnHShiftsName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
//閫夋嫨鐢熶骇璧勬簮寮圭獥
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
index 1d0df64..ca742e9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/MES_ColorRecordBillList.html"
@@ -250,7 +250,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
- sWhere += " order by 鏃ユ湡 desc ";
+ sWhere += " order by 鍒跺崟鏃ユ湡 desc ";
//鍔ㄦ�佸垪-缂撳瓨鍒楄〃
$.ajax({
url: GetWEBURL() + "/ColorRecord/ColorRecordList",
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
index bfc25f2..f1b7c19 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
@@ -575,8 +575,11 @@
var HSumMoney = newHSumMoney * 1; //閲戦
var HDiscountRate = $("#HDiscountRate").val() * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
+
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -605,6 +608,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HDiscountRate = newHDiscountRate * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -620,6 +624,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);
$("#HGiftMoney").val(HGiftMoney);
});
@@ -1414,6 +1419,42 @@
});
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index f0ce3f0..3309fae 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -565,8 +565,11 @@
var HSumMoney = newHSumMoney * 1; //閲戦
var HDiscountRate = $("#HDiscountRate").val() * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
+
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -595,6 +598,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HDiscountRate = newHDiscountRate * 1; //鏁村崟鎶樻墸
var HRelSumMoney = HSumMoney * HDiscountRate * 0.01; //鎶樻墸鍚庨噾棰�
+ HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
@@ -610,6 +614,7 @@
var HSumMoney = $("#HSumMoney").val() * 1; //閲戦
var HGiftRate = $("#HGiftRate").val() * 1; //璧犻�佹瘮渚�
var HGiftMoney = HSumMoney * HGiftRate * 0.01;
+ HGiftMoney = dealDoubleToFixed(HGiftMoney,2);
$("#HGiftMoney").val(HGiftMoney);
});
@@ -1537,6 +1542,42 @@
});
}
//#endregion
+
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index d82c1c8..7a6d65a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -145,6 +145,8 @@
</select>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
<div class="layui-input-inline">
@@ -154,8 +156,6 @@
</select>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -166,7 +166,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">閿�鍞柟寮�</label>
<div class="layui-input-inline">
<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -664,7 +664,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱":"",
"HQty": "0",
"HPrice": "0",
@@ -680,6 +680,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -1242,6 +1244,8 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+ , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
+ , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
, { field: '浠撳簱', title: '浠撳簱', width: 100, style: 'background-color:#efefef4d;' ,edit: 'text' ,event: "HWHID" }//f7
, { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
@@ -1297,7 +1301,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱":"",
"HQty": "0",
"HPrice": "0",
@@ -1313,6 +1317,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -1461,6 +1467,8 @@
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
+ "HRemark_TL": result.data[i]["鎶曟枡"],
+ "HRemark_SJG": result.data[i]["娣卞姞宸�"],
"HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
"HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
"HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
@@ -2175,7 +2183,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱": "",
"HQty": "0",
"HPrice": "0",
@@ -2191,6 +2199,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
@@ -2236,7 +2246,7 @@
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
- "HWHID": "",
+ "HWHID": "0",
"浠撳簱": "",
"HQty": "0",
"HPrice": "0",
@@ -2252,6 +2262,8 @@
"HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
+ "HRemark_TL": "",
+ "HRemark_SJG": "",
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index c926121..a3fea2a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -191,7 +191,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Xs_SeOrderBill";
+ var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
@@ -504,6 +504,10 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', sort: true, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', sort: true, totalRow: true }
+ , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
+ , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
@@ -519,8 +523,8 @@
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
- , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
- , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
+ , { field: '鎶曟枡', title: '鎶曟枡', sort: true }
+ , { field: '娣卞姞宸�', title: '娣卞姞宸�', sort: true }
, { field: '鏈叧鑱旀暟閲�', title: '閿�鍞嚭搴撴湭鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鍏宠仈鏁伴噺', title: '鐢熶骇鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鏈叧鑱旀暟閲�', title: '鐢熶骇鏈叧鑱旀暟閲�', sort: true, totalRow: true }
@@ -544,19 +548,19 @@
//, { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125, sort: true }
//, { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
//, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
- , { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
- //, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
- , { field: '甯佸埆', title: '甯佸埆', hide: true, sort: true }
- , { field: '姹囩巼', title: '姹囩巼', hide: true, sort: true }
- , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
- //, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, hide: true,sort: true }
- //, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
- , { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
- //, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
- , { field: '涓荤', title: '涓荤', hide: true, sort: true }
- , { field: '涓讳粨搴搃d', title: '涓讳粨搴搃d', hide: true, sort: true }
- , { field: '涓讳粨搴�', title: '涓讳粨搴�', hide: true, sort: true }
+ //, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
+ ////, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
+ //, { field: '甯佸埆', title: '甯佸埆', hide: true, sort: true }
+ //, { field: '姹囩巼', title: '姹囩巼', hide: true, sort: true }
+ //, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
+ ////, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, hide: true,sort: true }
+ ////, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
+ //, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
+ ////, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
+ //, { field: '涓荤', title: '涓荤', hide: true, sort: true }
+ //, { field: '涓讳粨搴搃d', title: '涓讳粨搴搃d', hide: true, sort: true }
+ //, { field: '涓讳粨搴�', title: '涓讳粨搴�', hide: true, sort: true }
//, { field: '鎽樿', title: '鎽樿', sort: true }
//, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
//, { field: '绋庨', title: '绋庨', sort: true }
@@ -1267,7 +1271,7 @@
get_needClose_Bar = 1;
//涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
- sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=500 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
+ sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
//鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
var ajaxLoad = layer.load();
@@ -1389,7 +1393,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
if (get_needClose_Bar == 0) {
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
} else if (get_needClose_Bar == 1) {
$("#get_needClose").trigger('click');
}
@@ -1430,7 +1434,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
if (get_needClose_Bar == 0) {
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
} else if (get_needClose_Bar == 1) {
$("#get_needClose").trigger('click');
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index f0bd441..506de7f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -405,7 +405,7 @@
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
, { field: '浠舵暟', title: '浠舵暟', totalRow: true, width: 200, sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', totalRow: true, width: 200, sort: true }
- , { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
+ //, { field: '宸插叧鑱旀暟閲�', title: '宸插叧鑱旀暟閲�', totalRow: true, width: 200, sort: true }
, { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
, { field: '绋庣巼', title: '绋庣巼', width: 200, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 200, sort: true, totalRow: true }
--
Gitblit v1.9.1