From bd4065b171f3159e2f944d2f533aa284788dbf10 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 14 一月 2025 13:09:34 +0800
Subject: [PATCH] 设备档案 增加 字段； IP地址，MAC地址，联网方式，采集类型，采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型 PDA版： 测试并完善 器具维修记录单 单据编辑 功能； 测试并完善 器具故障登记单 单据编辑功能； 优化一些其他模块页面
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 2
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillList.html | 28 +
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 14
WebTM/views/质量管理/基础建模/Gy_ErrMsgBackType.html | 12
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 80 ++--
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldRepairWorkBill_PDA.html | 39 ++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 53 +-
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html | 3
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 22
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldRepairWorkBillList_PDA.html | 2
WebTM/views/基础资料/公用基础资料/Gy_ConkTypeList_PDA.html | 106 ++++---
WebTM/views/PublicPage/RepairItemInformation_PDA.html | 142 +++++++--
WebTM/views/基础资料/公用基础资料/Gy_AreaSet.html | 8
WebTM/views/PublicPage/FaultReasonInformation.html | 127 ++++---
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldConkBookBill_PDA.html | 49 ++
WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html | 52 ++-
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 16 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 4
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 2
WebTM/views/模治具管理/模具故障维修单PDA/Sc_MouldConkBookBillList_PDA.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 59 +--
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 30 ++
23 files changed, 552 insertions(+), 302 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8f1260e..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/views/PublicPage/FaultReasonInformation.html b/WebTM/views/PublicPage/FaultReasonInformation.html
index fe45012..28dcb45 100644
--- a/WebTM/views/PublicPage/FaultReasonInformation.html
+++ b/WebTM/views/PublicPage/FaultReasonInformation.html
@@ -35,21 +35,12 @@
</div>
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
</div>
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -136,23 +127,30 @@
//});
table.on('row(mainTable)', function (obj) {
- //閫変腑琛屾敼鍙橀鑹�
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ 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棰滆壊
+ 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;
}
});
- })
+ });
+
var option = {
elem: '#mainTable'
@@ -169,55 +167,72 @@
]]
};
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+ get_Display(sWhere);
+
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
+ url: GetWEBURL() + '/PublicPageMethod/Gy_ConkReasonList_PDA',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(index);
} else {
+ layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetConkReasonValue(data);
+ parent.layer.close(index);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ //var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ //if (HNumber) {
+ // sWhere += " and HNumber like '%" + HNumber + "%'";
+ //}
+ //if (HName) {
+ // sWhere += " and HName like '%" + HName + "%'";
+ //}
+ //$.ajax({
+ // url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ //sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ get_Display($('#Value').val());
});
//浠ヤ笂鏄痩ayui妯″潡
diff --git a/WebTM/views/PublicPage/RepairItemInformation_PDA.html b/WebTM/views/PublicPage/RepairItemInformation_PDA.html
index 0f6a4fb..3e87115 100644
--- a/WebTM/views/PublicPage/RepairItemInformation_PDA.html
+++ b/WebTM/views/PublicPage/RepairItemInformation_PDA.html
@@ -34,7 +34,15 @@
<div id="treeRepairItem" lay-filter="treeRepairItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
</div>
<div>
- <div class="layui-inline" style="margin-left:5px;">
+ <div class="layui-row">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ <!--<div class="layui-inline" style="margin-left:5px;">
<label style="width: 28px;">浠ｇ爜</label>
<input type="text" name="HNumber" id="HNumber" style="width:75px">
@@ -45,7 +53,7 @@
<button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- </div>
+ </div>-->
<div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
@@ -138,7 +146,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
, { field: 'HNumber', title: '缁翠慨椤圭洰浠ｇ爜' }
@@ -146,38 +154,35 @@
]]
};
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
+
+ get_Display(sWhere);
+
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/Gy_RepairList_PDA',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ }
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+ function get_Display_old(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
type: "GET",
@@ -186,15 +191,84 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(index);
} else {
+ layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
+ layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetRepairValue(data);
+ parent.layer.close(index);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ //var HNumber = $("#HNumber").val();
+ //var HName = $("#HName").val();
+ //if (HNumber) {
+ // sWhere += " and HNumber like '%" + HNumber + "%'";
+ //}
+ //if (HName) {
+ // sWhere += " and HName like '%" + HName + "%'";
+ //}
+ //$.ajax({
+ // url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ //sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ get_Display($('#Value').val());
+ });
+
+ table.on('row(mainTable)', function (obj) {
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
+ 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棰滆壊
+ }
+
+ // 鏇存柊琛ㄦ牸缂撳瓨涓殑閫変腑鐘舵��
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
});
//浠ヤ笂鏄痩ayui妯″潡
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_AreaSet.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_AreaSet.html"
index 7ca3257..b6deb81 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_AreaSet.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_AreaSet.html"
@@ -673,6 +673,12 @@
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
-
+ <script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
+ <script>
+ translate.language.setLocal('English'); //璁剧疆鏈湴璇锛堝綋鍓嶇綉椤电殑璇锛夈�傚鏋滀笉璁剧疆锛岄粯璁よ嚜鍔ㄨ瘑鍒綋鍓嶇綉椤垫樉绀烘枃瀛楃殑璇銆� 鍙～鍐欏 'english'銆�'chinese_simplified' 绛夛紝鍏蜂綋鍙傝鏂囨。涓嬫柟鍏充簬姝ょ殑璇存槑銆�
+ translate.service.use('client.edge'); //璁剧疆鏈哄櫒缈昏瘧鏈嶅姟閫氶亾锛岀洿鎺ュ鎴风鏈韩锛屼笉渚濊禆鏈嶅姟绔� 銆傜浉鍏宠鏄庡弬鑰� http://translate.zvo.cn/43086.html
+ translate.execute();//杩涜缈昏瘧
+ </script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkTypeList_PDA.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_ConkTypeList_PDA.html"
index c954f3b..0ce781a 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_ConkTypeList_PDA.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_ConkTypeList_PDA.html"
@@ -21,35 +21,19 @@
<div class="layui-colla-item">
<div style="margin-top:5px;margin-bottom:5px;">
<div class="layui-inline" style="margin-left:5px;">
- <label style="width: 28px;">浠ｇ爜</label>
-
- <input type="text" name="HNumber" id="HNumber" style="width:75px">
-
- <label style="width: 28px;">鍚嶇О</label>
-
- <input type="text" name="HName" id="HName" style="width:75px">
- <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
</div>
<div style="margin-top:5px;">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><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>
-
- </div>
- </script>
+ </div>
</form>
</div>
</div>
@@ -88,6 +72,12 @@
set_ClearBill();
//#endregion
+
+ $('#Value').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_Display($('#Value').val());
+ }
+ });
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -132,10 +122,38 @@
//#endregion
//#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+ get_Display($('#Value').val());
});
//#endregion
+
+ table.on('row(mainTable)', function (obj) {
+ // 娓呴櫎鎵�鏈夎鐨勮儗鏅壊鍜岄�変腑鐘舵��
+ $(".layui-table-body tr").attr({ "style": "background:" }); // 鎭㈠鎵�鏈夎鑳屾櫙棰滆壊
+ $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // 娓呴櫎澶嶉�夋閫変腑鏍峰紡
+
+ // 璁剧疆褰撳墠琛岀殑閫変腑鐘舵��
+ 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棰滆壊
+ }
+
+ // 鏇存柊琛ㄦ牸缂撳瓨涓殑閫変腑鐘舵��
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+
+
+
//#endregion
@@ -154,20 +172,11 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
- , cellMinWidth: 90
- //, cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: '鏁呴殰绫诲埆浠ｇ爜', title: '鏁呴殰绫诲埆浠ｇ爜' }
- // , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆鍚嶇О' }
- // , { field: 'hlevel', title: '绛夌骇' }
- // , { field: '澶囨敞', title: '澶囨敞' }
- //]]
+ , cellMinWidth: 90
};
}
//#endregion
@@ -176,10 +185,9 @@
//#region 鏌ヨ
function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_ConkType/list',
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_ConkType/List_PDA',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -224,14 +232,9 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ /* DisPlay_HideColumn();*/
layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -283,7 +286,18 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
+
+ form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+ var index = parent.layer.getFrameIndex(window.name);
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 0) {
+ parent.layer.close(index);
+ return;
+ }
+ parent.GetConkTypeValue(data);
+ parent.layer.close(index);
+ });
//#region 鍒锋柊閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
index 03896ff..cbcf699 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBillList_PDA.html"
@@ -220,7 +220,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
index 5db1179..7d8dcf0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldConkBookBill_PDA.html"
@@ -86,9 +86,9 @@
<td class="bz_td">
<input type="text" name="HConkTypeName" class="layui-input" id="HConkTypeName" placeholder="閫夋嫨鏁呴殰绫诲埆" style="background-color:#efefef4d;">
<input type="hidden" name="HConkTypeID" id="HConkTypeID" value="0" autocomplete="off" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkType" id="ConkType" style="font-weight:bolder">...</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btn_ConkType" id="btn_ConkType" style="font-weight:bolder">...</button>
</td>
- </tr>
+ </tr>
<tr>
<th>鏁呴殰鍘熷洜<span style="color:red">*</span></th>
<td class="bz_td">
@@ -345,8 +345,8 @@
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
+ $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鏁呴殰鍙戠敓鏃ユ湡
+
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
@@ -385,7 +385,7 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
option.data = [{ "HConkReasonID": $("#HConkReasonID").val(), "HConkReasonCode": "", "HConkReasonName": $("#HConkReasonName").val(), "HConkExplanation": $("#HExplanation").val(), "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": $("#HManagerName").val(), "HRemark": " " }];
table.render(option);
-
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -432,7 +432,7 @@
//#endregion
//鏁呴殰绫诲埆
- form.on('submit(ConkType)', function () {
+ form.on('submit(btn_ConkType)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -467,7 +467,7 @@
}
});
});
-
+
//鏁呴殰鍘熷洜
form.on('submit(ConkReason)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -579,7 +579,7 @@
}
});
});
-
+
//璐熻矗浜哄脊绐�
form.on('submit(HManager)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -591,7 +591,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -617,7 +617,7 @@
}
});
});
-
+
//浠ヤ笅涓烘椤甸潰鎵�鏈夋柟娉�
//鍒濆鍖栬〃鏍�
@@ -696,7 +696,7 @@
}
if (HManagerID == "") {
return layer.msg('璇烽�夋嫨璐熻矗浜�');
- }
+ }
buttonArr = [];//娓呯┖鏁扮粍
var checkrow = {
"HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
@@ -764,7 +764,7 @@
layer.msg("鍙戠幇浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
-
+
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -788,7 +788,7 @@
return true;
}
//鎵潯鐮�
- function GetMeesageByBarCode(obj) {
+ function GetMeesageByBarCode(obj) {
var HBarCode = $('#HBarCode').val();//鏉″舰鐮�
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -827,6 +827,29 @@
}
//浠ヤ笂涓簂ayui妯″潡
});
+ function GetHEmpValue(obj) { //杩斿洖鍙戠幇浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetConkTypeValue(obj) { //鏁呴殰绫诲埆
+ $("#HConkTypeName").val(obj[0].鏁呴殰绫诲埆);
+ $("#HConkTypeID").val(obj[0].hitemid);
+ }
+
+ function GetConkReasonValue(obj) { //涓嶈壇鍘熷洜
+ $("#HConkReasonName").val(obj[0].HName);
+ $("#HConkReasonID").val(obj[0].hitemid);
+ }
+
+ function GetHManagerValue(obj) { //杩斿洖璐熻矗浜�
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+
+ function GetHEmpValue(obj) { //杩斿洖鍙戠幇浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
</script>
</body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
index 2c6bb8a..ac6742c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBillList_PDA.html"
@@ -220,7 +220,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
index f3f01e8..09c8f32 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\225\205\351\232\234\347\273\264\344\277\256\345\215\225PDA/Sc_MouldRepairWorkBill_PDA.html"
@@ -79,7 +79,7 @@
<th>婧愬崟绫诲瀷</th>
<td class="bz_td">
<select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
- <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
+ <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
<option value="3815">妯″叿鏁呴殰鐧昏鍗�</option>
</select>
</td>
@@ -115,6 +115,18 @@
<th>缁翠慨鍐呭</th>
<td class="bz_td">
<textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <th>璁″垝缁翠慨宸ユ椂</th>
+ <td class="bz_td">
+ <input type="text" name="HPlanTimes" class="layui-input" id="HPlanTimes" placeholder="璇疯緭鍏ヨ鍒掔淮淇伐鏃�" value="0">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹為檯缁翠慨宸ユ椂</th>
+ <td class="bz_td">
+ <input type="text" name="HTimes" class="layui-input" id="HTimes" placeholder="璇疯緭鍏ュ疄闄呯淮淇伐鏃�" value="0">
</td>
</tr>
<tr>
@@ -157,7 +169,7 @@
<tr>
<th>缁翠慨椤圭洰<span style=" color:red">*</span></th>
<td class="bz_td">
- <input type="text" name="HRepair" class="layui-input" id="HRepair" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
+ <input type="text" name="HRepairName" class="layui-input" id="HRepairName" placeholder="閫夋嫨缁翠慨椤圭洰" style="background-color:#efefef4d;">
<input type="hidden" name="HRepairID" id="HRepairID" value="0" autocomplete="off" class="layui-input">
<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HRepairList" id="HRepairList" style="font-weight:bolder">...</button>
</td>
@@ -588,7 +600,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -625,7 +637,7 @@
title: '璁惧缁翠慨鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html', 'yes'],
+ content: ['../../妯℃不鍏风鐞�/妯″叿鏁呴殰缁翠慨鍗昉DA/Sc_MouldConkBookBillList_PDA.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -677,7 +689,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HRepair").val(checkStatus.data[0].HName);
+ $("#HRepairName").val(checkStatus.data[0].HName);
$("#HRepairID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -940,7 +952,22 @@
}
//浠ヤ笂涓簂ayui妯″潡
});
-
+ function GetHManagerValue(obj) { //杩斿洖璐熻矗浜�
+ $("#HManagerName").val(obj[0].HName);
+ $("#HManagerID").val(obj[0].HItemID);
+ }
+ function GetHEmpValue(obj) { //杩斿洖缁翠慨浜�
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ function GetRepairValue(obj) { //杩斿洖缁翠慨椤�
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
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_BarCodeBillList.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_BarCodeBillList.html"
index 8e4f235..4566285 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_BarCodeBillList.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_BarCodeBillList.html"
@@ -40,7 +40,7 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
@@ -66,30 +66,33 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBarCode" id="HBarCode">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+ <div class="layui-row" style="margin-top: 5px; margin-left: 70px;" >
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ </div>
+ </div> <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ </div>
</div>
- </div> <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--鏄剧ず褰撳墠杩囨护鏂规-->
- <div class="layui-inline" style="margin-left:5px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -117,7 +120,7 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -144,7 +147,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -220,7 +223,7 @@
var option = [];
var ins;
- var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 9bc42e3..68d6a3b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -211,9 +211,9 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
- <option value="2" selected="selected">鏁呴殰鐧昏鍗�</option>
+ <option value="3815" selected="selected">鏁呴殰鐧昏鍗�</option>
<option value="1">鎵嬪伐褰曞叆</option>
- <option value="3">缁翠慨娲惧伐鍗�</option>
+ <option value="3843">缁翠慨娲惧伐鍗�</option>
</select>
</div>
</div>
@@ -223,7 +223,7 @@
<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+ <button type="button" lay-submit="XDHList" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -383,12 +383,12 @@
$('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
break;
//鏈夋簮鍗曟柊澧灺� 聽 鏁呴殰鐧昏鍗�
- case '2':
+ case '3815':
$('#HMainSourceBillNo').attr("disabled", true);
$('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
break;
//鏈夋簮鍗曟柊澧灺� 聽 缁翠慨娲惧伐鍗�
- case '3':
+ case '3843':
$('#HMainSourceBillNo').attr("disabled", true);
$('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
break;
@@ -712,7 +712,7 @@
//#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
var HMainSourceBillType = $("#HMainSourceBillType").val();
- if (HMainSourceBillType == "2") {
+ if (HMainSourceBillType == "3815") {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -821,7 +821,7 @@
//layer.full(index);
}
});
- } else if (HMainSourceBillType == "3") {
+ } else if (HMainSourceBillType == "3843") {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
index e4dcc4d..c74debd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
@@ -52,6 +52,9 @@
#mainTable tr {
height: 100px; /* 浣犳兂瑕佺殑琛岄珮 */
}
+ #btnSignIn,#btnErrMSg,#btnQuery,#btnEdit {
+ font-size: 36px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
</style>
</head>
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 8b4d6bd..563a5be 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"
@@ -31,6 +31,25 @@
<span>鏇村</span>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
@@ -75,7 +94,7 @@
</div>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row" style="margin-bottom:20px">
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block">
@@ -131,6 +150,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
@@ -222,36 +248,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
-
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>
- </div>
+ </div>
</div>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index 0619d6f..2bbe018 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -356,7 +356,7 @@
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
- var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
+ var sWhere = " and HWorkShopFlag =1 and HUSEORGID=" + sessionStorage["OrganizationID"];
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
@@ -453,7 +453,7 @@
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
$("#bs" + i + "").addClass('check1'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
- if (workcode != "" && workcode != null) {
+ if (HEquipID != "" && HEquipID != null) {
wktag = 1;
}
sWhere = {
@@ -464,8 +464,7 @@
}
//鏌ヨ 閮ㄩ棬+浜х嚎 4涓浘琛� 璧嬪��
- function FourReport(sWhere) {
- wktag = 0;
+ function FourReport(sWhere) {
$.ajax({
url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
type: "GET",
@@ -499,7 +498,7 @@
// 榛樿鐨刼ption缁撴瀯
var option = {
title: {
- text: '浜ц兘', // 榛樿鏍囬涓虹┖
+ text: '杩戜竷澶╀骇鑳�', // 榛樿鏍囬涓虹┖
left: 'center',
top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
textStyle: {
@@ -530,7 +529,7 @@
// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
if (chartData && chartData.length > 0) {
- option.title.text = '浜ц兘'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
+ option.title.text = '杩戜竷澶╀骇鑳�'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
option.xAxis.data = chartData.map(item => item.鏃ユ湡); // 璁剧疆x杞存暟鎹�
option.series[0].data = chartData.map(item => item['鐢熶骇鎬绘暟']); // 璁剧疆y杞存暟鎹�
@@ -561,12 +560,12 @@
mychart11.setOption(option);
}
- //鎶樼嚎鍥�
+ //鏌辩姸鍥�2
function get_LineChart(mychart22, chartData1) {
// 榛樿鐨刼ption缁撴瀯
var option = {
title: {
- text: '涓嶈壇鍘熷洜', // 榛樿鏍囬涓虹┖
+ text: '缁翠慨', // 榛樿鏍囬涓虹┖
left: 'center',
top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
textStyle: {
@@ -616,35 +615,46 @@
series: [
{
data: [], // 榛樿series鏁版嵁涓虹┖
- type: 'line', // 灏嗘煴鐘跺浘鏀逛负鎶樼嚎鍥�
- smooth: true, // 浣挎姌绾垮浘骞虫粦
- lineStyle: {
- color: '#15b1fa' // 璁剧疆绾挎潯棰滆壊
- },
- label: {
- show: true, // 鍦ㄦ姌绾垮浘涓婃樉绀烘暟鎹�
- position: 'top',
- formatter: function (params) {
- return echarts.format.addCommas(params.value);
- }
- }
+ type: 'bar'
}
]
};
+
+
// 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
if (chartData1 && chartData1.length > 0) {
option.title.text = '涓嶈壇鍘熷洜'; // 姝ｅ父鏁版嵁鏃舵病鏈夋爣棰�
option.xAxis.data = chartData1.map(item => item.涓嶈壇鍘熷洜); // 璁剧疆x杞存暟鎹�
option.series[0].data = chartData1.map(item => item['鏁伴噺']); // 璁剧疆y杞存暟鎹�
+
+ option.series[0].label = {
+ normal: {
+ show: true,
+ position: 'top',
+ formatter: function (params) {
+ return echarts.format.addCommas(params.value);
+ }
+ }
+ };
+
+ option.series[0].itemStyle = {
+ normal: {
+ color: '#15b1fa',
+ label: {
+ show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+ }
+ }
+ };
} else {
// 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
option.title.text = '鏆傛棤鏁版嵁';
}
+ // 鏇存柊鍥捐〃
mychart22.setOption(option);
}
-
+
//楗煎浘
function get_Statistics(mychart3, chartData2) {
// 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index 185225d..0217f83 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -51,7 +51,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" type="date">
</div>
</div>
<div class="layui-inline">
@@ -119,7 +119,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" type="date">
</div>
</div>
<div class="layui-inline">
@@ -184,7 +184,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
var OptionData = [];
//鑾峰彇鍙傛暟
@@ -229,15 +229,15 @@
, element = layui.element;
//甯歌鐢ㄦ硶
- laydate.render({
- elem: '#HDate',
- format: 'yyyy-MM-dd',
+ //laydate.render({
+ // elem: '#HDate',
+ // format: 'yyyy-MM-dd',
- });
- laydate.render({
- elem: '#HConkBeginDate',
- format: 'yyyy-MM-dd',
- });
+ //});
+ //laydate.render({
+ // elem: '#HConkBeginDate',
+ // format: 'yyyy-MM-dd',
+ //});
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 54807c2..7575bd2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -456,6 +456,20 @@
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 2) { //缂栬緫
+
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(HInterID);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(HMaker);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ OperationType = 1;
+ }
+ else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
@@ -521,7 +535,7 @@
$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": OperationType== 2? '': data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HICMOInterID": data.HICMOInterID
, "HICMOEntryID": data.HICMOEntryID
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
index 739efa8..2443354 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
@@ -116,6 +116,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -417,6 +418,9 @@
//鏂板鎸夐挳
case 'btn_Add': btn_Add();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫鎸夐挳
case 'btn_Edit': btn_Edit();
break;
@@ -509,6 +513,28 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 缂栬緫
function btn_Edit() {
var checkStatus = table.checkStatus('mainTable')
@@ -520,7 +546,7 @@
, area: ['100%', '100%']
, title: HPageTitle + '- 缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
- , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + HInterID
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + HInterID
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
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_EquipFileMainEdit.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_EquipFileMainEdit.html"
index c126a74..01887d6 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_EquipFileMainEdit.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_EquipFileMainEdit.html"
@@ -292,6 +292,32 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏁伴噰IP鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HIPAddress" id="HIPAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱旂綉鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HLinkNETMode" id="HLinkNETMode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectMode" id="HCollectMode">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectClass" id="HCollectClass">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏄惁涓荤敓浜ц澶�</label>
<div class="layui-input-block" style="margin-left: 125px;width:55%;">
<select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
@@ -1338,6 +1364,10 @@
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
$("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HIPAddress").val(d.data[0].鏁伴噰IP鍦板潃);
+ $("#HLinkNETMode").val(d.data[0].鑱旂綉鏂瑰紡);
+ $("#HCollectMode").val(d.data[0].閲囬泦鏂瑰紡);
+ $("#HCollectClass").val(d.data[0].閲囬泦绫诲瀷);
$("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
$("#HMainSourceID").val(d.data[0].HMainSourceID);
$("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
index 810f62c..fa52266 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ErrMsgBackType.html"
@@ -28,16 +28,16 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮傚父鍙嶉绫诲瀷浠ｇ爜</label>
+ <div class="layui-inline" style="width:400px">
+ <label class="layui-form-label" style="white-space: nowrap;width:100px">寮傚父鍙嶉绫诲瀷浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:200px">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">寮傚父鍙嶉绫诲瀷鍚嶇О</label>
+ <div class="layui-inline" style="width:400px">
+ <label class="layui-form-label" style="white-space: nowrap;width:100px">寮傚父鍙嶉绫诲瀷鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
+ <input type="text" class="layui-input" name="HName" id="HName" style="width:200px">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index bdb6793..fb57f64 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -25,35 +25,42 @@
<div class="layui-card-body">
<!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
<form class="layui-form" action="">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">妫�楠屾柟妗堝悕绉�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="HDate1" id="HDate1">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="white-space: nowrap">妫�楠屾柟妗堝悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="HDate2" id="HDate2">
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HDate1" id="HDate1">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HDate2" id="HDate2">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
</div>
</div>
@@ -87,14 +94,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script>
- //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var HName = decodeURI(params[params[1]]);//鐗╂枡鍚嶇О
- }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -110,11 +110,19 @@
, soulTable = layui.soulTable
, element = layui.element;
-
-
var sWhere = "";
+ var HName = "";
var option = [];
var HModName = "QC_CheckProjectList";
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ HName = decodeURI(params[params[1]]) == "undefined" ? "" : decodeURI(params[params[1]]);//鐗╂枡鍚嶇О
+ }
//#endregion
//鍒濆鍖栬〃鏍�
@@ -223,7 +231,7 @@
sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
get_Display(sWhere);
}
-
+
}
//鍒濆鍖栫綉鏍�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 5ef5902..55f9920 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -1221,7 +1221,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
, resize: false,
end: function () {
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 379ba96..045b417 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -56,7 +56,7 @@
</select>
</div>
</div>
- <div class="layui-row" style="margin-top:5px">
+ <div class="layui-row" style="margin-top:5px;margin-bottom:20px;margin-left:80px">
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -313,7 +313,7 @@
var HModName2 = "Sc_StationOutBillSub_Note";
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
- var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID", "HCenterID", "HbillSubType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 8e957cd..b21e448 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -223,7 +223,7 @@
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Cj_StationInBillList";
- var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HDeptID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID", "HICMOQty", "HRemark", "HBillType", "hsubid", "HBillStatus", "HBillSubType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
--
Gitblit v1.9.1