From 427b546470bcf0c26a4dae277358375ca19b3ba9 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 09 十一月 2023 19:57:27 +0800
Subject: [PATCH] 生产订单变更单：去掉网格
---
WebTM/views/生产管理/生产订单变更单/Sc_ICMOChangeBill.html | 1073 ++++++++++++++++++++++++++++++++---------------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 3
3 files changed, 588 insertions(+), 492 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index c0cc4a4..f33ffc4 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3597,7 +3597,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>11/07/2023 23:22:14</publishTime>
+ <publishTime>11/09/2023 19:34:38</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3726,7 +3726,7 @@
<publishTime>11/08/2023 09:01:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html">
- <publishTime>11/09/2023 16:24:12</publishTime>
+ <publishTime>11/09/2023 19:55:48</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBillList.html">
<publishTime>11/09/2023 16:25:36</publishTime>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index d016984..2c9eb7f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -864,6 +864,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var hID = data[0].hmainid.toString();
+ var HEntryID = data[0].hsubid.toString();
layer.open({
type: 2
, area: ['100%', '100%']
@@ -872,7 +873,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1'
+ , content: '../../鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1&HEntryID=' + HEntryID
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
index 5d157cc..76093ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
@@ -78,9 +78,9 @@
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -88,27 +88,81 @@
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </button>-->
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width:900px;">
+ <div class="layui-inline" style="width:623px;">
<label class="layui-form-label">瀹㈡埛</label>
- <div class="layui-input-inline" style="width:700px;">
- <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:465px;">
- <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+ <div class="layui-input-inline">
+ <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="width:501px;">
+ <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </button>-->
</div>
</div>
- <div class="layui-inline" style="position: relative; left: -280px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁￠噺鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍘熸暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQty_Old" id="HQty_Old" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏂版暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HQty_New" id="HQty_New" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label">鍙樻洿鍘熷洜</label>
<div class="layui-input-block">
<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 501px;">
</div>
</div>
</div>
@@ -119,12 +173,6 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 501px;">
</div>
</div>
</div>
@@ -220,7 +268,7 @@
</div>
</div>
<!--瀛愯〃1-->
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <!--<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>
@@ -234,14 +282,14 @@
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
- </script>
+ </script>-->
</form>
</div>
</div>
</div>
- <script type="text/html" id="barDemo">
+ <!--<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
+ </script>-->
<script>
//#region 鎶樺彔娉ㄩ噴
@@ -262,7 +310,7 @@
, element = layui.element;
//瀛愯〃娓叉煋鍙傛暟
- var option = {};
+ /*var option = {};*/
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
@@ -275,6 +323,7 @@
var params = get_UrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[4]]; //鑾峰彇鍗曟嵁瀛恑d
//#endregion
@@ -292,7 +341,7 @@
else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(linterid);
//瀛愯〃鍒濆鍖�
- set_InitGrid();
+ //set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
}
@@ -335,7 +384,7 @@
//#region 淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
//if (AllowLoadData(data)) {
- set_SaveBill(data);
+ set_SaveBill(data);
//}
});
//#endregion
@@ -353,73 +402,73 @@
//#region 瀛愯〃鐩稿叧鐩戝惉浜嬩欢
//#region 瀛愯〃1锛氬ご宸ュ叿鏍忔寜閽Е鍙戜簨浠�
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;;
+ //table.on('toolbar(mainTable)', function (obj) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;;
- //鏂板琛岃〃鏍兼暟鎹�
- var NewRow = {
- "HMaterID": "0",
- "鐗╂枡浠ｇ爜": "",
- "鐗╂枡鍚嶇О": "",
- "瑙勬牸鍨嬪彿": "",
- "HUnitID": "0",
- "璁￠噺鍗曚綅": "",
- "HQty_Old": "0",
- "HQty_New": "0",
- //"HDate_Old": "",
- //"HDate_New": "",
+ // //鏂板琛岃〃鏍兼暟鎹�
+ // var NewRow = {
+ // "HMaterID": "0",
+ // "鐗╂枡浠ｇ爜": "",
+ // "鐗╂枡鍚嶇О": "",
+ // "瑙勬牸鍨嬪彿": "",
+ // "HUnitID": "0",
+ // "璁￠噺鍗曚綅": "",
+ // "HQty_Old": "0",
+ // "HQty_New": "0",
+ // //"HDate_Old": "",
+ // //"HDate_New": "",
- "HRemark": "",
- "HSourceInterID": "0",
- "HSourceEntryID": "0",
- "HSourceBillNo": "",
- "HSourceBillType": ""
- };
- switch (obj.event) {
- //鏂板涓�琛�
- case 'btn-AddLine': btnAddLine(NewRow);
- break;
- //澶嶅埗涓�琛�
- case 'btn-CopyLine': btnCopyLine(data);
- break;
- //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
- case 'btn-InsertLine': btnInsertLine(NewRow)
- break;
- //涓婄Щ
- case 'btn-Up': btn_up();
- break;
- //涓嬬Щ
- case 'btn-Under': btn_under();
- break;
- //鍒楄缃�
- case 'set_HideColumn':
- get_HideColumn();
- break;
- }
- });
+ // "HRemark": "",
+ // "HSourceInterID": "0",
+ // "HSourceEntryID": "0",
+ // "HSourceBillNo": "",
+ // "HSourceBillType": ""
+ // };
+ // switch (obj.event) {
+ // //鏂板涓�琛�
+ // case 'btn-AddLine': btnAddLine(NewRow);
+ // break;
+ // //澶嶅埗涓�琛�
+ // case 'btn-CopyLine': btnCopyLine(data);
+ // break;
+ // //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+ // case 'btn-InsertLine': btnInsertLine(NewRow)
+ // break;
+ // //涓婄Щ
+ // case 'btn-Up': btn_up();
+ // break;
+ // //涓嬬Щ
+ // case 'btn-Under': btn_under();
+ // break;
+ // //鍒楄缃�
+ // case 'set_HideColumn':
+ // get_HideColumn();
+ // break;
+ // }
+ //});
//#endregion
//#region 琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- //璁剧疆 鏂板畬宸ユ椂闂�
- if (obj.event == 'HDate_New') {
- var data = obj.data;
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- }
- });
- }
- });
+ //table.on('tool(mainTable)', function (obj) {
+ // set_GridDelete(obj); //琛屽唴鍒犻櫎
+ // set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ // //璁剧疆 鏂板畬宸ユ椂闂�
+ // if (obj.event == 'HDate_New') {
+ // var data = obj.data;
+ // var field = $(this).data('field');
+ // laydate.render({
+ // elem: this.firstChild
+ // , show: true //鐩存帴鏄剧ず
+ // , closeStop: this
+ // , done: function (nowDate) {
+ // //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ // data[field] = nowDate;
+ // obj.update(data);
+ // }
+ // });
+ // }
+ //});
//#endregion
//#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
@@ -530,59 +579,59 @@
//#endregion
//#region 瀛愯〃1鍒濆鍖�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , limit: 500
- , height: 500
- , loading: false
- , cols: [[ //瀛愯〃
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
- , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
- , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }//f7
- , { field: 'HQty_Old', title: '鍘熸暟閲�', width: 100}
- , { field: 'HQty_New', title: '鏂版暟閲�', width: 100, edit: 'text' }
- //, { field: 'HDate_Old', title: '鍘熶氦璐ф棩鏈�', edit: 'text', width: 120 }
- //, { field: 'HDate_New', title: '鏂颁氦璐ф棩鏈�', event: "HDate_New", width: 120 }
- , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+ //function set_InitGrid() {
+ // option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , limit: 500
+ // , height: 500
+ // , loading: false
+ // , cols: [[ //瀛愯〃
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
+ // , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ // , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+ // , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+ // , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+ // , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ // , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }//f7
+ // , { field: 'HQty_Old', title: '鍘熸暟閲�', width: 100}
+ // , { field: 'HQty_New', title: '鏂版暟閲�', width: 100, edit: 'text' }
+ // //, { field: 'HDate_Old', title: '鍘熶氦璐ф棩鏈�', edit: 'text', width: 120 }
+ // //, { field: 'HDate_New', title: '鏂颁氦璐ф棩鏈�', event: "HDate_New", width: 120 }
+ // , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ // , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ // , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', hide: true, style: 'background-color: #f9f9f9;' } //f7
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
- }
+ // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ // ]]
+ // }
- var rowdata = [{
- "HMaterID": "0",
- "鐗╂枡浠ｇ爜": "",
- "鐗╂枡鍚嶇О": "",
- "瑙勬牸鍨嬪彿": "",
- "HUnitID": "0",
- "璁￠噺鍗曚綅": "",
- "HQty_Old": "0",
- "HQty_New": "0",
- //"HDate_Old": "",
- //"HDate_New": "",
+ //var rowdata = [{
+ // "HMaterID": "0",
+ // "鐗╂枡浠ｇ爜": "",
+ // "鐗╂枡鍚嶇О": "",
+ // "瑙勬牸鍨嬪彿": "",
+ // "HUnitID": "0",
+ // "璁￠噺鍗曚綅": "",
+ // "HQty_Old": "0",
+ // "HQty_New": "0",
+ // //"HDate_Old": "",
+ // //"HDate_New": "",
- "HRemark": "",
- "HSourceInterID": "0",
- "HSourceEntryID": "0",
- "HSourceBillNo": "",
- "HSourceBillType": ""
- }];
+ // "HRemark": "",
+ // "HSourceInterID": "0",
+ // "HSourceEntryID": "0",
+ // "HSourceBillNo": "",
+ // "HSourceBillType": ""
+ //}];
- option.data = rowdata;
- table.render(option);
- }
+ // option.data = rowdata;
+ // table.render(option);
+ //}
//#endregion
//#region 鏂板椤甸潰鍒濆鍖�
@@ -599,8 +648,8 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栧苟鍒楄缃細瀛愯〃1
- set_InitGrid();
- DisPlay_HideColumn();
+ //set_InitGrid();
+ //DisPlay_HideColumn();
}
//#endregion
@@ -639,46 +688,56 @@
, "HInnerBillNo": data.HInnerBillNo
, "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟浜� == "" ? "" :formatDate(data.鍒跺崟鏃ユ湡)
+ , "HMakeDate": data.鍒跺崟浜� == "" ? "" : formatDate(data.鍒跺崟鏃ユ湡)
, "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼浜� == ""?"":formatDate(data.淇敼鏃ユ湡)
+ , "HUpDateDate": data.淇敼浜� == "" ? "" : formatDate(data.淇敼鏃ユ湡)
, "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳浜� == "" ? "" :formatDate(data.瀹℃牳鏃ユ湡)
+ , "HCheckDate": data.瀹℃牳浜� == "" ? "" : formatDate(data.瀹℃牳鏃ユ湡)
, "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴浜� == "" ? "" :formatDate(data.鍏抽棴鏃ユ湡)
+ , "HCloseDate": data.鍏抽棴浜� == "" ? "" : formatDate(data.鍏抽棴鏃ユ湡)
, "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾浜� == "" ? "" :formatDate(data.浣滃簾鏃ユ湡)
+ , "HDeleteDate": data.浣滃簾浜� == "" ? "" : formatDate(data.浣滃簾鏃ユ湡)
+
+
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.鐗╂枡浠ｇ爜
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HUnitID": data.HUnitID
+ , "HUnitName": data.璁￠噺鍗曚綅
+ , "HQty_Old": data.鍘熸暟閲�
+ , "HQty_New": data.鏂版暟閲�
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HOrgIDBar = data.HOrgID;
//瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- rowdata.push(
- {
- "HMaterID": result.data[i]["HMaterID"],
- "鐗╂枡浠ｇ爜": result.data[i]["鐗╂枡浠ｇ爜"],
- "鐗╂枡鍚嶇О": result.data[i]["鐗╂枡鍚嶇О"],
- "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
- "HUnitID": result.data[i]["HUnitID"],
- "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
- "HQty_Old": result.data[i]["鍘熸暟閲�"],
- "HQty_New": result.data[i]["鏂版暟閲�"],
- //"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
- //"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
- "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
- "HSourceInterID": result.data[i]["HSourceInterID"],
- "HSourceEntryID": result.data[i]["HSourceEntryID"],
- "HSourceBillNo": result.data[i]["HSourceBillNo"],
- "HSourceBillType": result.data[i]["HSourceBillType"]
- }
- );
- }
- option.data = rowdata;
+ //var rowdata = [];
+ //for (var i = 0; i < result.data.length; i++) {
+ // rowdata.push(
+ // {
+ // "HMaterID": result.data[i]["HMaterID"],
+ // "鐗╂枡浠ｇ爜": result.data[i]["鐗╂枡浠ｇ爜"],
+ // "鐗╂枡鍚嶇О": result.data[i]["鐗╂枡鍚嶇О"],
+ // "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ // "HUnitID": result.data[i]["HUnitID"],
+ // "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ // "HQty_Old": result.data[i]["鍘熸暟閲�"],
+ // "HQty_New": result.data[i]["鏂版暟閲�"],
+ // //"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
+ // //"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
+ // "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
+ // "HSourceInterID": result.data[i]["HSourceInterID"],
+ // "HSourceEntryID": result.data[i]["HSourceEntryID"],
+ // "HSourceBillNo": result.data[i]["HSourceBillNo"],
+ // "HSourceBillType": result.data[i]["HSourceBillType"]
+ // }
+ // );
+ //}
+ //option.data = rowdata;
- table.render(option);
+ //table.render(option);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -703,13 +762,13 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栧苟鍒楄缃細瀛愯〃1
- set_InitGrid();
- DisPlay_HideColumn();
+ //set_InitGrid();
+ //DisPlay_HideColumn();
//鏌ヨ鐢熶骇璁㈠崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
- var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "'";
+ var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "' and HEntryID=" + HEntryID;
$.ajax({
url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
type: "GET",
@@ -723,7 +782,11 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HEmpID": data.HEmpID
- , "HEmpName": data.閿�鍞憳
+ , "HEmpName": data.涓氬姟鍛�
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.鐢熶骇杞﹂棿
+ , "HCusID": data.HEntryCusID
+ , "HCusName": data.瀹㈡埛
//, "HDeptID": data.HDeptID
//, "HDeptName": data.鐢熶骇杞﹂棿
@@ -731,39 +794,50 @@
//, "HCusName": data.瀹㈡埛
, "HMainSourceInterID": linterid
+ , "HMainSourceEntryID": HEntryID
, "HMainSourceBillNo": data.鍗曟嵁鍙�
, "HMainSourceBillType": params[params[2]]
+
+
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterModel": data.瑙勬牸鍨嬪彿
+ , "HUnitID": data.HUnitID
+ , "HUnitName": data.璁￠噺鍗曚綅
+ , "HQty_Old": data.鐢熶骇浠诲姟鍗曟暟閲�
+ , "HQty_New": data.鐢熶骇浠诲姟鍗曟暟閲�
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HOrgIDBar = data.HOrgID;
//瀛愯〃 璧嬪��
- var rowdata = [];
- for (var i = 0; i < result.data.length; i++) {
- rowdata.push(
- {
- "HMaterID": result.data[i]["HMaterID"],
- "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
- "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
- "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
- "HUnitID": result.data[i]["HUnitID"],
- "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
- "HQty_Old": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
- "HQty_New": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
- //"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
- //"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
- "HRemark": "",
- "HSourceInterID": result.data[i]["hmainid"],
- "HSourceEntryID": result.data[i]["HEntryID"],
- "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
- "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"]
- }
- );
- }
- option.data = rowdata;
+ //var rowdata = [];
+ //for (var i = 0; i < result.data.length; i++) {
+ // rowdata.push(
+ // {
+ // "HMaterID": result.data[i]["HMaterID"],
+ // "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ // "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ // "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ // "HUnitID": result.data[i]["HUnitID"],
+ // "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ // "HQty_Old": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ // "HQty_New": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ // //"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
+ // //"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
+ // "HRemark": "",
+ // "HSourceInterID": result.data[i]["hmainid"],
+ // "HSourceEntryID": result.data[i]["HEntryID"],
+ // "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ // "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"]
+ // }
+ // );
+ //}
+ //option.data = rowdata;
- table.render(option);
+ //table.render(option);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -860,7 +934,7 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType==4) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
data.field.HChangeDate = new Date();
}
@@ -876,9 +950,30 @@
$("#HUpDater").val(sessionStorage["HUserName"]);
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
}
+
+
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
+ var subTable = [{
+ "HMaterID": $("#HMaterID").val(),
+ "鐗╂枡浠ｇ爜": $("#HMaterNumber").val(),
+ "鐗╂枡鍚嶇О": $("#HMaterName").val(),
+ "瑙勬牸鍨嬪彿": $("#HMaterModel").val(),
+ "HUnitID": $("#HUnitID").val(),
+ "璁￠噺鍗曚綅": $("#HUnitName").val(),
+ "HQty_Old": $("#HQty_Old").val(),
+ "HQty_New": $("#HQty_New").val(),
+ //"HDate_Old": "",
+ //"HDate_New": "",
+
+ "HRemark": "",
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillNo": "",
+ "HSourceBillType": ""
+ }];
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(option.data);
+ //var sSubStr = JSON.stringify(option.data);
+ var sSubStr = JSON.stringify(subTable);
//鎷兼帴鍙傛暟
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
@@ -969,7 +1064,7 @@
if (temp == 0 || temp == "") {
layer.msg("姹囩巼涓嶈兘涓�0鎴栫┖!");
return false;
- } else if (!ref.test(temp)){
+ } else if (!ref.test(temp)) {
layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return false;
}
@@ -1124,333 +1219,333 @@
//#endregion
//#region 鍦ㄦ湯灏惧鍔犱竴琛�
- function btnAddLine(NewRow) {
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
- table.render(option);
- //rows++;
- layer.msg('澧炲姞涓�琛屾寜閽紒')
- }
+ //function btnAddLine(NewRow) {
+ // table.cache["mainTable"].push(NewRow);
+ // option.data = table.cache["mainTable"];
+ // table.render(option);
+ // //rows++;
+ // layer.msg('澧炲姞涓�琛屾寜閽紒')
+ //}
//#endregion
//#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
- function btnInsertLine(NewRow) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var tables = []; //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
- //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
- var rowList = table.cache['mainTable'];
- for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
- tables.push(option.data[i]);
- if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
- tables.push(NewRow);
- }
- }
- option.data = tables;
- table.render(option);
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
+ //function btnInsertLine(NewRow) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var tables = []; //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+ // //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ // var rowList = table.cache['mainTable'];
+ // for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ // tables.push(option.data[i]);
+ // if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ // tables.push(NewRow);
+ // }
+ // }
+ // option.data = tables;
+ // table.render(option);
+ // } else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ // }
+ //}
//#endregion
//#region 澶嶅埗涓�琛�
- function btnCopyLine(data) {
- var copydata = JSON.stringify(data);
- if (data.length <= 0) {
- layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
- }
- else if (data.length > 1) {
- layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
- }
- else {
- var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
- var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
- table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- //璁剧疆澶嶅埗寰楀埌鐨勮褰曠殑瀹為檯绉伴噸涓�0
- option.data[option.data.length - 1].HWeight = "0";
+ //function btnCopyLine(data) {
+ // var copydata = JSON.stringify(data);
+ // if (data.length <= 0) {
+ // layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ // }
+ // else if (data.length > 1) {
+ // layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ // }
+ // else {
+ // var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ // var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ // table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ // option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ // //璁剧疆澶嶅埗寰楀埌鐨勮褰曠殑瀹為檯绉伴噸涓�0
+ // option.data[option.data.length - 1].HWeight = "0";
- table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- }
- }
+ // table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ // }
+ //}
//#endregion
//#region 涓婄Щ
- function btn_up() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (data.length == 1) {
- var tables = [];
- //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
- var rowList = table.cache['mainTable'];
- for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
- if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
- //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
- if (i == 0) {
- layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
- return;
- }
- tables.push(option.data[i - 1]);
- data[0].LAY_CHECKED = true;
- option.data[i - 1] = data[0];
- option.data[i] = tables[0];
- table.render(option);
- break;
- }
- }
- } else {
- layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- }
- }
+ //function btn_up() {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (data.length == 1) {
+ // var tables = [];
+ // //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ // var rowList = table.cache['mainTable'];
+ // for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ // if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ // //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+ // if (i == 0) {
+ // layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+ // return;
+ // }
+ // tables.push(option.data[i - 1]);
+ // data[0].LAY_CHECKED = true;
+ // option.data[i - 1] = data[0];
+ // option.data[i] = tables[0];
+ // table.render(option);
+ // break;
+ // }
+ // }
+ // } else {
+ // layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ // }
+ //}
//#endregion
//#region 涓嬬Щ
- function btn_under() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (data.length == 1) {
- var tables = [];
- //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
- var rowList = table.cache['mainTable'];
- for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
- if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
- //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
- if (i == option.data.length - 1) {
- layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
- return;
- }
+ //function btn_under() {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (data.length == 1) {
+ // var tables = [];
+ // //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+ // var rowList = table.cache['mainTable'];
+ // for (var i = 0; i < rowList.length; i++) { //閬嶅巻琛ㄦ牸鐨勮
+ // if (rowList[i].LAY_CHECKED == true) { //鑾峰彇閫変腑琛岀殑浣嶇疆
+ // //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+ // if (i == option.data.length - 1) {
+ // layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+ // return;
+ // }
- tables.push(option.data[i + 1]);
- data[0].LAY_CHECKED = true;
- option.data[i + 1] = data[0];
- option.data[i] = tables[0];
- table.render(option);
- break;
- }
- }
- } else {
- layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- }
- }
+ // tables.push(option.data[i + 1]);
+ // data[0].LAY_CHECKED = true;
+ // option.data[i + 1] = data[0];
+ // option.data[i] = tables[0];
+ // table.render(option);
+ // break;
+ // }
+ // }
+ // } else {
+ // layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ // }
+ //}
//#endregion
//#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
- function set_GridDelete(obj) {
- var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
- if (obj.event === 'del') {
- layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
- layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
- //obj.del();
- //layer.close(index);
- var oldData = table.cache["mainTable"];
- oldData.splice(obj.tr.data('index'), 1);
- option.data = oldData;
- table.render(option);
- layer.close(index);
- }
- });
- }
- }
+ //function set_GridDelete(obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'del') {
+ // layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ // console.log("绱㈠紩涓�:" + rowIndex);
+ // if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ // } else {
+ // //obj.del();
+ // //layer.close(index);
+ // var oldData = table.cache["mainTable"];
+ // oldData.splice(obj.tr.data('index'), 1);
+ // option.data = oldData;
+ // table.render(option);
+ // layer.close(index);
+ // }
+ // });
+ // }
+ //}
//#endregion
//#region 琛屽唴蹇嵎閿瓫閫�
- function set_GridCellCheck(obj) {
- $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- //鐗╂枡
- if (obj.event == "HMaterID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐗╂枡鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ //function set_GridCellCheck(obj) {
+ // $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ // if (event.key == "F7") {
+ // //鐗╂枡
+ // if (obj.event == "HMaterID") {
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "鐗╂枡鍒楄〃" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["90%", "90%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鎸夐挳涓� 鐨勫洖璋�
+ // var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
+ // if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //璁￠噺鍗曚綅
- if (obj.event == "HUnitID") {
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ // })
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ // }
+ // //璁￠噺鍗曚綅
+ // if (obj.event == "HUnitID") {
+ // layer.open({
+ // type: 2
+ // , skin: "layui-layer-rim" //鍔犱笂杈规
+ // , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ // , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ // , shift: 2 //寮瑰嚭鍔ㄧ敾
+ // , area: ["90%", "90%"] //绐椾綋澶у皬
+ // , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ // , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ // , btn: ["纭畾", "鍙栨秷"]
+ // , btn1: function (index, laero) {
+ // //鎸夐挳涓� 鐨勫洖璋�
+ // var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
- , "HUnitID": checkStatus.data[0].HItemID
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- obj.event = "";
- return false;
- }
- })
- }
+ // if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // }
+ // //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ // obj.update({
+ // "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ // , "HUnitID": checkStatus.data[0].HItemID
+ // })
+ // layer.close(index);//鍏抽棴寮圭獥
+ // }
+ // })
+ // }
+ // obj.event = "";
+ // return false;
+ // }
+ // })
+ //}
//#endregion
//#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
- 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 杩涜缂栫爜
+ //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;
+ // 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);//鍏抽棴寮圭獥
- }
- })
- }
+ // 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 瀛愯〃1锛氭樉绀哄垪鏁版嵁
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- async: false,
- success: function (data1) {
- if (data1.data.length != 0) {
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //titleData = [];
+ //function DisPlay_HideColumn() {
+ // $.ajax({
+ // url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ // type: "GET",
+ // data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ // async: false,
+ // success: function (data1) {
+ // if (data1.data.length != 0) {
+ // var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ // var titleData = ["HMaterID", "HUnitID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ // //titleData = [];
- dataCol = data1.data[0].HGridString.split(',');
+ // 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 = 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 });
- }
- })
- }
+ // //鍙栨秷鍐荤粨鍒�
+ // 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
--
Gitblit v1.9.1