From 518dfcec8ee396b064e37e9fe115ac4560dc031d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 01 十一月 2021 19:22:16 +0800
Subject: [PATCH] 修改被覆盖的代码—数据验证，器具页打印模板
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 14
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 70 +
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html | 109 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 16
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 40
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html | 14
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 25
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 24
WebTM/views/基础资料/公用基础资料/Gy_EquipTypeEdit.html | 126 ++--
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 6
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 54 +
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 119 +--
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 89 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 114 +--
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 14
WebTM/views/基础资料/公用基础资料/Gy_EquipMent_Edit.html | 105 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 18
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html | 10
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 32
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 73 +
WebTM/views/基础资料/公用基础资料/Gy_EquipMent.html | 98 +--
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 143 ++--
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 11
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 18
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 17
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 91 +-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 43 +
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 106 +--
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 126 +--
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html | 22
30 files changed, 867 insertions(+), 880 deletions(-)
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_EquipMent.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_EquipMent.html"
index dd92a5c..1b4f568 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_EquipMent.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_EquipMent.html"
@@ -2,26 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁惧璁剧疆</title>
+ <title>璁惧妗ｆ</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style media="screen">
- .custom-tree-item-clicked {
- color: #FC9003
- }
-
- .layui-form-label {
- width: 80px;
- padding: 9px 10px;
- }
-
- .layui-input-block {
- margin-left: 100px;
- }
- </style>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/treeTable.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -38,51 +24,32 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
- </div>
-
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
- <div id="treeEquipMent" lay-filter="treeEquipMent" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>
- <div class="layui-col-xs12 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">璁惧浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
-
- <div class="layui-row layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
</div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div style="padding: 10px;">
+ <button type="button" lay-filter="btndelete" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" lay-filter="btnAdd" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" lay-filter="btnModify" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" lay-filter="btnJY" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-file-b"></i>绂佺敤</button>
+ <button type="button" lay-filter="btnFJY" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-file-b"></i>鍙嶇鐢�</button>
</div>
</script>
</form>
@@ -168,8 +135,7 @@
//#region 鏈〉闈㈣皟鐢ㄦ墍鏈夋柟娉�
//鍒濆鍖栨爲鍨�
- function set_TreeLoad()
- {
+ function set_TreeLoad() {
$.ajax({
url: GetWEBURL() + '/Gy_EquipMent/LoadTree',
type: "GET",
@@ -202,10 +168,14 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- , height: 'full-250'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
, page: true
+ , limits: [50, 200, 500, 1000, 5000, 10000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 200, 500, 1000, 5000, 10000]
, cols: [[
{ type: 'radio', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
@@ -270,7 +240,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: 'Gy_EquipMent_Edit.html.html?OperationType=1&linterid=&HSouceBillType=',
+ content: '../ 鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -294,7 +264,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: 'Gy_EquipMent_Edit.html?.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: '../ 鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html?.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -350,8 +320,7 @@
}
//绂佺敤
- function Enable(obj)
- {
+ function Enable(obj) {
var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
, layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
layer.confirm('鎮ㄧ‘瀹氳绂佺敤鍚楋紵', {
@@ -418,10 +387,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
</script>
</body>
-</html>
+</html>
\ No newline at end of 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/Gy_EquipMent_Edit.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_EquipMent_Edit.html"
index 9ad64e0..9cf0f47 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_EquipMent_Edit.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_EquipMent_Edit.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁惧鍩虹璧勬枡</title>
+ <title>鏂板/缂栬緫璁惧妗ｆ</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -22,51 +22,60 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
- </div>
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
- <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
- <input id="HItemID" name="HItemID" type="hidden" />
- </div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣跨敤缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
- <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
- </div>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
+
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Check">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
</div>
- <div class="layui-row">
- <div class="layui-inline" style="width: 56%;">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline" style="width: 56%;">
- <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒涘缓缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+ <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣跨敤缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+ <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍚嶇О<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 56%;">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline" style="width: 56%;">
+ <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -446,11 +455,7 @@
$("#HSecManagerID").val(obj[0].HItemID);
}
-
-
-
-
</script>
</body>
-</html>
+</html>
\ No newline at end of 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/Gy_EquipTypeEdit.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_EquipTypeEdit.html"
index 1f9275e..7bbf2ae 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_EquipTypeEdit.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_EquipTypeEdit.html"
@@ -40,7 +40,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" />
@@ -49,7 +49,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 class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
@@ -138,7 +138,6 @@
});
}
-
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
Pub_Close(1);
@@ -157,69 +156,70 @@
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + linterid ;
+ var sMainSub = oMain + ';' + linterid;
- if (OperationType == 3) {
- //淇敼
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_EquipType/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
+ if (AllowLoadData()) {
+ if (OperationType == 3) {
+ //淇敼
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_EquipType/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- f_alert(data.Message);
- console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ f_alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- //鏂板
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_EquipType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
}
- else {
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ });
+ }
+ else {
+ //鏂板
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_EquipType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
+ f_alert("閿欒:" + err);
+ }
+ });
+ }
}
});
-
function AllowLoadData() {
if ($("#HNumber").val() == '' || $("#HNumber").val() == '') {
layer.msg("璇峰～鍐欎唬鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -230,7 +230,7 @@
return Result = false;
}
return true;
- }
+ }
//#endregion
@@ -240,9 +240,9 @@
}
-
+
});
</script>
</body>
-
-</html>
\ No newline at end of file
+</html>
+v1.9.1
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
index ac5d3c1..74070c6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
@@ -62,7 +62,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
<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 type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -145,7 +145,8 @@
<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>//鑾峰彇鍙傛暟
+ <script>
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -196,32 +197,32 @@
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" ,width: 100}
- , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鍣ㄥ叿浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100}
+ , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true}
+ , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
, { field: 'HPropertyCode', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HPropertyCode', width: 100 }
, { field: 'HPropertyName', title: '杈呭姪灞炴��', edit: 'text', width: 100 }
- , { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true}
+ , { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HSecUnitCode', title: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HSecUnitCode', width: 100 }
, { field: 'HSecUnitName', title: '杈呭姪璁￠噺鍗曚綅', edit: 'text', width: 100 }
, { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', edit: 'text', width: 100 }
- , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true}
+ , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
- , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100}
- , { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', width: 100}
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', width: 100 }
, { field: 'HNewLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100 }
- , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100}
+ , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0,"HUnitCode":"", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0,"HRemark":""}];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" }];
table.render(option);
}
else {
@@ -305,7 +306,7 @@
}
});
}
-
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event === 'HMaterCode') //妯″叿淇℃伅
@@ -338,7 +339,7 @@
HMaterSpec: checkStatus.data[0].HModel,
HDesignLife: 0, //璁捐瀵垮懡
-
+
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -476,7 +477,7 @@
return false;
}
- })
+ })
});
@@ -702,35 +703,37 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ 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);
}
- 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);
- }
- });
});
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -806,26 +809,18 @@
//$("#HItemID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
if ($("#HDeptName").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HEmpID").val() == '') {
+ layer.msg("璋冩暣浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HMangerID").val() == '') {
+ layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -839,15 +834,6 @@
return false;
}
if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
if (parseFloat(sSubStr[i].HQty) > 0) {
s = 1;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 9d44cfe..3dc3437 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -59,7 +59,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="HWHName" id="HWHName" class="layui-input" readonly value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -71,7 +71,7 @@
</div>
<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 type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -81,7 +81,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -499,7 +499,7 @@
}
});
-
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
@@ -536,7 +536,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -1047,9 +1047,7 @@
}
- //#endregion
-
- });
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
index faa766e..55f8246 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
@@ -59,7 +59,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,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="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -101,7 +101,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -111,7 +111,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -173,6 +173,7 @@
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
+ </div>
</form>
</div>
</div>
@@ -994,7 +995,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
index 97f188f..cd00e09 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
@@ -63,7 +63,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<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 type="text" name="HSecManagerName" readonly id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -259,7 +259,7 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -295,7 +295,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -992,7 +992,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index 7ad8187..3cf064c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -63,7 +63,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="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -73,7 +73,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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -97,7 +97,7 @@
<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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -239,13 +239,13 @@
break;
}
});
-
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
-
+
//琛ㄥご淇℃伅浠撳簱寮圭獥
form.on('submit(WareHouse)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -461,7 +461,7 @@
default:
}
});
-
+
//淇濆瓨
form.on('submit(Saver)', function (data) {
//debugger;
@@ -469,42 +469,44 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldOtherOutBill/SaveGetMouldOtherOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldOtherOutBill/SaveGetMouldOtherOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ 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);
}
- 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);
- }
- });
});
//鎵撳嵃Printing
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherOutBill&OpenTmp=鍣ㄥ叿鍏朵粬鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherOutBill&OpenTmp=鍣ㄥ叿鍏朵粬鍑哄簱鏉＄爜");
});
@@ -512,7 +514,7 @@
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherOutBill&OpenTmp=鍣ㄥ叿鍏朵粬鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherOutBill&OpenTmp=鍣ㄥ叿鍏朵粬鍑哄簱鏉＄爜");
});
@@ -887,49 +889,39 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨鍣ㄥ叿浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSecManagerID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨棰嗘枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HKeeperID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨鍙戞枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HMaintainItemID == "") {
- layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HMaintainItem == "") {
- layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HManagerNumber == "") {
- layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐ｄ换浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
-
}
}
- //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
- // sSubStr1 = JSON.parse(sSubStr1);
- // for (var i = 0; i < sSubStr1.length; i++) {
- // if (sSubStr1[i].HMaterNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr1[i].HUnitNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr[i].HManagerNumber == "") {
- // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // }
- //}
else {
return Result = true;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index bdc811b..d6935ce 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -30,7 +30,6 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
-
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
@@ -43,12 +42,12 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
</div>
- </div>
+ </div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
+ <li class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
<h1 style="text-align:center;"><b>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</b></h1>
@@ -76,7 +75,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -88,7 +87,7 @@
</div>
<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 type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -98,7 +97,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -108,7 +107,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -136,7 +135,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="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -525,7 +524,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -551,11 +550,16 @@
//棰勮
form.on("submit(planview)", function (data) {
if (linterid != "" || linterid != null) {
- var InterID = data[0].hmainid.toString();
- layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
- //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- //window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
}
else {
layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
@@ -565,11 +569,16 @@
//鎵撳嵃
form.on("submit(print)", function (data) {
if (linterid != "" || linterid != null) {
- var InterID = data[0].hmainid.toString();
- layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
- //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- //window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldProdInBill&OpenTmp=鍣ㄥ叿閲囪喘鍏ュ簱鍗�");
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
}
else {
layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
@@ -841,15 +850,21 @@
}
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ //buttonArr = [];//娓呯┖鏁扮粍
+ //for (var i = 0; i < tableBak.length; i++) {
+ // buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ //}
+ //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
}
//澶嶅埗涓�琛�
function btnCopyLine(data) {
@@ -1206,7 +1221,7 @@
}
//#endregion
-
+
});
</script>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
index 47e2e3b..857b853 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
@@ -63,7 +63,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<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 type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -987,7 +987,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index ae52277..b4c61fb 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -63,7 +63,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,7 +75,7 @@
</div>
<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 type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -85,7 +85,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -95,7 +95,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -538,7 +538,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -555,7 +555,7 @@
}
});
});
-
+
//鐩戝惉鍗曞厓鏍肩紪杈�
table.on('edit(mainTable)', function (obj) {
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
@@ -696,7 +696,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": sBillType},
+ data: { "HBillType": sBillType },
success: function (d) {
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
@@ -917,7 +917,7 @@
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
HSPID: "",
- HSPCode:"",
+ HSPCode: "",
HSPName: "",
});
@@ -979,7 +979,7 @@
}
})
}
-
+
//寰�鏉ュ崟浣�
function getSupType() {
var type = $("#HSupTypeID").val();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
index f88e3d9..4bda711 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
@@ -72,7 +72,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="HRepairName" id="HRepairName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,7 @@
</div>
<div class="layui-row">
<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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -94,7 +94,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="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -104,9 +104,9 @@
</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="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -114,9 +114,9 @@
</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="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -621,7 +621,7 @@
}
//debugger;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- if (data.field.HNewMaterID=="") {
+ if (data.field.HNewMaterID == "") {
data.field.HNewMaterID = "0";
}
var sMainStr = JSON.stringify(data.field);
@@ -642,7 +642,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
index 98d7157..28cf4a8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
@@ -74,7 +74,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="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,7 @@
</div>
<div class="layui-row">
<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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,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="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -106,7 +106,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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<div class="layui-row">
<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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -128,7 +128,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -147,7 +147,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -294,7 +294,7 @@
var option = [];
var sWhere = "";
var sBillType = "3826";
- TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"]};
+ TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] };
//#endregion
@@ -596,7 +596,7 @@
}
});
});
-
+
//鏂板
form.on('submit(set_AddNew)', function (data) {
@@ -635,7 +635,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -730,14 +730,14 @@
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairInBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairInBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍏ュ簱鏉＄爜");
});
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairInBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairInBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍏ュ簱鏉＄爜");
});
//鍏抽棴褰撳墠椤�
@@ -935,16 +935,16 @@
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.澶囨敞 //澶囨敞
//=========================================================
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 == null?"": formatDate(data.鍒跺崟鏃ユ湡)
- , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
- , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" :formatDate(data.鍏抽棴鏃ユ湡)
- , "HUpDater": data.淇敼浜�
- , "HDeleteMan": data.浣滃簾浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(data.鍒跺崟鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(data.鍏抽棴鏃ユ湡)
+ , "HUpDater": data.淇敼浜�
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
@@ -1143,12 +1143,32 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HKeeperID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("浠撶鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSupID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("缁翠慨鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("缁翠慨閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("閫佷慨浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HEmpID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("涓氬姟鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
index def653e..e5024f2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
@@ -40,7 +40,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -77,7 +77,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="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -89,7 +89,7 @@
</div>
<div class="layui-row">
<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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -99,7 +99,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="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -109,7 +109,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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -121,7 +121,7 @@
</div>
<div class="layui-row">
<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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -131,7 +131,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -150,7 +150,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -297,7 +297,7 @@
var option = [];
var sWhere = "";
var sBillType = "3825";
- TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
+ TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
//#endregion
@@ -636,7 +636,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -731,14 +731,14 @@
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairOutBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairOutBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍑哄簱鏉＄爜");
});
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairOutBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldRepairOutBill&OpenTmp=鍣ㄥ叿鏀瑰埗鍑哄簱鏉＄爜");
});
//鍏抽棴褰撳墠椤�
@@ -941,7 +941,7 @@
, "HUpDater": data.淇敼浜�
, "HDeleteMan": data.浣滃簾浜�
, "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(data.淇敼鏃ユ湡)
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(data.浣滃簾鏃ユ湡)
});
} else {
@@ -1139,12 +1139,32 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
- layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
- layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HKeeperID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("浠撶鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSupID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("缁翠慨鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("缁翠慨閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("閫佷慨浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HEmpID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("涓氬姟鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index ba5dd1f..eb038f8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -66,7 +66,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -78,7 +78,7 @@
</div>
<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 type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -88,7 +88,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -98,7 +98,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="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -108,7 +108,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -130,7 +130,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="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -229,7 +229,7 @@
var option = [];
var sWhere = "";
var sBillType = "3831";
- TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
+ TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -550,7 +550,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -582,14 +582,14 @@
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapInBill&OpenTmp=鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapInBill&OpenTmp=鍣ㄥ叿鎶ュ簾鍏ュ簱鏉＄爜");
});
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapInBill&OpenTmp=鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapInBill&OpenTmp=鍣ㄥ叿鎶ュ簾鍏ュ簱鏉＄爜");
});
//鍏抽棴褰撳墠椤�
@@ -1157,7 +1157,7 @@
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
-
+
if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
layer.msg("浠撳簱涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 44bfc86..167b87e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -66,7 +66,7 @@
</div>
<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 type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -76,7 +76,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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,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="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -571,7 +571,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -592,14 +592,14 @@
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapOutBill&OpenTmp=鍣ㄥ叿澶勭悊鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapOutBill&OpenTmp=鍣ㄥ叿鐢熶骇棰嗙敤鏉＄爜");
});
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapOutBill&OpenTmp=鍣ㄥ叿澶勭悊鍑哄簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HMouldScrapOutBill&OpenTmp=鍣ㄥ叿鐢熶骇棰嗙敤鏉＄爜");
});
//閫�鍑�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index ceab950..7691042 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -61,7 +61,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="HMouldCode" id="HMouldCode" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
<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 type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -107,7 +107,7 @@
</div>
<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 type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -117,7 +117,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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -127,7 +127,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -164,7 +164,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="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
@@ -197,7 +197,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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -286,7 +286,7 @@
var option;
var sBillType = "3807";
var TabRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " " };
- //#endregion
+ //#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -328,7 +328,7 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
+
});
//鎴愬搧妯″叿寮圭獥
form.on('submit(ProductModulList)', function () {
@@ -635,7 +635,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -654,7 +654,7 @@
}
});
- //#endregion
+ //#endregion
//#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
//鍒濆鍖栬〃鍗曟彃浠�
@@ -1044,14 +1044,14 @@
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
}
-
+
//#endregion
//#region 鏁版嵁楠岃瘉
function AllowLoadData(sSubStr) {
-
- if ($("#HMouldCode").val() == '') {
+
+ if ($("#HMouldCodeHMouldCode").val() == '') {
layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
@@ -1110,7 +1110,7 @@
return false;
}
//鍒ゆ柇鐗╂枡鏄庣粏椤�
- if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr=="[]") {
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
@@ -1134,7 +1134,7 @@
return true;
}
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
index 0a83aae..3680372 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
@@ -61,7 +61,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" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,7 @@
</div>
<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 type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;">
@@ -84,7 +84,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -110,7 +110,7 @@
</div>
<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 type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -120,7 +120,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -471,7 +471,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -809,7 +809,7 @@
function AllowLoadData(sSubStr) {
if ($("#HMouldID").val() == '' && $("#HName").val() == '') {
- layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("浜у搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if ($("#HConkTypeID").val() == '' && $("#HConkTypeName").val() == '') {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index b8ee771..172f8bc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -56,7 +56,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="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,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="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
@@ -169,7 +169,7 @@
, element = layui.element;
var option;
var sBillType = "3807";
- var TabRow = { "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "","HManagerName":"", "HRemark": "" };
+ var TabRow = { "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -289,7 +289,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HManagerID: checkStatus.data[0].HItemID,
@@ -341,7 +341,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -582,10 +582,37 @@
}
}
- // 闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
var Result = true;
-
+ if ($("#HMouldID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨浜у搧鍣ㄥ叿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HPlanInterID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨鐐规璁″垝鍐呯爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HDotCheckItem == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HManagerNumber == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
return Result;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
index fb565c0..52994ee 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
@@ -2436,35 +2436,37 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/SaveGetMouldDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/SaveGetMouldDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ 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);
}
- 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);
- }
- });
});
//棰勮Printing
form.on("submit(view)", function (data) {
@@ -2562,26 +2564,7 @@
//$("#HItemID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
+
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -2594,24 +2577,21 @@
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index b3bbfad..3fbbdfa 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -56,7 +56,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="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -74,7 +74,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="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
@@ -224,7 +224,7 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//Tab鍒囨崲
//element.on('tab(TabTest)', function (data) {
-
+
//})
// 澶村伐鍏锋爮浜嬩欢
@@ -593,7 +593,7 @@
{
return false;
}
-
+
$.ajax(
{
type: "POST",
@@ -606,7 +606,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -846,28 +846,16 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
}
//澧炲姞涓�琛�
function btnAddLine1(NewRow) {
- var tableBak = table.cache["mainTable1"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable1", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ table.cache["mainTable1"].push(NewRow);
+ option2.data = table.cache["mainTable1"];
+ table.render(option2);
}
//澶嶅埗涓�琛�
@@ -915,9 +903,9 @@
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
obj.del();
option.data.splice(rowIndex, 1);//鍒犻櫎缂撳瓨鐨勮
- table.reload('mainTable',option);
+ table.reload('mainTable', option);
layer.close(index);
-
+
});
}
}
@@ -944,7 +932,7 @@
layer.msg("浜у搧鍣ㄥ叿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr =="[]") {
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index dfbb5d1..e11ee21 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
.layui-form-label {
- width: 85px;
+ width: 95px;
}
</style>
</head>
@@ -74,13 +74,13 @@
</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="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</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="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -220,7 +220,7 @@
if (event.key == "F7") {
if (obj.event === 'HMaintainItemNumber') //閰嶄欢浠ｇ爜
{
-
+
}
obj.event = "";
return false;
@@ -241,33 +241,35 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/SaveGetMouldMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ //console.log("Reason" + sMainStr);
+ }
+ });
+ }
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/SaveGetMouldMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
- }
- });
});
//棰勮
@@ -502,26 +504,6 @@
});
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -535,15 +517,6 @@
return false;
}
if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
if (parseFloat(sSubStr[i].HQty) > 0) {
s = 1;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
index b908a7d..035fb16 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
@@ -61,7 +61,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" value="" style="float:left;width:150px;">
<input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -99,7 +99,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -111,7 +111,7 @@
</div>
<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 type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -391,8 +391,8 @@
}
});
- });
-
+ });
+
//淇濆瓨
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
@@ -411,7 +411,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -439,7 +439,7 @@
Pub_Close(1);
}
});
-
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -455,7 +455,7 @@
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- Table();
+ Table();
}
//鍒濆鍖栦繚鍏婚」鍒楄〃
function Table() {
@@ -485,7 +485,7 @@
}
};
}
-
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -625,7 +625,7 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
}
-
+
// 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
@@ -646,7 +646,7 @@
});
}
}
-
+
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index c16ae5e..e6b3178 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -63,7 +63,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="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
@@ -73,7 +73,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="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -83,7 +83,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="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
@@ -97,7 +97,7 @@
<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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -188,7 +188,7 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏叡鍙橀噺
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -199,7 +199,7 @@
//鏌ヨ鏉′欢
var option = [];
var sBillType = "3827";
- var TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" ,"HStockOrgID": sessionStorage["OrganizationID"]};
+ var TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "", "HStockOrgID": sessionStorage["OrganizationID"] };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -240,7 +240,7 @@
break;
}
});
-
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -405,42 +405,44 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldOtherInBill/SaveGetMouldOtherInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldOtherInBill/SaveGetMouldOtherInBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
+ 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);
}
- 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);
- }
- });
});
//鎵撳嵃Printing
form.on("submit(view)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherInBill&OpenTmp=鍣ㄥ叿鍏朵粬鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherInBill&OpenTmp=鍣ㄥ叿鍏朵粬鍏ュ簱鏉＄爜");
});
@@ -448,7 +450,7 @@
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID);
//window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
- window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherInBill&OpenTmp=鍣ㄥ叿鍏朵粬鍏ュ簱鍗�");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hID + "&Type=HMouldOtherInBill&OpenTmp=鍣ㄥ叿鍏朵粬鍏ュ簱鏉＄爜");
});
@@ -888,8 +890,20 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
- layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HWHID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨鍣ㄥ叿浠撳簱", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSecManagerID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨棰嗘枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HKeeperID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨鍙戞枡浜�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HDeptID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -910,27 +924,6 @@
}
}
- //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
- // sSubStr1 = JSON.parse(sSubStr1);
- // for (var i = 0; i < sSubStr1.length; i++) {
- // if (sSubStr1[i].HMaterNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr1[i].HUnitNumber == "") {
- // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // if (sSubStr[i].HManagerNumber == "") {
- // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- // }
- // }
- //}
else {
return Result = 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 80a657b..37e78b1 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"
@@ -62,7 +62,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -76,7 +76,7 @@
</div>
<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 type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -118,7 +118,7 @@
</div>
<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="HConkBeginDate" id="HConkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -167,7 +167,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script>
-//鑾峰彇鍙傛暟
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -201,7 +201,7 @@
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate',
- format:'yyyy-MM-dd',
+ format: 'yyyy-MM-dd',
});
laydate.render({
@@ -228,8 +228,8 @@
, { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠ｇ爜', edit: 'text', event: "HConkReasonCode" }
, { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜鍚嶇О', edit: 'text' }
, { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
- , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
- , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode"}
+ , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+ , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
, { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
@@ -239,7 +239,7 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": 0,"HManagerCode":"", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": " ", "HConkExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " }];
table.render(option);
}
else {
@@ -323,7 +323,7 @@
}
});
}
-
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
@@ -491,7 +491,7 @@
/* RoadBillSub(linterid);*/
}
- //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+ //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -529,7 +529,7 @@
});
});
- //琛ㄥご淇℃伅鍙戠幇浜哄脊绐�
+ //琛ㄥご淇℃伅鍙戠幇浜哄脊绐�
form.on('submit(HEmpList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -567,7 +567,7 @@
});
});
- //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
+ //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
form.on('submit(HManagerList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -605,7 +605,7 @@
});
});
- //琛ㄥご淇℃伅璁惧寮圭獥
+ //琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(HEquipList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -689,7 +689,7 @@
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
-
+
@@ -720,34 +720,36 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ 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);
- }
- });
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
});
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -822,27 +824,20 @@
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
}
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
if ($("#HDeptName").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HEmpID").val() == '') {
+ layer.msg("鍙戠幇浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HManagerID").val() == '') {
+ layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -851,28 +846,28 @@
layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HConkBeginDate").val() == '') {
+ layer.msg("鏁呴殰鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HConkReasonID == "" || sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁呴殰鍘熷洜浠ｇ爜淇℃伅娌￠��!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HManagerID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭病閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ else {
+ return true;
+ }
}
}
else {
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 1b54d68..9d9f414 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"
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<style type="text/css">
.layui-form-label {
- width: 85px;
+ width: 95px;
}
</style>
</head>
@@ -62,7 +62,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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -75,13 +75,13 @@
</div>
<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="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -101,7 +101,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 class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
@@ -109,7 +109,7 @@
</div>
<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 type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
@@ -119,7 +119,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -135,9 +135,9 @@
</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="HTimes" id="HTimes" class="layui-input" value="">
+ <input type="text" name="HTimes" id="HTimes" class="layui-input" value="" style="margin-left:5px">
</div>
</div>
</div>
@@ -482,7 +482,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -882,6 +882,9 @@
}
}
}
+ else {
+ return true;
+ }
}
//#endregion
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 f1cad6f..5d0d539 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"
@@ -62,7 +62,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="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
@@ -76,7 +76,7 @@
</div>
<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 type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -96,7 +96,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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -106,7 +106,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 class="layui-input" name="HCheckBeginDate" id="HCheckBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
@@ -405,34 +405,36 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ 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);
- }
- });
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
});
//閫�鍑�
@@ -757,27 +759,23 @@
}
//闈炵┖楠岃瘉
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
+ function AllowLoadData(sSubStr) {
if ($("#HDeptName").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HSecManager").val() == '') {
+ if ($("#HEmpName").val() == '') {
layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HManagerName").val() == '') {
+ layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
+ if ($("#HEquipName").val() == '') {
+ layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
if ($("#HBillNo").val() == '') {
layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -786,28 +784,25 @@
layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HCheckBeginDate").val() == '') {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ //鍒ゆ柇鐗╂枡鏄庣粏椤�
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HRepairCheckID == "" || sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,楠屾敹椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HManagerID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ else {
+ return true;
+ }
}
}
else {
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 7aa6063..d4f92b4 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"
@@ -67,7 +67,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="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
@@ -81,7 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐐规璁″垝缂栧彿</label>
<div class="layui-input-inline">
- <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" >
+ <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -164,9 +164,9 @@
, laydate = layui.laydate
, element = layui.element;
- var option=[];
+ var option = [];
var sBillType = "3903";
- var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "","HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
//#endregion
@@ -186,7 +186,7 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
-
+
//#endregion
@@ -266,7 +266,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -283,7 +283,7 @@
}
});
}
-
+
})
//閫�鍑烘寜閽�
@@ -602,6 +602,9 @@
}
}
}
+ else {
+ return true;
+ }
}
//#endregion
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 0c2dc5a..80fe2b7 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"
@@ -62,7 +62,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="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
@@ -236,34 +236,36 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
+ if (AllowLoadData(sSubStr)) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
+ 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);
- }
- });
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
});
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(HEquipList)', function () {
@@ -405,10 +407,10 @@
, "HEquipID": data.璁惧ID
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.鐐规鍛ㄦ湡
- , "HBeginDate":data.寮�濮嬫棩鏈�
+ , "HBeginDate": data.寮�濮嬫棩鏈�
, "HEndDate": data.缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
- ,"HRemark":data.琛ㄥご澶囨敞
+ , "HRemark": data.琛ㄥご澶囨敞
});
} else {
@@ -587,6 +589,31 @@
}
})
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+ if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HManagerID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ }
+ }
+ else {
+ return Result;
+ }
+ }
//閿欒淇℃伅
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -595,9 +622,9 @@
//#endregion
-
+
});
- </script>
+ </script>
</body>
</html>
\ No newline at end of file
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 8d2a8a4..c9b427f 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"
@@ -63,7 +63,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="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
@@ -336,7 +336,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -352,7 +352,7 @@
console.log("Reason" + sMainStr);
}
});
-
+
});
//棰勮Printing
form.on("submit(view)", function (data) {
--
Gitblit v1.9.1