From cbf09f88d0e6f44d428c76c9ede8bc095edfbc5e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 07 三月 2024 11:20:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 4
WebTM/views/设备管理/Sb_EquipRepairCheckBillList_PDA.html | 7
WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html | 7
WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html | 10
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 134 +++++++++-
WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html | 7
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 30 ++
WebTM/views/基础资料/公用基础资料/Gy_EquipType.html | 49 ++++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 17 +
WebTM/views/Baseset/基础资料/Gy_WorkCenterList.html | 30 ++
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 234 +++++++++++++++++--
WebTM/views/设备管理/Sb_EquipConkBookBillList_PDA.html | 7
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 135 +++++++++-
13 files changed, 584 insertions(+), 87 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
index f7136ac..3ef47bc 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -38,7 +38,8 @@
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
- , layer = layui.layer;
+ , layer = layui.layer;
+
//蹇�熸煡璇�
form.on('submit(HQuery)', function () {
//var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -53,14 +54,35 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
- RoadQuery($('#Value').val());
+
+ RoadQuery($('#Value').val());
+
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
, data: []
//, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'radio' }
+ { type: 'checkbox' }
, { field: 'HItemID', title: 'HItemID', hide: true }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', sort: true }
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_EquipType.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_EquipType.html"
index c7fd8fc..3dc4a37 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_EquipType.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_EquipType.html"
@@ -52,6 +52,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></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="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -123,6 +125,14 @@
break;
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -395,7 +405,44 @@
else {
layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
}
- }
+ }
+
+ // 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佺鐢ㄥ悧?", function (index) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_EquipTypeBill/StopGy_EquipTypeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//淇敼鎸夐挳
function set_ShowBill() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 1c07150..24f56a0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -58,6 +58,7 @@
<div class="layui-input-block">
<input type="radio" name="FixedItems" value="SProc" title="宸ュ簭">
<input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
+ <input type="radio" name="FixedItems" value="SWorkCenter" title="宸ヤ綔涓績">
<input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
</div>
</div>
@@ -114,6 +115,22 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" 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 type="text" class="layui-input" name="HWorkCenterName" id="HWorkCenterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HWorkCenterID" id="HWorkCenterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkCenter" id="btnSearchWorkCenter" 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 type="text" class="layui-input" name="HWorkCenterNumber" id="HWorkCenterNumber" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -251,7 +268,7 @@
var option = [];
var HModName = "Gy_ProcPrice";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","HDeptID","HMaterIDCol","HProcIDCol","HSourceIDCol"];
+ var titleData = ["HItemID", "HDeptID", "HMaterIDCol", "HProcIDCol", "HSourceIDCol"];
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -295,9 +312,11 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
- "HProcNumberCol": "", "HProcNameCol": "","HSourceIDCol":"", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
"HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
- "HRemarkCol": ""
+ "HRemarkCol": "",
+ "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
+ "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -315,6 +334,11 @@
NewRow.HProcIDCol = $("#HProcID").val();
NewRow.HProcNumberCol = $("#HProcNumber").val();
NewRow.HProcNameCol = $("#HProcName").val();
+ }
+ else if (FixedItems == "SWorkCenter") {
+ NewRow.HWorkCenterID = $("#HWorkCenterID").val();
+ NewRow.HWorkCenterNumber = $("#HWorkCenterNumber").val();
+ NewRow.HWorkCenterName = $("#HWorkCenterName").val();
}
NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
NewRow.HEndDateCol = "2100-01-01";
@@ -404,7 +428,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -419,7 +443,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -429,14 +453,84 @@
}
});
}
+ else if (obj.event == 'inputHPrice') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ //鍙兘杈撳叆灏忔暟鐐瑰拰鏁板瓧锛屼繚鐣�6浣嶅皬鏁�
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHWorkQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHStdEmp') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeTimes') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeMoney') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHProcNo') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHPieceTimes') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHMouldQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeMouldMoney') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHRushQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == 'HMaterCheck')
- {
+ if (obj.event == 'HMaterCheck') {
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '鐗╂枡鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -445,7 +539,7 @@
content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index]
+ var iframeWindow = window['layui-layer-iframe' + index]
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
@@ -472,11 +566,10 @@
}
});
}
- if (obj.event == 'HProcCheck')
- {
+ if (obj.event == 'HProcCheck') {
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '宸ュ簭鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -485,7 +578,7 @@
content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index]
+ var iframeWindow = window['layui-layer-iframe' + index]
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
@@ -504,7 +597,7 @@
, HMaterModelCol: $("#HMaterModel").val()
});
}
- layer.close(layer.index);
+ layer.close(layer.index);
}
, btn2: function (index, layero) {
},
@@ -542,7 +635,37 @@
}
});
}
-
+ if (obj.event == 'HWorkCenterCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HWorkCenterID: checkStatus.data[0].HItemID
+ , HWorkCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ , HWorkCenterName: checkStatus.data[0].宸ヤ綔涓績
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -730,15 +853,54 @@
}
});
});
+ //琛ㄥご淇℃伅宸ヤ綔涓績寮圭獥
+ form.on('submit(btnSearchWorkCenter)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+ $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HWorkCenterNumber").val(checkStatus.data[0].宸ヤ綔涓績浠ｇ爜);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
rowdata = [{
"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
- "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
"HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
- "HRemarkCol": ""
+ "HRemarkCol": "",
+ "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
+ "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
}];
option = {
elem: '#mainTable'
@@ -748,11 +910,11 @@
, limit: 50
, height: 'full-250'
, cellMinWidth: 90
- , cols: [[
+ , cols: [[
{ type: 'checkbox' }
, { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
, { field: 'HMaterNumberCol', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterCheck", width: 200 }
- , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
+ , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
, { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
, { field: 'HProcNumberCol', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
@@ -760,7 +922,19 @@
, { field: 'HSourceIDCol', title: '璧勬簮ID', edit: 'text', hide: true }
, { field: 'HSourceNumberCol', title: '璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
- , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
+ , { field: 'HPriceCol', title: '鍗曚环', edit: 'text', event: "inputHPrice" }
+ , { field: 'HWorkCenterID', title: '宸ヤ綔涓績ID', edit: 'text', hide: true }
+ , { field: 'HWorkCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck", width: 120 }
+ , { field: 'HWorkCenterName', title: '宸ヤ綔涓績', edit: 'text', width: 120 }
+ , { field: 'HWorkQty', title: '灏忔椂浜ц兘', edit: 'text', event: "inputHWorkQty" }
+ , { field: 'HStdEmp', title: '鏍囧噯浜哄姏', edit: 'text', event: "inputHStdEmp" }
+ , { field: 'HChangeTimes', title: '鎹㈢嚎鏃堕棿', edit: 'text', event: "inputHChangeTimes" }
+ , { field: 'HChangeMoney', title: '鎹㈢嚎琛ヨ创', edit: 'text', event: "inputHChangeMoney" }
+ , { field: 'HProcNo', title: '宸ヨ壓璺嚎娴佹按鍙�', edit: 'text', width: 150, event: "inputHProcNo" }
+ , { field: 'HPieceTimes', title: '鍗曚欢鍔犲伐鏃堕棿', edit: 'text', width: 150, event: "inputHPieceTimes" }
+ , { field: 'HMouldQty', title: '妯″叿鏁伴噺', edit: 'text', event: "inputHMouldQty" }
+ , { field: 'HChangeMouldMoney', title: '鎹㈡ā琛ヨ创', edit: 'text', event: "inputHChangeMouldMoney" }
+ , { field: 'HRushQty', title: '鍗曚欢鍐叉娆℃暟', edit: 'text', width: 150, event: "inputHRushQty" }
, { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', event: "HBeginDateCol" }
, { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', event: "HEndDateCol" }
, { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
@@ -839,7 +1013,7 @@
if (HItemID == '' || HItemID == null) {
HItemID = 0;
}
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
type: "GET",
@@ -860,16 +1034,26 @@
, "HDeptID": d.data[0].Hdeptid
, "HMakeDate": Format(new Date(d.data[0].鍒跺崟鏃ユ湡), 'yyyy-MM-dd')
, "HMaker": d.data[0].鍒跺崟浜�
+ , "HWorkCenterID": d.data[0].HWorkCenterID
+ , "HWorkCenterNumber": d.data[0].宸ヤ綔涓績浠ｇ爜
+ , "HWorkCenterName": d.data[0].宸ヤ綔涓績
});
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
- "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].鐗╂枡浠ｇ爜, "HMaterNameCol": d.data[i].鐗╂枡鍚嶇О, "HMaterModelCol": d.data[i].瑙勬牸鍨嬪彿, "HProcIDCol": d.data[i].HProcID,
- "HProcNumberCol": d.data[i].宸ュ簭浠ｇ爜, "HProcNameCol": d.data[i].宸ュ簭鍚嶇О, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].璧勬簮浠ｇ爜, "HSourceNameCol": d.data[i].璧勬簮鍚嶇О, "HPriceCol": d.data[i].鍗曚环,
- "HBeginDateCol": Format(new Date(d.data[i].寮�濮嬫棩鏈�), 'yyyy-MM-dd'), "HEndDateCol": Format(new Date(d.data[i].缁撴潫鏃ユ湡), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true), "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
- "HRemarkCol": d.data[i].澶囨敞
+ "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].鐗╂枡浠ｇ爜, "HMaterNameCol": d.data[i].鐗╂枡鍚嶇О,
+ "HMaterModelCol": d.data[i].瑙勬牸鍨嬪彿, "HProcIDCol": d.data[i].HProcID, "HProcNumberCol": d.data[i].宸ュ簭浠ｇ爜,
+ "HProcNameCol": d.data[i].宸ュ簭鍚嶇О, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].璧勬簮浠ｇ爜,
+ "HSourceNameCol": d.data[i].璧勬簮鍚嶇О, "HPriceCol": d.data[i].鍗曚环, "HBeginDateCol": Format(new Date(d.data[i].寮�濮嬫棩鏈�), 'yyyy-MM-dd'),
+ "HEndDateCol": Format(new Date(d.data[i].缁撴潫鏃ユ湡), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true),
+ "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
+ "HRemarkCol": d.data[i].澶囨敞,
+ "HWorkCenterID": d.data[i].HWorkCenterID, "HWorkCenterNumber": d.data[i].宸ヤ綔涓績浠ｇ爜, "HWorkCenterName": d.data[i].宸ヤ綔涓績,
+ "HWorkQty": d.data[i].灏忔椂浜ц兘, "HStdEmp": d.data[i].鏍囧噯浜哄姏, "HChangeTimes": d.data[i].鎹㈢嚎鏃堕棿, "HChangeMoney": d.data[i].鎹㈢嚎琛ヨ创,
+ "HProcNo": d.data[i].宸ヨ壓璺嚎娴佹按鍙�, "HPieceTimes": d.data[i].鍗曚欢鍔犲伐鏃堕棿, "HMouldQty": d.data[i].妯″叿鏁伴噺,
+ "HChangeMouldMoney": d.data[i].鎹㈡ā琛ヨ创, "HRushQty": d.data[i].鍗曚欢鍐叉娆℃暟
});
}
option.data = rowdata;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 8a73f8d..58acfca 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -358,6 +358,20 @@
<input type="text" class="layui-input" name="HNextMainDate" id="HNextMainDate" readonly>
</div>
</div>
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鍒嗙被</label>
+ <div class="layui-input-block">
+ <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
+ <option value="妯″叿" selected="selected">妯″叿</option>
+ <option value="宸ヨ">宸ヨ</option>
+ <option value="澶瑰叿">澶瑰叿</option>
+ <option value="鍒�鍏�">鍒�鍏�</option>
+ <option value="妫�鍏�">妫�鍏�</option>
+ <option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1250,6 +1264,7 @@
$("#HBarCode").val(d.data[0].鏉＄爜缂栧彿);
$("#HMadeSupID").val(d.data[0].HMadeSupID);
$("#HMadeSupName").val(d.data[0].鍒堕�犲巶鍟�);
+ $("#HMouldClass").val(d.data[0].鍣ㄥ叿鍒嗙被);
//$("#HNowSupID").val(d.data[0].HNowSupID);
//$("#HNowSupName").val(d.data[0].铏氭嫙浠�);
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
@@ -1258,6 +1273,8 @@
if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
}
+
+ form.render('select');
}
});
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 04468ad..de77ef0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -8,11 +8,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css">
- </style>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
-
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <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/layui/lay/modules/table.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -47,7 +54,16 @@
</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"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -68,27 +84,23 @@
</div>
</div>
</div>
- <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/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , soulTable = layui.soulTable
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
var sWhere = "";
var option = [];
//#endregion
@@ -156,6 +168,8 @@
//鏌ヨ
get_Display(sWhere);
+ //鏌ヨ鍣ㄥ叿鍒嗙被
+ get_Display_Tree();
}
//鍒濆鍖栬〃鏍�
@@ -497,6 +511,89 @@
}
}
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Mould/TreeList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ } else {
+ sql = " and HMouldTypeID='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ 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;
+ }
+
//鍒锋柊
function get_Refresh() {
$("#HNumber").val("");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
index 37e359c..a39868a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EqpMaintenanceBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairCheckID1", "HManagerID1", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "WX" },
+ data: { "sWhere": sWhere, "Type": "WX", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
index 47a064c..c57fa3b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipConkBookBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HConkReasonID","HManagerID1"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "GZ" },
+ data: { "sWhere": sWhere, "Type": "GZ", "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index d77c8e2..52e28f4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -98,6 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckBillList_PDA";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID","璐熻矗浜篒D","hsubid","HBillType"];
//#endregion
@@ -167,9 +169,9 @@
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
+ //鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
}
@@ -194,7 +196,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "DJ" },
+ data: { "sWhere": sWhere, "Type": "DJ", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +211,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -370,7 +372,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid","璁惧ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index d0c8af5..0bf5279 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipMaintainBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hsubid","閰嶄欢ID","鍗曚綅ID","hmaterid","HBillType","HEquipMaintainRuleInterID","婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "BY" },
+ data: { "sWhere": sWhere, "Type": "BY", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
index fa73f23..0d13c85 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
@@ -108,7 +108,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipRepairCheckBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HConkReasonID", "HManagerID1","HRepairCheckID1"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -204,7 +205,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "YS" },
+ data: { "sWhere": sWhere, "Type": "YS", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -219,7 +220,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index b3736b2..eaef1ec 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -8,9 +8,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css"></style>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <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/layui/lay/modules/table.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -45,7 +54,16 @@
</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"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -66,27 +84,23 @@
</div>
</div>
</div>
- <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/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , soulTable = layui.soulTable
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
var sWhere = "";
var option = [];
//#endregion
@@ -153,6 +167,8 @@
//鏌ヨ
get_Display(sWhere);
+ //鏌ヨ璁惧鍒嗙被
+ get_Display_Tree();
}
//鍒濆鍖栬〃鏍�
@@ -268,6 +284,7 @@
}
});
}
+
//蹇�熻繃婊�
function get_FastQuery() {
@@ -484,6 +501,89 @@
}
}
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_EquipFileMain/TreeGetList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ 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
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ } else {
+ sql = " and HEquipFileTypeID='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ 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;
+ }
+
//鍒锋柊
function get_Refresh() {
$("#HNumber").val("");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
index 6cf0643..afd8877 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
@@ -290,6 +290,10 @@
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
</form>
</div>
</div>
@@ -655,14 +659,18 @@
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPRDORGID": data.缁勭粐,
- "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HPRDORGID": 0,//data.缁勭粐,
+ "HPRDORGName": '',//data.缁勭粐鍚嶇О,
"HUnitID": data.HUnitID,
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -690,10 +698,16 @@
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
case "MO00":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -714,10 +728,16 @@
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
}
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
index f3581b9..ce1819c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_ColorRecordBill_PDA.html"
@@ -290,6 +290,7 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
</form>
</div>
</div>
@@ -670,6 +671,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -701,6 +703,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": 0,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -729,6 +732,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
--
Gitblit v1.9.1