From 8da566f7461a594bc4bcca1d805c357a02742633 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 12 五月 2025 16:26:12 +0800
Subject: [PATCH] 部门，计量单位，仓库，部门，物料类型优化
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 58 +
WebTM/views/基础资料/公用基础资料/Gy_MaterTypeEdit.html | 133 ++++
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 36 +
WebTM/views/基础资料/公用基础资料/Gy_MaterType.html | 448 ++++++++++------
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 264 +++++++---
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 323 ++++++-----
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 114 ++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 157 +++++
8 files changed, 1,085 insertions(+), 448 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/Add_Edit_Gy_Department.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
index 6c99be9..a517fba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +35,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +44,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -71,7 +74,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -96,27 +99,89 @@
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-tab-item">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏄惁鐢熶骇杞﹂棿锛�</label>
+ <div class="layui-input-inline">
+ <select name="HWorkShopFlag" id="HWorkShopFlag" lay-verify="HWorkShopFlag">
+ <option value="true">鏄�</option>
+ <option value="false">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬浜烘暟锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEmpQtys" id="HEmpQtys" autocomplete="off" value="0">
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏉″舰鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
</div>
- <input id="HItemID" name="HItemID" type="hidden" />
- <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
</div>
</div>
+ </div>
</div>
</div>
</form>
@@ -173,6 +238,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -239,6 +319,11 @@
set_SaveBill(data);
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//#endregion
@@ -284,6 +369,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Department/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -317,6 +403,14 @@
//, "HCreateDate": data.鍒涘缓鏃ユ湡
//, "HUpDater": data.淇敼浜�
//, "HUpDateDate": data.淇敼鏃ユ湡
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
+ , "HEmpQtys": data["閮ㄩ棬浜烘暟"]
+ , "HWorkShopFlag": (data["鏄惁鐢熶骇杞﹂棿"]+"")
});
layer.close(ajaxLoad);
} else {
@@ -330,6 +424,31 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/AuditGy_Department',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -383,7 +502,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?HType=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -414,6 +533,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
</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/Add_Edit_Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
index 6ffbfe6..4eecdb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
@@ -20,19 +20,20 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
+
</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>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
<h1 style="text-align:center;"><b>璁￠噺鍗曚綅</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -62,7 +63,7 @@
<div class="layui-col-xs4">
<label class="layui-form-label">鎹㈢畻姣斿垪锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input" value="1">
</div>
</div>
@@ -74,9 +75,19 @@
</div>
</div>
<div class="layui-col-xs4">
+ <label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float: left; width: 150px;">
+ <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
<label class="layui-form-label"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -95,6 +106,54 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -109,6 +168,9 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
@@ -126,7 +188,7 @@
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ /*var hID = params[params[0]];//缂栬緫鏌ョ湅*/
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -138,6 +200,14 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -179,6 +249,14 @@
, "HStandard": data.榛樿鏍囪
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
+ , "HUnitGroupID": data.HUnitGroupID
+ , "HUnitGroupName": data.璁￠噺鍗曚綅缁勫悕绉�
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
});
} else {
@@ -198,14 +276,28 @@
var shijian = year + "-" + month + "-" + day;
//鍒ゆ柇鏄惁鏂板
- if (hID == 1) {
+ if (OperationType == 1) {
//id new
$("#HItemID").val(0);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HItemID").val(hID);//淇敼鏃朵富琛↖D
RoadBillMain(hID);
-
/* RoadBillSub(linterid);*/
}
//绂佺敤鏍囧織
@@ -218,83 +310,32 @@
$("#HStandard").val(data.elem.checked);
});
- //閫夋嫨浜у搧寮圭獥
- form.on('submit(HMateria-BT)', function () {//浜у搧
+ //閫夋嫨璁￠噺鍗曚綅缁�
+ form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
- //閫夋嫨宸ュ簭
- form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
-
- //閫夋嫨渚涘簲鍟�
- form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '渚涘簲鍟嗗垪琛�'
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitGroup.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
}
- })
- });
-
- //閫夋嫨閮ㄩ棬
- form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '閮ㄩ棬鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitGroupName").val(checkStatus.data[0].璁￠噺鍗曚綅缁�);
+ $("#HUnitGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
- });
- //閫夋嫨鍗曚綅
- form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '鍗曚綅鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
+ , btn2: function (index, layero) { }
})
});
@@ -358,12 +399,16 @@
form.on('submit(Exit)', function (data) {//閫�鍑�
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
if (hID == null || hID == 0) {
- parent.location.href = "../../../views/index.html"
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
else {
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -389,6 +434,10 @@
layer.msg("璇疯緭鍏ユ崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (!(/^(0(\.\d+)?|([1-9]\d*)(\.\d+)?)$/.test($("#HRate").val()) && parseFloat($("#HRate").val()) > 0)) {
+ layer.msg("璇疯緭鍏ュぇ浜�0鐨勬崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var HRate = $("#HRate").val();
sMainStr += ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate;
@@ -403,6 +452,17 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#HItemID").val(data.data);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ set_CheckBillNoLayer();
+ }
+ else {
+ layer.close(index);
+ }
+ });
}
else {
f_alert(data.Message);
@@ -433,6 +493,52 @@
}
});
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ //瀹℃牳鏃犲脊妗�
+ function set_CheckBillNoLayer() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("瀹℃牳鎴愬姛", { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
});
//瀹氫箟鍏ㄥ眬鍙橀噺
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 75b9a13..2c15334 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -13,6 +13,8 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +36,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +45,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -83,7 +87,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HWarehouseType" id="HWarehouseType" lay-verify="required" >
+ <select name="HWarehouseType" id="HWarehouseType" lay-verify="required">
<option value="鐢熶骇浠撳簱" selected="selected">鐢熶骇浠撳簱</option>
<option value="妯″叿浠撳簱">妯″叿浠撳簱</option>
</select>
@@ -95,7 +99,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -146,6 +150,53 @@
</div>
</div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
</div>
<input id="HItemID" name="HItemID" type="hidden" value="0" />
<input id="HBarCode" name="HBarCode" type="hidden" value="0" />
@@ -208,6 +259,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -289,7 +355,10 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
@@ -334,6 +403,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Warehouse/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -385,6 +455,12 @@
//, "HMaker": data.HMaker
//, "HCreateDate": data.鍒涘缓鏃ユ湡
, "HUpDater": sessionStorage["HUserName"]
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
//, "HUpDateDate": data.淇敼鏃ユ湡
});
layer.close(ajaxLoad);
@@ -399,6 +475,32 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Warehouse/AuditGy_Warehouse',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -450,7 +552,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -481,6 +583,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
</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_DepartmentList.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_DepartmentList.html"
index 299ccfa..f54a109 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_DepartmentList.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_DepartmentList.html"
@@ -148,6 +148,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -224,6 +225,9 @@
switch (obj.event) {
//鏂板
case 'set_AddNew': set_AddNew();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
@@ -651,6 +655,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -674,7 +706,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1&&data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -706,7 +738,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
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_MaterType.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_MaterType.html"
index 44d8b2f..0aab23e 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_MaterType.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_MaterType.html"
@@ -8,7 +8,17 @@
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -24,13 +34,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
@@ -76,7 +86,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent" >
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -136,23 +146,33 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -167,7 +187,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -177,8 +197,12 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , tree = layui.tree;
var sWhere = "";
-
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "Gy_MaterType";
+ var sql = "";
+ var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -207,6 +231,34 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //瓒呴摼鎺�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鐗╂枡鍒嗙被浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -218,6 +270,9 @@
break;
case 'btn-Edit':
set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
case 'btn-Delete':
set_DeleteBill();
@@ -260,7 +315,11 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -295,8 +354,11 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栨爲褰㈠浘
+ get_Display_Tree()
+
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
Organ();
}
//#endregion
@@ -329,31 +391,31 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-80'
, page: true
, limits: [50, 500, 5000, 20000]
, limit: 50
, cellMinWidth: 90
, cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '浠ｇ爜', title: '浠ｇ爜' }
- , { field: '鍚嶇О', title: '鍚嶇О' }
- , { field: '鐭唬鐮�', title: '鐭唬鐮�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
- , { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
- , { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
- , { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
- , { field: '绂佺敤浜�', title: '绂佺敤浜�' }
- , { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
- , { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
+ //{ type: 'checkbox', fixed: 'left' }
+ //, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ //, { field: '浠ｇ爜', title: '浠ｇ爜' }
+ //, { field: '鍚嶇О', title: '鍚嶇О' }
+ //, { field: '鐭唬鐮�', title: '鐭唬鐮�' }
+ //, { field: '绛夌骇', title: '绛夌骇' }
+ //, { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
+ //, { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
+ //, { field: '澶囨敞', title: '澶囨敞' }
+ //, { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
+ //, { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
+ //, { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
+ //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ //, { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
+ //, { field: '淇敼浜�', title: '淇敼浜�' }
+ //, { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
+ //, { field: '绂佺敤浜�', title: '绂佺敤浜�' }
+ //, { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
+ //, { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
]]
};
}
@@ -363,7 +425,7 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
- $("#HOrgName").val(sessionStorage["OrganizationName"]);
+ $("#HOrgName").val(sessionStorage["Organization"]);
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent2").val("");
@@ -390,11 +452,54 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data
+ var data = [];
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
+ } else if (data[i].name == '鐗╂枡鍒嗙被浠ｇ爜') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐗╂枡鍒嗙被浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鐗╂枡鍒嗙被浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
@@ -493,12 +598,15 @@
sWhere += " and " + ColName2 + " " + com2;
}
if (HNumber) {
- sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鍚嶇О like '%" + HName + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被鍚嶇О like '%" + HName + "%'";
}
-
+ //鐗╂枡鑺傜偣sql
+ if (sql != "") {
+ sWhere += sql;
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -528,7 +636,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -559,7 +667,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -632,13 +740,41 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
}
})
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-鐗╂枡鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -718,132 +854,11 @@
//#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
- }
- //#endregion
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
-
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
}
//#endregion
@@ -864,6 +879,95 @@
form.render('select');
}
//#endregion
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
+ type: "GET",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HParentID=0 ";
+ HMaterTypeID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HMaterTypeID = 0;
+ } else {
+ sql = " and HParentID='" + data.id + "' ";
+ HMaterTypeID = data.id;
+ }
+ get_FastQuery()
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
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_MaterTypeEdit.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_MaterTypeEdit.html"
index 1057507..db0cbb0 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_MaterTypeEdit.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_MaterTypeEdit.html"
@@ -9,6 +9,9 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -47,6 +50,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鐗╂枡鍒嗙被</b></h1>
<div class="layui-tab-content">
@@ -87,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤鐘舵�侊細</label>
<div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" disabled>
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
@@ -97,7 +101,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤缁勭粐锛�*</label>
<div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" disabled>
</select>
</div>
</div>
@@ -112,14 +116,78 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -149,22 +217,46 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //鑾峰彇 閫掑叆鍙傛暟
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒濆鍖栫晫闈�
set_ClearBill();
- if (hID == null || hID == 0) {
+ if (OperationType==1) {
//id new
$("#HItemID").val(0);
- }
- else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val('');
+ $("#HUpDateDate").val('');
+ $("#HChecker").val('');
+ $("#HCheckDate").val('');
+ $("#HCloseMan").val('');
+ $("#HCloseDate").val('');
+ }else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
+
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//#endregion
@@ -215,27 +307,28 @@
/*var sWhere = " and HParentID=0 ";*/
var sWhere = "";
if (hID != "" && hID != null) {
- sWhere += " and HItemID!=" + hID;
+ sWhere += " and HItemID!=" + hID + " and 瀹℃牳浜�!='' and 绂佺敤鏍囧織=0 ";
}
$.ajax({
url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
var Parent = '<option style="color:blue;" value="0">鏃�</option>';
if (data1.count == 1) {
var data = data1.data;
for (var i = 0; i < data.length; i++) {
- Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鍚嶇О + '</option>';
+ Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鐗╂枡鍒嗙被鍚嶇О + '</option>';
}
$("#HParentID").append(Parent);
form.render('select');
} else {
- layer.close(ajaxLoad);
+
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(ajaxLoad);
+
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
@@ -305,6 +398,7 @@
$.ajax({
url: GetWEBURL() + "Gy_MaterType/Gy_MaterTypeList",
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -312,14 +406,23 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- , "HNumber": data.浠ｇ爜
- , "HName": data.鍚嶇О
+ , "HNumber": data.鐗╂枡鍒嗙被浠ｇ爜
+ , "HName": data.鐗╂枡鍒嗙被鍚嶇О
, "HHelpCode": data.HHelpCode
, "HParentID": data.HParentID
, "HUseFlag": data.浣跨敤鐘舵��
, "HUSEORGID": data.HUSEORGID
, "HRemark": data.澶囨敞
, "HStopflag": data.绂佺敤鏍囧織
+ , "HMaker": data["鍒涘缓浜�"]
+ , "HMakeDate": data["寤虹珛鏃堕棿"] == null ? "" : Format(new Date(data["寤虹珛鏃堕棿"]), "yyyy-MM-dd")
+ , "HUpDater": data["淇敼浜�"]
+ , "HUpDateDate": data["淇敼鏃堕棿"] == null ? "" : Format(new Date(data["淇敼鏃堕棿"]), "yyyy-MM-dd")
+ , "HChecker": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃堕棿"] == null ? "" : Format(new Date(data["瀹℃牳鏃堕棿"]), "yyyy-MM-dd")
+ , "HCloseMan": data["绂佺敤浜�"]
+ , "HCloseDate": data["绂佺敤鏃堕棿"] == null ? "" : Format(new Date(data["绂佺敤鏃堕棿"]), "yyyy-MM-dd")
+
});
$("#HParentID").val(data.HParentID);
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_Unit.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_Unit.html"
index 573470b..0cd70a5 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_Unit.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_Unit.html"
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -44,15 +44,16 @@
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -80,14 +81,69 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
@@ -112,6 +168,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/zgqlayui.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -131,6 +188,7 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var HModName = "Gy_Unit";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HParentID"];
@@ -143,7 +201,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "璁￠噺鍗曚綅鍒楄〃";
@@ -184,8 +242,6 @@
set_InitGrid();
//鏌ヨ
get_FastQuery()
- //杩囨护鏂规鏌ヨ
- get_DefaultModule();
}
//#endregion
@@ -268,17 +324,17 @@
, limit: 50
, cellMinWidth: 90
}
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
+ Display_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -299,6 +355,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -316,7 +375,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -331,7 +390,7 @@
case 'set_DeleteBill':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
@@ -359,7 +418,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
break;
//瀹℃牳鎸夐挳
@@ -384,7 +443,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -394,9 +453,7 @@
break;
//鎸夐挳璁剧疆
case 'set_HideButton':
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ get_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);//绗簩涓弬鏁板簲涓築illType鍩虹璧勬枡绫诲瀷鏃燘illType鐢∕odname琛ㄧず
break;
};
});
@@ -418,7 +475,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=2&linterid=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -445,7 +502,7 @@
break;
}
-
+
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
@@ -462,7 +519,7 @@
table.render(option);
});
-
+
function btnrowDouble(obj) {
var index = parent.layer.getFrameIndex(window.name);
var data = obj.data;
@@ -534,7 +591,33 @@
}
//#endregion
-
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-璁￠噺鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 蹇�熻繃婊�
@@ -544,6 +627,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -565,6 +654,48 @@
}
sWhere += " and " + ColName + " " + com;
}
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 璁￠噺鍗曚綅浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -583,6 +714,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -592,124 +729,6 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -814,7 +833,11 @@
}
}
$("#ColName").empty();
+ $("#ColName1").empty();
+ $("#ColName2").empty();
$("#ColName").append(Organization);
+ $("#ColName1").append(Organization);
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -845,7 +868,7 @@
if (HOrgName != "undefined") {
Organization = HOrgName.toString();
}
-
+
}
return addSWhere;
}
@@ -915,7 +938,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
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_Warehouse.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_Warehouse.html"
index 6d40f94..fa97079 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_Warehouse.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_Warehouse.html"
@@ -49,15 +49,17 @@
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -148,6 +150,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -225,6 +228,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -287,6 +293,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -706,6 +718,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-璁￠噺鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -730,7 +770,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -763,7 +803,7 @@
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
--
Gitblit v1.9.1