From aacae8dd0e0655f00249543a7457b8be3c11662a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 14 十月 2021 15:53:12 +0800
Subject: [PATCH] 调拨单 增加 组织 部门根据组织过滤
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html | 6 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 167 +++++++++++++++++++++++++++++++++++++++++--------------
WebTM/views/Baseset/基础资料/Gy_WarehouseList.html | 4 +
3 files changed, 131 insertions(+), 46 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
index 4b67f6b..ea9d7d2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
@@ -47,6 +47,7 @@
}
var params = getUrlVars();
var Type = params[params[0]];
+ var HOtherOrgID = params[params[1]];
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
@@ -93,6 +94,9 @@
if (Value == null) {
Value = '';
}
+ if (HOtherOrgID > 0) {
+ Value = HOtherOrgID;
+ }
$.ajax({
type: "get",
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetWarehouseList_Json",
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 86be75b..0dfffc5 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"
@@ -113,58 +113,66 @@
<div class="layui-inline">
<label class="layui-form-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="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;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
-
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label">璋冩嫧绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
+ <option value="鍚岀粍缁囪皟鎷�">鍚岀粍缁囪皟鎷�</option>
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ <div class="layui-form-item">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</div>
</div>
</div>
</div>
</div>
</div>
- </div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
</form>
</div>
</div>
@@ -174,7 +182,6 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -222,6 +229,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 500
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
@@ -239,9 +247,13 @@
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgCode', title: '璋冨嚭缁勭粐浠ｇ爜', edit: 'text', event: 'HOtherOrgCode', width: 120 }
+ , { field: 'HOtherOrgName', title: '璋冨嚭缁勭粐', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
, { field: 'HWHCode', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '璋冨叆浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HWHName', title: '璋冨叆浠撳簱', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '璋冨叆浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
, { field: 'HSPName', title: '璋冨叆浠撲綅', edit: 'text', width: 100 }
@@ -254,12 +266,11 @@
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
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, "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, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -292,13 +303,14 @@
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, "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, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "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]);
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+
rows++;
//layer.msg('澧炲姞涓�琛屾寜閽紒')
break;
@@ -316,7 +328,7 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
+
}
break;
}
@@ -388,6 +400,59 @@
});
}
+ if (obj.event === 'HOtherOrgCode') //璋冨叆浠撳簱浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁勭粐鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/Organizations.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ var HStockStyle = $("#HStockStyle").val();
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁� {
+ {
+ if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屽綋鍓嶇粍缁囷細' + sessionStorage["Organization"] + '璇烽�夋嫨鍏朵粬缁勭粐');
+ }
+ }
+ else {
+ if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛岃閫夋嫨褰撳墠缁勭粐锛�' + sessionStorage["Organization"]);
+ }
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HOtherOrgID: checkStatus.data[0].HItemID,
+ HOtherOrgCode: checkStatus.data[0].HNumber,
+ HOtherOrgName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
if (obj.event === 'HWHCode') //璋冨叆浠撳簱浠ｇ爜
{
//椤甸潰灞�-鑷畾涔�
@@ -399,7 +464,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -470,6 +535,10 @@
}
if (obj.event === 'HSCWHCode') //璋冨嚭浠撳簱浠ｇ爜
{
+ var HOtherOrgID = obj.data.HOtherOrgID;
+ if (HOtherOrgID == 0 || HOtherOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨嚭缁勭粐');
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -479,7 +548,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HOtherOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -674,7 +743,7 @@
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HWHID": data.HWHID1 //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
, "HKeeperID": data.hkeeperid //淇濈鍛業D
@@ -685,6 +754,7 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
});
} else {
@@ -955,6 +1025,8 @@
//}
}
});
+
+
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -1000,6 +1072,7 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ var HStockStyle = $("#HStockStyle").val();
var Result = true;
if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1016,7 +1089,7 @@
if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, 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;
@@ -1036,6 +1109,14 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+ 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.html"
index 85c81b1..462f924 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_MouldMoveStockStepInBillList.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_MouldMoveStockStepInBillList.html"
@@ -152,9 +152,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- //, { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125 }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
@@ -175,6 +174,7 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100, hide: true }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
--
Gitblit v1.9.1