From e995a9fc7d53dd8942595f6995c16dd4fe4753cf Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 22 五月 2024 16:39:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 13
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMainList.html | 6
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 7
WebTM/views/基础资料/基础资料/Gy_MaintainList.html | 71 -
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 61 +
WebTM/views/基础资料/基础资料/Gy_MaintainEdit.html | 30
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeUseBillList.html | 24
WebTM/views/基础资料/公用基础资料/Gy_EquipType.html | 14
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 242 +++++--
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html | 44 +
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 38
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html | 42 +
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 27
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 6
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html | 44 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 8
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBillList.html | 33
WebTM/views/基础资料/基础资料/Gy_RepairList.html | 77 -
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html | 21
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeUseBillList.html | 80 ++
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBillList.html | 11
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 13
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html | 28
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 13
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 106 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html | 146 ++--
WebTM/views/基础资料/基础资料/Gy_RepairEdit.html | 27
WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html | 19
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 100 +-
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | 361 +----------
WebTM/WebTM.csproj | 6
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMain.html | 79 +-
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 49 +
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 2
34 files changed, 1,071 insertions(+), 777 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7313915..cf4296a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -375,14 +375,16 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
- <Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBill.html" />
- <Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBill.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Gy_MaterPreventErrMouldBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\闃查敊楠岃瘉\Qc_PreventErrMouldCheckBill.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
index a6f9310..f3ebd3c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
@@ -41,7 +41,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
@@ -50,7 +50,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
@@ -147,6 +147,11 @@
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ if (!AllowLoadData()) {
+ return;
+ }
+
var ModRightNameAdd = 'Gy_MouldType_Edit';
var user = sessionStorage["HUserName"];
var arr = new Array();
@@ -260,6 +265,25 @@
});
}
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ return true;
+ }
+
});
</script>
</body>
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_CheckItem.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_CheckItem.html"
index 7e90b71..aac5e19 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_CheckItem.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_CheckItem.html"
@@ -233,6 +233,19 @@
})
//#endregion
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#endregion
// 鍒濆鍖栫晫闈�
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 32e36bc..4480eb9 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"
@@ -171,6 +171,20 @@
get_FastQuery();
});
//#endregion
+
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//鍒濆鍖栬〃鏍�
function set_ClearBill() {
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_MouldType.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_MouldType.html"
index 4ae63e1..c292418 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_MouldType.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_MouldType.html"
@@ -51,8 +51,8 @@
<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-3"></i>鍒锋柊</button>
<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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></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>
@@ -117,11 +117,13 @@
case 'btn-view':
get_ViewReport();
break;
- //瀹℃牳
- case 'btn-Audit': set_AuditBill();
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
break;
- //鍙嶅鏍�
- case 'btn-DeAudit': set_DeAuditBill();
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -150,6 +152,27 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
//#endregion
//鍒濆鍖栬〃鏍�
@@ -247,10 +270,10 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妫�楠岄」鐩�',
+ title: '鏂板妯℃不鍏峰垎绫�',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level + ''],
end: function () {
@@ -358,22 +381,17 @@
}
}
- //瀹℃牳
- function set_AuditBill() {
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus > 0) {
- layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
- return false;
- }
+ var InterID = data[0].HItemID.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/Gy_MouldType/AuditGy_MouldType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -397,54 +415,14 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
-
- //鍙嶅鏍�
- function set_DeAuditBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus = 0) {
- layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
- return false;
- }
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 1, "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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
-
- }
+ //#endregion
//淇敼鎸夐挳
function set_ShowBill() {
if (TagId != "") {
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妯℃不鍏峰垎绫�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
@@ -470,7 +448,7 @@
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
- , area: ['80%', '80%']
+ , area: ['100%', '100%']
, title: '缂栬緫妯℃不鍏峰垎绫�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
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_QCCheckClass.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_QCCheckClass.html"
index 8080829..edb6888 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_QCCheckClass.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_QCCheckClass.html"
@@ -216,6 +216,19 @@
});
//#endregion
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html"
index 07bedfa..a170f6c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainEdit.html"
@@ -42,14 +42,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
@@ -151,6 +151,11 @@
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ if (!AllowLoadData()) {
+ return;
+ }
+
var user = sessionStorage["HUserName"];
var isEndCheck = document.getElementById("HStopflag").checked;
data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
@@ -225,16 +230,33 @@
}
});
}
- });
+ });
//#endregion
-
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ return true;
+ }
+
});
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
index 998dccf..99c8bda 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
@@ -88,6 +88,8 @@
<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-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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>
@@ -155,11 +157,13 @@
case 'btn-view':
get_ViewReport();
break;
- //瀹℃牳
- case 'btn-Audit': set_AuditBill();
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
break;
- //鍙嶅鏍�
- case 'btn-DeAudit': set_DeAuditBill();
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -372,7 +376,7 @@
title: '鏂板淇濆吇椤圭洰',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=1&linterid=&HSouceBillType='],
end: function () {
@@ -493,22 +497,17 @@
}
}
- //瀹℃牳
- function set_AuditBill() {
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus > 0) {
- layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
- return false;
- }
+ var InterID = data[0].HItemID.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/Gy_Maintain/AuditGy_Maintain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -532,47 +531,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
-
- //鍙嶅鏍�
- function set_DeAuditBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus = 0) {
- layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
- return false;
- }
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 1, "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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
-
- }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html"
index 2b92d79..55985c5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairEdit.html"
@@ -42,14 +42,14 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" lay-verify="HName" id="HName">
</div>
@@ -163,6 +163,11 @@
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ if (!AllowLoadData()) {
+ return;
+ }
+
var user = sessionStorage["HUserName"];
var isEndCheck = document.getElementById("HStopflag").checked;
data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
@@ -247,6 +252,24 @@
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ return true;
+ }
+
});
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
index c4ad28c..ff172b3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
@@ -88,6 +88,8 @@
<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-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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>
@@ -158,11 +160,13 @@
case 'btn-view':
get_ViewReport();
break;
- //瀹℃牳
- case 'btn-Audit': set_AuditBill();
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
break;
- //鍙嶅鏍�
- case 'btn-DeAudit': set_DeAuditBill();
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -383,7 +387,7 @@
title: '鏂板缁翠慨椤圭洰',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['100%', '100%'],
maxmin: true,
content: ['../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=1&linterid=&HSouceBillType='],
end: function () {
@@ -402,12 +406,12 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
+ var hID = data[0].hitemid.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+ , title: '缂栬緫缁翠慨椤圭洰'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -458,7 +462,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Repair/DeleteRepair',
type: "GET",
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
+ data: { "HItemID": data[0].hitemid, "User": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -504,22 +508,17 @@
}
}
- //瀹℃牳
- function set_AuditBill() {
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus > 0) {
- layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
- return false;
- }
+ var InterID = data[0].hitemid.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/Gy_Repair/AuditGy_Repair", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -543,47 +542,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
-
- //鍙嶅鏍�
- function set_DeAuditBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
- if (HBillStatus = 0) {
- layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
- return false;
- }
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "IsAudit": 1, "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('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
-
- }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html"
index 816ef83..06c2be6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html"
@@ -258,12 +258,12 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
var rowdata = [{
- "HMaterID": 0, "鍣ㄥ叿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0,"HNewLeaveLife": 0, "HRemark": ""
+ "HMaterID": 0, "鍣ㄥ叿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HNewLeaveLife": 0, "HRemark": ""
}];
-
+
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -435,7 +435,7 @@
obj.update({
HNewLeaveLife: parseFloat(HDesignLife).toFixed(2), //鏂板鐘舵�佷笅,鏈鍓╀綑瀵垮懡 = 璁捐瀵垮懡
});
- }
+ }
if ((HLeaveLife - HUseLife) < 0) {
layer.msg("鍓╀綑瀵垮懡涓嶈冻锛岃閲嶆柊杈撳叆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -501,10 +501,10 @@
, { field: '鍣ㄥ叿', title: '鍣ㄥ叿', edit: 'text', event: "HMaterID" }//f7
, { field: 'HUnitID', title: 'HUnitID ', width: 100, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
- , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', totalRow: true}
- , { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', totalRow: true}//f7
- , { field: 'HUseLife', title: '鏈鑰楃敤', edit: 'text', totalRow: true}//f7
- , { field: 'HNewLeaveLife', title: '鏈鍓╀綑瀵垮懡', totalRow: true}//f7
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', totalRow: true }
+ , { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', totalRow: true }//f7
+ , { field: 'HUseLife', title: '鏈鑰楃敤', edit: 'text', totalRow: true }//f7
+ , { field: 'HNewLeaveLife', title: '鏈鍓╀綑瀵垮懡', totalRow: true }//f7
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text' }//f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
]]
@@ -540,7 +540,7 @@
})
}
- //璐熻矗浜�
+ //璐熻矗浜�
function get_btnHManger() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -594,6 +594,8 @@
obj.update({
"鍣ㄥ叿": checkStatus.data[0].妯″叿鍚嶇О
, "HMaterID": checkStatus.data[0].hmainid
+ , "HDesignLife": checkStatus.data[0].鍒濆璁捐瀵垮懡
+ , "HLeaveLife": checkStatus.data[0].鍓╀綑瀵垮懡
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -724,7 +726,7 @@
, "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
, "HRemark": d.data[0].琛ㄥご澶囨敞
, "HMangerID": d.data[0].HMangerID
- , "HMangerName": d.data[0].璐熻矗浜�
+ , "HMangerName": d.data[0].璐熻矗浜�
, "HDeptID": d.data[0].HDeptID
, "HDeptName": d.data[0].閮ㄩ棬
, "HReason": d.data[0].璋冩暣鍘熷洜
@@ -740,7 +742,7 @@
{
"HMaterID": d.data[i].HMaterID, "鍣ㄥ叿": d.data[i].鍣ㄥ叿, "HUnitID": d.data[i].HUnitID, "璁￠噺鍗曚綅": d.data[i].璁￠噺鍗曚綅,
"HDesignLife": d.data[i].璁捐瀵垮懡, "HLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡, "HUseLife": 0,
- "HNewLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡,"HRemark": d.data[i].琛ㄤ綋澶囨敞
+ "HNewLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡, "HRemark": d.data[i].琛ㄤ綋澶囨敞
}
)
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
index 27f5c2d..41968c2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
@@ -117,6 +117,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
</div>
@@ -152,71 +154,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- //var option = {
- // elem: '#mainTable'
- // , toolbar: '#toolbarDemo'
- // , height: 550
- // , page: true
- // , cellMinWidth: 90
- // , limits: [50, 500, 5000, 20000]
- // , limit: 50
- // , cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- // , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
- // , { field: 'HEmID', title: 'HEmID', width: 200, hide: true }
- // , { field: '璋冩暣浜轰唬鐮�', title: '璋冩暣浜轰唬鐮�', width: 200 }
- // , { field: '璋冩暣浜�', title: '璋冩暣浜�', width: 200 }
- // , { field: 'HMangerID', title: 'HEmID', width: 200, hide: true }
- // , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
- // , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
- // , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- // , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
- // , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
- // , { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', width: 115 }
- // , { field: '鎽樿', title: '鎽樿', width: 200 }
- // , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
- // , { field: '澶囨敞', title: '澶囨敞', width: 200 }
- // , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
- // , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
- // , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
- // , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
- // , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
- // , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
- // , { field: '妯″叿浠ｇ爜', title: '鍣ㄥ叿浠ｇ爜', width: 200 }
- // , { field: '妯″叿', title: '鍣ㄥ叿', width: 200 }
- // , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
- // , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 200 }
- // , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 200 }
- // , { field: 'HSecUnitID', title: 'HSecUnitID', width: 200, hide: true }
- // , { field: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', title: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- // , { field: '杈呭姪璁￠噺鍗曚綅', title: '杈呭姪璁￠噺鍗曚綅', width: 200 }
- // , { field: '鎹㈢畻鐜�', title: '鎹㈢畻鐜�', width: 200 }
- // , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
- // , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- // , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
- // , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
- // , { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', width: 200 }
- // , { field: '鏂板墿浣欏鍛�', title: '鏂板墿浣欏鍛�', width: 200 }
- // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- // , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- // , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- // , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- // , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- // , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- // , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- // , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- // , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- // , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
- // , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
- // , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
- // , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- // ]]
- //};
-
+
var HModName = "Sc_MouldLifeChangeBillList";
var HBillType = "3824";
var col = [];
@@ -330,6 +268,12 @@
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //瀹℃牳
+ case 'btn-Audit': set_AuditBill();
+ break;
+ //鍙嶅鏍�
+ case 'btn-DeAudit': set_DeAuditBill();
break;
};
});
@@ -510,6 +454,78 @@
layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
});
+ //瀹℃牳
+ function set_AuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/AuditSc_MouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_DeAuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/AuditSc_MouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
index 58e1d79..082504a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
@@ -80,6 +80,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -158,6 +160,12 @@
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //瀹℃牳
+ case 'btn-Audit': set_AuditBill();
+ break;
+ //鍙嶅鏍�
+ case 'btn-DeAudit': set_DeAuditBill();
break;
};
});
@@ -386,6 +394,78 @@
}
//#endregion
+ //瀹℃牳
+ function set_AuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeUseBill/AuditSc_MouldLifeUseBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_DeAuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HMainID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeUseBill/AuditSc_MouldLifeUseBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+
//#region 鍒锋柊
function get_Refresh() {
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\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.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_MaterialMouldBillMain.html"
index 21c46dc..c533ad3 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_MaterialMouldBillMain.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_MaterialMouldBillMain.html"
@@ -109,7 +109,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -323,7 +323,7 @@
, form = layui.form
, element = layui.element;
-
+
var HModName = "Gy_MaterialMouldBillMain";
//#endregion
@@ -336,10 +336,10 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
//鍒ゆ柇鏄惁鏂板
if (OperationType == null || OperationType == 1) {
-
+
OperationType = 1;
$("#HOrgID").attr("disabled", true);
//绂佺敤鎸夐挳
@@ -366,7 +366,7 @@
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//else if (OperationType == 2) {
-
+
// RoadBillMain(linterid);
// $.ajax({
// url: GetWEBURL() + "/Web/GetMAXNum",
@@ -391,9 +391,9 @@
//绂佺敤缁勭粐閫夐」
$("#HOrgID").attr("disabled", true);
- RoadBillMain(linterid);
+ RoadBillMain(linterid);
}
-
+
//鏄剧ず鍒楁暟鎹�
@@ -434,9 +434,9 @@
// 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
-
- set_AddNew(data);
-
+
+ set_AddNew(data);
+
});
// 閫�鍑�
@@ -476,12 +476,12 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"HMouldID": "",
- "HMouldNumber":"",
+ "HMouldNumber": "",
"HMouldName": "",
"HMouldType": "",
- "HQty": "0",
- "HMouldQty": "0",
- "HRate": "0",
+ "HQty": "1",
+ "HMouldQty": "",
+ "HRate": "",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
@@ -493,7 +493,7 @@
option.data = table.cache["mainTable"];
table.render(option);
-
+
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -509,7 +509,7 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-
+
}
break;
@@ -542,7 +542,7 @@
//#region 鍣ㄥ叿娓呭崟鍒濆鍖�
function get_InitGrid() {
- option = {
+ option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, totalRow: true
@@ -567,7 +567,7 @@
}
option.data = [];
table.render(option);
-
+
}
//#endregion
@@ -626,7 +626,7 @@
}
});
}
- //#endregion
+ //#endregion
//#region 璐熻矗浜洪�夋嫨椤甸潰
function get_checkSearchHEmp() {
@@ -741,7 +741,7 @@
$("#HEquipNumber").val(checkStatus.data[0].璁惧浠ｇ爜);//璁惧浠ｇ爜
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);//璁惧鍚嶇О
$("#HEquipModel").val(checkStatus.data[0].璁惧瑙勬牸);//璁惧鍨嬪彿
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -774,15 +774,17 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- "HMouldID":checkStatus.data[0].hmainid,
+ "HMouldID": checkStatus.data[0].hmainid,
"HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
- "HMouldName":checkStatus.data[0].妯″叿鍚嶇О,
+ "HMouldName": checkStatus.data[0].妯″叿鍚嶇О,
"HMouldType": checkStatus.data[0].妯″叿鍨嬪彿,
"HMouldQty": checkStatus.data[0].绌存暟,
"HSourceInterID": checkStatus.data[0].hmainid,
"HSourceEntryID": checkStatus.data[0].hsubid,
"HSourceBillType": checkStatus.data[0].HBillType,
- "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�,
+ "HQty": 1,
+ "HRate": 1
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -935,7 +937,7 @@
}
//#endregion
-
+
//#region 缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
@@ -1001,6 +1003,11 @@
//#region 淇濆瓨HMaker
function set_AddNew(data) {
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -1027,14 +1034,14 @@
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
-
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"] ;
+
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_MouldinventoryBill/SaveGy_MaterialMouldBillMain",
-
+
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -1083,7 +1090,17 @@
}
//#endregion
-
+ function AllowLoadData() { //闈炵┖楠岃瘉
+ var Result = true;
+ if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == "undefined") {
+ layer.msg("鐗╂枡淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+
+ return Result;
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -1119,7 +1136,7 @@
})
}
-
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -1131,7 +1148,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [ ];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1203,7 +1220,7 @@
})
}
//#endregion
-
+
});
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_MaterialMouldBillMainList.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_MaterialMouldBillMainList.html"
index 33f343f..29f3632 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_MaterialMouldBillMainList.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_MaterialMouldBillMainList.html"
@@ -245,10 +245,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
-
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -408,7 +406,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HBillNo").val("");
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#ColContent").val("");
$("#ColName").val("0");
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 81b9bc3..3da6720 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"
@@ -51,7 +51,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
<input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
@@ -75,19 +75,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" >
+ <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍚嶇О<label style="color:red"> * </label></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">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel" id="HModel" >
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
</div>
@@ -101,13 +101,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐩村緞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDiameter" id="HDiameter" >
+ <input type="text" class="layui-input" name="HDiameter" id="HDiameter">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin" >
+ <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin">
</div>
</div>
</div>
@@ -115,19 +115,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��2</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" >
+ <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍥惧彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HPICNo" id="HPICNo" >
+ <input type="text" class="layui-input" name="HPICNo" id="HPICNo">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇浜у搧鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel" >
+ <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel">
</div>
</div>
</div>
@@ -167,7 +167,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍑哄巶鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HOutComDate" id="HOutComDate" >
+ <input type="text" class="layui-input" name="HOutComDate" id="HOutComDate">
</div>
</div>
<div class="layui-inline">
@@ -182,7 +182,7 @@
<input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
@@ -198,16 +198,25 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" >
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HMouldStatus" lay-filter="HMouldStatus" id="HMouldStatus">
+ <option value="鍦ㄥ簱" selected="selected">鍦ㄥ簱</option>
+ <option value="鍦ㄩ��">鍦ㄩ��</option>
+ <option value="涓㈠け">涓㈠け</option>
+ <option value="閿佸畾">閿佸畾</option>
+ <option value="棰嗗嚭">棰嗗嚭</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="鏈惎鐢�">鏈惎鐢�</option>
+ <option value="浣滃簾">浣滃簾</option>
+ </select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹夊叏瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" >
+ <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" value="0">
</div>
</div>
</div>
@@ -225,7 +234,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗堟湰鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HVersion" id="HVersion" >
+ <input type="text" class="layui-input" name="HVersion" id="HVersion">
</div>
</div>
<div class="layui-inline">
@@ -234,62 +243,62 @@
<input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁捐瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife" >
+ <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浣跨敤瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HUseLife" id="HUseLife" >
+ <input type="text" class="layui-input" name="HUseLife" id="HUseLife" value="0" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍓╀綑瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" >
+ <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" value="0" readonly>
</div>
</div>
</div>
@@ -297,19 +306,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸茬敓浜ф暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProdQty" id="HProdQty" >
+ <input type="text" class="layui-input" name="HProdQty" id="HProdQty" value="0" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸茬敓浜ч噸閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight">
+ <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight" value="0" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绌存暟<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" >
+ <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty">
</div>
</div>
</div>
@@ -341,15 +350,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -359,7 +368,7 @@
</div>
</div>
<div class="layui-inline" style="margin-left:10px;">
- <label class="layui-form-label">鍣ㄥ叿鍒嗙被</label>
+ <label class="layui-form-label">鍣ㄥ叿绫诲瀷</label>
<div class="layui-input-block">
<select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
<option value="妯″叿" selected="selected">妯″叿</option>
@@ -370,6 +379,28 @@
<option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</option>
<option value="鍏朵粬">鍏朵粬</option>
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撳簱</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撲綅</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -793,6 +824,43 @@
});
});
+ //褰撳墠浠撳簱
+ form.on('submit(btnHNowWHList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HNowWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+ $("#HNowWHID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//宸ヨ壓璺嚎
form.on('submit(btnHRoutingList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -926,6 +994,42 @@
}
$("#HSPName").val(checkStatus.data[0].浠撲綅鍚嶇О);
$("#HSPID").val(checkStatus.data[0].HMainID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //褰撳墠浠撲綅
+ form.on('submit(btnHNowSPList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撲綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HNowSPName").val(checkStatus.data[0].浠撲綅鍚嶇О);
+ $("#HNowSPID").val(checkStatus.data[0].HMainID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1212,7 +1316,7 @@
},
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-
+
$("#HInterID").val(d.data[0].hmainid);
$("#HBillNo").val(d.data[0].鍗曟嵁鍙�);
$("#HDate").val(formatDate(d.data[0].鏃ユ湡));
@@ -1267,10 +1371,16 @@
$("#HMouldClass").val(d.data[0].鍣ㄥ叿鍒嗙被);
//$("#HNowSupID").val(d.data[0].HNowSupID);
//$("#HNowSupName").val(d.data[0].铏氭嫙浠�);
+ $("#HNowWHID").val(d.data[0].褰撳墠浠撳簱ID);
+ $("#HNowWHName").val(d.data[0].褰撳墠浠撳簱);
+ $("#HNowSPID").val(d.data[0].褰撳墠浠撲綅ID);
+ $("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
+ $("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
var HCheckCycle = d.data[0].淇濆吇鍛ㄦ湡;
- if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
+ if (!(HCycleUnit == null || HCheckCycle == null)) {
calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
}
@@ -1294,7 +1404,7 @@
//淇濆瓨
function set_btnSave(data) {
-
+
$("#HMaker").val(sessionStorage["HUserName"]);
var user = sessionStorage["HUserName"];
var ModRightNameAdd = 'Gy_MouldFile_Edit';
@@ -1470,7 +1580,7 @@
if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
layer.msg("榛樿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
- }
+ }
if ($("#HCaveQty").val() == '' || $("#HCaveQty").val() == null) {
layer.msg("绌存暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
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 0cbad83..0e23a0a 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"
@@ -168,6 +168,25 @@
});
//#endregion
+ 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;
+ }
+ });
+ })
+
//#endregion
//鍒濆鍖栬〃鏍�
@@ -404,10 +423,10 @@
if (checkStatus.data.length === 1) {
var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
var HInterID = data[0].hmainid.toString();
- if (HBillStatus > 0) {
- layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
- return false;
- }
+ //if (HBillStatus > 0) {
+ // layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+ // return false;
+ //}
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
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_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_MouldRepairWorkBillList.html"
index f02e883..13b6f2c 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_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_MouldRepairWorkBillList.html"
@@ -208,6 +208,25 @@
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ 鐐瑰嚮琛岄�変腑楂樹寒
+ //閫変腑琛屾敼鍙橀鑹�
+ 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;
+ }
+ });
+
+
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var linterid = datas.hmainid;
$.ajax({
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/Sc_Add_MouldConkBookBillList.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/Sc_Add_MouldConkBookBillList.html"
index d57c247..3b7ea8c 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/Sc_Add_MouldConkBookBillList.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/Sc_Add_MouldConkBookBillList.html"
@@ -841,14 +841,14 @@
//鍒ゆ柇鐗╂枡鏄庣粏椤�
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鏁呴殰鍘熷洜鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HRepairCode == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HConkReasonID == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁呴殰鍘熷洜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
if (sSubStr[i].HManagerCode == "") {
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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
index db7becf..adb29b6 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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
@@ -49,7 +49,7 @@
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
@@ -65,14 +65,26 @@
</button>
</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="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldMaintainPlanEntryID" id="HMouldMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldMaintainPlanInterID" id="HMouldMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇瑙勭▼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMouldMaintainRuleInterNo" id="HMouldMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldMaintainRuleInterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -112,17 +124,7 @@
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍣ㄥ叿淇濆吇瑙勭▼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="hidden" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HMouldMaintainRuleInterNo" id="HMouldMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldMaintainRuleInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
+ </div>
</div>
</div>
</div>
@@ -222,7 +224,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -319,6 +321,10 @@
$("#HPlanNo").val(checkStatus.data[0].hmainid);
$("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
+ $("#HBeginDate").val(Pub_Format(checkStatus.data[0].璁″垝寮�濮嬫棩鏈�, "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(checkStatus.data[0].璁″垝缁撴潫鏃ユ湡, "yyyy-MM-dd"));
+ $("#HMouldMaintainPlanInterID").val(checkStatus.data[0].hmainid);
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_MaintainItem1();
}
@@ -391,7 +397,7 @@
}
$("#HMouldName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldID").val(checkStatus.data[0].hmainid);
- get_MaintainItem();
+ //get_MaintainItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -529,16 +535,18 @@
}
//淇濆吇璁″垝缂栧彿
- window.get_MaintainItem1 = function() {
+ window.get_MaintainItem1 = function () {
+ var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+ var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
- url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/Sc_MouldMaintainPlanBillListProjectDetai",
+ url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/Sc_MouldMaintainPlanBill_PlanList",
type: "GET",
- data: { "sqlWhere": "and hmainid=" + $("#HPlanNo").val() },
+ data: { "HInterID": HPlanID, "HDate": HDate },
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result.list[0];//淇濆吇
- var PJData = result.list[1];//閰嶄欢
+ var BYData = result.data[0];//淇濆吇
+ var PJData = result.data[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
@@ -548,7 +556,7 @@
if (BYData.length != 0) {
$("#HMouldMaintainRuleInterID").val(BYData[0].HMouldMaintainRuleID);
- $("#HMouldMaintainRuleInterNo").val(BYData[0].HEquipDotCheckNo);
+ $("#HMouldMaintainRuleInterNo").val(BYData[0].淇濆吇瑙勭▼鍗曞彿);
}
else {
layer.msg("鏃犱繚鍏昏绋�!")
@@ -557,12 +565,13 @@
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
+ $("#HMouldMaintainPlanEntryID").val(BYData[0].HPlanEntryID);
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
- "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+ "HMaintainItemID": BYData[i].HMaintainItemID == null ? 0 : BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
+ "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HEmployeeID == null ? 0 : BYData[i].HEmployeeID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": ""
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -599,7 +608,7 @@
}
//鍣ㄥ叿淇濆吇瑙勭▼
- window.get_MaintainItem2 = function() {
+ window.get_MaintainItem2 = function () {
$.ajax({
url: GetWEBURL() + "/Web/GetMouldMaintainItemtemByMaintainRuleID",
type: "GET",
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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
index 9ff136a..dbe233b 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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
@@ -49,7 +49,7 @@
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
@@ -61,6 +61,16 @@
<input type="hidden" name="HMouldMaintainRuleID" id="HMouldMaintainRuleID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HMouldMaintainRuleNo" id="HMouldMaintainRuleNo" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇绾у埆</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -108,17 +118,7 @@
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇濆吇绾у埆</label>
- <div class="layui-input-inline">
- <input type="hidden" name="HMaintainLevID" id="HMaintainLevID" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="text" name="HMaintainLevName" id="HMaintainLevName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnMaintainLev" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
+ </div>
</div>
</div>
</div>
@@ -129,6 +129,7 @@
<ul class="layui-tab-title">
<li class="layui-this">淇濆吇椤逛俊鎭�</li>
<li>閰嶄欢淇℃伅</li>
+ <li>淇濆吇璁″垝</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -136,6 +137,10 @@
</div>
<div class="layui-tab-item">
<table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--淇濆吇璁″垝-->
+ <table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
</div>
</div>
</div>
@@ -205,6 +210,7 @@
, element = layui.element;
var option = [];//淇濆吇
var option1 = [];//閰嶄欢
+ var option_plan = [];//璁″垝
var sBillType = "3818";
//var TabRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0 ", "HQtyMust": "0", "HRemark": " " };
//#endregion
@@ -217,7 +223,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -225,6 +231,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_InitGrid1();
+ set_InitGrid_Plan();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
@@ -316,6 +323,10 @@
$("#HMouldMaintainRuleID").val(checkStatus.data[0].hmainid);
$("#HMaintainLevName").val(checkStatus.data[0].淇濆吇绾у埆鍚嶇О);
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
+ $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
+ $("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+ form.render('select');
+
get_DocCheckItem2(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -514,6 +525,35 @@
};
}
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid_Plan() {
+ //鐐规璁″垝
+ columns_plan = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
+ , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
+ , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
+ , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
+ , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ ];
+ option_plan = {
+ id: 'mainTable_plan'
+ , elem: '#mainTable_plan'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , limit: 500
+ , limits: [50, 200, 500, 1000, 3000]
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns_plan]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
@@ -533,6 +573,10 @@
table.render(option);
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0 ", "HQtyMust": "0", "HRemark": "" }];
table.render(option1);
+
+ set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ table.render(option_plan);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -621,6 +665,40 @@
table.render(option);
option1.data = result.list[1];
table.render(option1);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ function set_EditGrid_Plan(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldMaintainPlanBill/GetPlanList',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ }
+ )
+ }
+
+ option_plan.data = rowdata;
+ table.render(option_plan);
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -821,7 +899,7 @@
}
// 淇濆吇淇℃伅 閰嶄欢淇℃伅
- window.get_DocCheckItem2 = function(data) {
+ window.get_DocCheckItem2 = function (data) {
$.ajax({
url: GetWEBURL() + "/Sc_MouldMaintainRuleBill/Sc_MouldMaintainRuleBillListProjectDetaiNew",
type: "GET",
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/Sc_MouldConkBookBillList.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/Sc_MouldConkBookBillList.html"
index d933b1a..f7d7588 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/Sc_MouldConkBookBillList.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/Sc_MouldConkBookBillList.html"
@@ -234,6 +234,27 @@
});
//#endregion
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
+ //#endregion
+
//#endregion
//鍒濆鍖栫晫闈�
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/Sc_MouldMaintainBillList.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/Sc_MouldMaintainBillList.html"
index 69579c5..b3cf9dd 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/Sc_MouldMaintainBillList.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/Sc_MouldMaintainBillList.html"
@@ -127,6 +127,8 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AbandonCheck" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -231,6 +233,12 @@
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
break;
};
});
@@ -697,6 +705,40 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainBill/CheckSc_MouldMaintainBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3819" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//鍒锋柊
function get_Refresh() {
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\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.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/Sc_MouldMaintainPlanBillList.html"
index bb87132..04d6af1 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/Sc_MouldMaintainPlanBillList.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/Sc_MouldMaintainPlanBillList.html"
@@ -92,6 +92,8 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></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" style="display:none;" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -205,6 +207,12 @@
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
break;
};
});
@@ -617,11 +625,37 @@
}
});
}
- //瀹℃牳
- function set_CheckBill() {
- }
- //鍙嶅鏍�
- function set_AbandonCheck() {
+ //瀹℃牳/鍙嶅鏍�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/CheckSc_MouldMaintainPlanBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
}
//鍒锋柊
function btn_Refresh() {
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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
index 9ed76db..b006185 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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
@@ -56,28 +56,10 @@
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-inline">
- <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
- <option value="澶�">澶�</option>
- <option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
- <div class="layui-input-inline">
- <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
@@ -93,6 +75,24 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">鍛ㄦ湡鍗曚綅<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="澶�">澶�</option>
+ <option value="鏈�">鏈�</option>
+ <option value="鍛�">鍛�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇鍛ㄦ湡<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
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/Sc_MouldMaintainRuleBillList.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/Sc_MouldMaintainRuleBillList.html"
index 9ba939f..4ec18e3 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/Sc_MouldMaintainRuleBillList.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/Sc_MouldMaintainRuleBillList.html"
@@ -108,8 +108,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <!--<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="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -215,7 +215,6 @@
case 'get_Refresh':
set_Refresh();
break;
-
//閫�鍑�
case 'get_Exit':
Pub_Close(2);
@@ -223,6 +222,14 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
break;
};
});
@@ -599,6 +606,37 @@
}
}
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length == 1) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/CheckSc_MouldMaintainRuleBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3833" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+ //#endregion
+
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
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 c484ac9..a5b6e8b 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"
@@ -296,6 +296,16 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵�灞炰富鐢熶骇璁惧</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMainSourceName" id="HMainSourceName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HMainSourceID" id="HMainSourceID" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSourceList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -854,6 +864,43 @@
}
});
});
+
+ //鎵�灞炰富鐢熶骇璁惧
+ form.on('submit(HMainSourceList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓荤敓浜ц澶囧垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMainSourceName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HMainSourceID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//#endregion
@@ -949,6 +996,8 @@
$("#HSourceName").val(d.data[0].HSourceName);
$("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
$("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
+ $("#HMainSourcelD").val(d.data[0].HMainSourcelD);
+ $("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
form.render("select");
}
});
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 6d8e980..a9ee1ed 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"
@@ -168,6 +168,19 @@
});
//#endregion
+ //璁惧缂栧彿鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+ //璁惧鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#endregion
//鍒濆鍖栬〃鏍�
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 86e91ad..fdf3ac0 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"
@@ -160,6 +160,13 @@
get_FastQuery();
});
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
similarity index 71%
copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
index 31dea12..53edaaf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鍚姩鐐规鍗�</title>
+ <title>璁惧鍚姩鐐规娓呭崟</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -59,7 +59,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
- <h1 style="text-align: center; padding: 10px 0;"><b>鍚姩妫�鏌ュ崟</b></h1>
+ <h1 style="text-align: center; padding: 10px 0;"><b>璁惧鍚姩鐐规娓呭崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -83,23 +83,11 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇璁㈠崟<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鐗╂枡<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID" value="0">
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHICMO" id="btnSearchHICMO" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">娴佽浆鍗�<label style="color:red"> * </label></label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HProcExchBillNo" name="HProcExchBillNo" id="HProcExchBillNo" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
- <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProcExch" id="btnSearchHProcExch" style="width:40px;">
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -107,11 +95,11 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">宸ュ簭<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="width:40px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -126,48 +114,8 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐐规浣滀笟鍛�<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="HCheckEmpName" name="HCheckEmpName" id="HCheckEmpName" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HCheckEmpID" id="HCheckEmpID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHCheckEmp" id="btnSearchHCheckEmp" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鐝粍<label style="color:red"> * </label></label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
- <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHGroup" id="btnSearchHGroup" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
</div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鐝粍闀�<label style="color:red"> * </label></label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HGroupLeaderName" name="HGroupLeaderName" id="HGroupLeaderName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HGroupLeaderID" id="HGroupLeaderID" lay-verify="HGroupLeaderID" value="0">
- <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHGroupLeader" id="btnSearchHGroupLeader" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline" style="width:400px">
- <label class="layui-form-label">鏈�缁堢粨璁�</label>
- <div class="layui-input-inline">
- <select name="HLastResult" id="HLastResult" lay-filter="HLastResult">
- <option value="OK" selected="selected">OK</option>
- <option value="NG">NG</option>
- </select>
- </div>
- </div>
- </div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">璁板綍浜嬮」</label>
@@ -297,13 +245,6 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <!--琛屼笅鎷夐�夋嫨(缁撴灉)-->
- <script type="text/html" id="HCheckResult">
- <select name="HCheckResult" lay-filter="HCheckResult" id="HCheckResult{{d.LAY_TABLE_INDEX+1}}">
- <option value="OK" selected>OK</option>
- <option value="X">X</option>
- </select>
- </script>
<script>
@@ -322,7 +263,7 @@
, upload = layui.upload;
//妯″潡鍚�
- var HModName = "Sc_WorkBeginDotCheckBill";
+ var HModName = "Gy_WorkBeginDotCheckListBill";
//#region
//鍏ㄥ眬鍙橀噺
@@ -347,7 +288,7 @@
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- var HModuleType = "3744";
+ var HModuleType = "3337";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -399,19 +340,7 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
-
- //#region 閫夋嫨鐢熶骇璁㈠崟鎸夐挳
- form.on('submit(btnSearchHICMO)', function () {
- get_checkSearchHICMO();
- });
- //#endregion
-
- //#region 閫夋嫨娴佽浆鍗℃寜閽�
- form.on('submit(btnSearchHProcExch)', function () {
- get_checkSearchHProcExch();
- });
- //#endregion
+ //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
//#region 閫夋嫨鐗╂枡鎸夐挳
form.on('submit(btnSearchHMater)', function () {
@@ -423,23 +352,11 @@
form.on('submit(btnSearchHSource)', function () {
get_checkSearchHSource();
});
- //#endregion
+ //#endregion
- //#region 閫夋嫨鐐规浣滀笟鍛樻寜閽�
- form.on('submit(btnSearchHCheckEmp)', function () {
- get_checkSearchHCheckEmp();
- });
- //#endregion
-
- //#region 閫夋嫨鐢熶骇鐝粍鎸夐挳
- form.on('submit(btnSearchHGroup)', function () {
- get_checkSearchHGroup();
- });
- //#endregion
-
- //#region 閫夋嫨鐝粍闀挎寜閽�
- form.on('submit(btnSearchHGroupLeader)', function () {
- get_checkSearchHGroupLeader();
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
});
//#endregion
@@ -472,7 +389,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "", "HCheckResult": "","HRemark":"",
+ "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "","HRemark":"",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -480,12 +397,7 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
- table.render(option);
- for (var i = 1; i <= option.data.length; i++) {
- $('#HCheckResult' + i + '').find("option[value='" + option.data[i - 1].HCheckResult + "']").attr("selected", true);
-
- }
- form.render('select');
+ table.render(option);
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -500,12 +412,7 @@
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- for (var i = 1; i <= option.data.length; i++) {
- $('#HCheckResult' + i + '').find("option[value='" + option.data[i - 1].HCheckResult + "']").attr("selected", true);
-
- }
- form.render('select');
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
break;
@@ -569,7 +476,6 @@
, { field: 'HCheckNoteItemName', title: '妫�鏌ラ」鐩�', edit: 'text', event: "HCheckNoteItemID", style: 'background-color: #f9f9f9;' } //f7
, { field: 'HCheckPostID', title: 'HCheckPostID', hide: true, style: 'background-color: #f9f9f9;'}
, { field: 'HCheckPostName', title: '纭鑰呰鑹�', edit: 'text', event: "HCheckPostID", style: 'background-color: #f9f9f9;' }
- , { field: 'HCheckResult', title: '缁撴灉', templet: '#HCheckResult' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
@@ -585,7 +491,6 @@
, "HCheckNoteItemName": ""
, "HCheckPostID": "0"
, "HCheckPostName": ""
- , "HCheckResult": ""
, "HRemark":""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
@@ -596,20 +501,7 @@
option.data = rowdata;
table.render(option);
}
- //#endregion
-
- //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
- form.on('select(HCheckResult)', function (data) {
- //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
- var elem = data.othis.parents('tr');
- var dataindex = elem.attr("data-index");
- $.each(option.data, function (index, value) {
- if (value.LAY_TABLE_INDEX == dataindex) {
- value.HCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- }
- });
- });
- //#endregion
+ //#endregion
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
@@ -630,7 +522,7 @@
url: GetWEBURL() + "/Web/GetMAXNum",
async: false,
type: "GET",
- data: { "HBillType": '3744' },
+ data: { "HBillType": '3337' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -640,74 +532,7 @@
});
}
//#endregion
-
- //#region 鐢熶骇璁㈠崟閫夋嫨椤甸潰
- function get_checkSearchHICMO() {
-
- //鎵撳紑鐢熶骇璁㈠崟灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "鐢熶骇璁㈠崟鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- $("#HICMOInterID").val(checkStatus.data[0].hmainid);
- $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
- $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
-
- layer.close(index);//鍏抽棴寮圭獥
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
- //#region 娴佽浆鍗￠�夋嫨椤甸潰
- function get_checkSearchHProcExch() {
- //鎵撳紑娴佽浆鍗″皬绐椾綋
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "娴佽浆鍗″垪琛�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
- $("#HProcExchEntryID").val(checkStatus.data[0].HEntryID);
- $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
-
- layer.close(index);//鍏抽棴寮圭獥
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
+
//#region 鐗╂枡閫夋嫨椤甸潰
function get_checkSearchHMater() {
layer.open({
@@ -766,15 +591,15 @@
}
//#endregion
- //#region 鐐规浣滀笟鍛橀�夋嫨椤甸潰
- function get_checkSearchHCheckEmp() {
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鐐规浣滀笟鍛樺垪琛�'//鏍囬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -782,61 +607,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
- $("#HCheckEmpID").val(checkStatus.data[0].HItemID);
-
-
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
- //#region 鐢熶骇鐝粍閫夋嫨椤甸潰
- function get_checkSearchHGroup() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鐢熶骇鐝粍鍒楄〃'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', '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('璇烽�夋嫨鏁版嵁');
- }
- $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
- $("#HGroupID").val(checkStatus.data[0].HItemID);
-
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) { }
- })
- }
- //#endregion
-
- //#region 鐝粍闀块�夋嫨椤甸潰
- function get_checkSearchHGroupLeader() {
- layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鐝粍闀垮垪琛�'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
- }
- $("#HGroupLeaderName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
- $("#HGroupLeaderID").val(checkStatus.data[0].HItemID);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -978,7 +750,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/Save锘縎c_WorkBeginDotCheckBillMain",
+ url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/SaveGy_WorkBeginDotCheckListBillMain",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
@@ -1005,7 +777,7 @@
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
- url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/锘縎c_WorkBeginDotCheckBillMainEditList",
+ url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/Gy_WorkBeginDotCheckListBillMainEditList",
type: "GET",
async: false,
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
@@ -1018,26 +790,15 @@
"HInterID": tableMain[0]["HInterID"]
, "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
, "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
-
- , "HICMOInterID": tableMain[0]["HICMOInterID"]
- , "HICMOEntryID": tableMain[0]["HICMOEntryID"]
- , "HICMOBillNo": tableMain[0]["鐢熶骇璁㈠崟"]
- , "HProcExchInterID": tableMain[0]["HProcExchInterID"]
- , "HProcExchEntryID": tableMain[0]["HProcExchEntryID"]
- , "HProcExchBillNo": tableMain[0]["娴佽浆鍗�"]
-
+
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterName": tableMain[0]["鐗╂枡鍚嶇О"]
, "HSourceID": tableMain[0]["HSourceID"]
, "HSourceName": tableMain[0]["鐢熶骇璧勬簮"]
- , "HCheckEmpID": tableMain[0]["HCheckEmpID"]
- , "HCheckEmpName": tableMain[0]["鐐规浣滀笟鍛�"]
- , "HGroupID": tableMain[0]["HGroupID"]
- , "HGroupName": tableMain[0]["鐢熶骇鐝粍"]
- , "HGroupLeaderID": tableMain[0]["HGroupLeaderID"]
- , "HGroupLeaderName": tableMain[0]["鐝粍闀�"]
+
+ , "HProcID": tableMain[0]["HProcID"]
+ , "HProcName": tableMain[0]["宸ュ簭"]
, "HNote": tableMain[0]["璁板綍浜嬮」"]
- , "HLastResult": tableMain[0]["鏈�缁堢粨璁�"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
@@ -1064,18 +825,12 @@
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["HCheckPostID"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
- "HCheckResult": tableSub[i]["缁撴灉"],
"HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
}
);
}
option.data = rowdata;
- table.render(option);
- for (var i = 0; i < rowdata.length; i++) {
- $('#HCheckResult' + (i + 1)).find("option[value='" + tableSub[i].缁撴灉 + "']").attr("selected", true);
- }
- form.render('select');
- form.render('checkbox');
+ table.render(option);
}
})
}
@@ -1126,23 +881,12 @@
if ($("#HDate").val() == "") {
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
- }
- if ($("#HSourceID").val() == "0") {
- layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖!");
+ }
+ if ($("#HProcID").val() == "0") {
+ layer.msg("宸ュ簭涓嶈兘涓虹┖!");
return false;
}
- if ($("#HGroupID").val() == "0") {
- layer.msg("鐢熶骇鐝粍涓嶈兘涓虹┖!");
- return false;
- }
- if ($("#HGroupLeaderID").val() == "0") {
- layer.msg("鐝粍闀夸笉鑳戒负绌�!");
- return false;
- }
- if ($("#HCheckEmpID").val() == "0") {
- layer.msg("鐐规浣滀笟鍛樹笉鑳戒负绌�!");
- return false;
- }
+
//#region 瀛愯〃 鏁版嵁妫�楠�
@@ -1182,29 +926,18 @@
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
}
- //鐢熸垚璧勬簮
+ //鐢熶骇璧勬簮
function GetGySource(obj) {
$("#HSourceID").val(obj[0].HItemID);
$("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
}
- //鐐规浣滀笟鍛�
- function GetHEmpValue(obj) {
- $("#HCheckEmpName").val(obj[0].鑱屽憳鍚嶇О);
- $("#HCheckEmpID").val(obj[0].HItemID);
- }
-
- //鐢熶骇鐝粍
- function GetHGroupValue(obj) {
- $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
- $("#HGroupID").val(obj[0].HItemID);
- }
-
- //鐝粍闀�
- function GetHManagerValue(obj)
+
+ //宸ュ簭
+ function GetProcessValue(obj)
{
- $("#HGroupLeaderName").val(obj[0].鑱屽憳鍚嶇О);
- $("#HGroupLeaderID").val(obj[0].HItemID);
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
}
//妫�鏌ラ」鐩�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
similarity index 96%
copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
index ac39b8c..912f4db 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鍚姩鐐规鍒楄〃</title>
+ <title>璁惧鍚姩鐐规娓呭崟鍒楄〃</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -104,8 +104,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HHasten"><i class="layui-icon layui-icon-logout"></i>鍌績娆℃暟鎸夐挳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -136,7 +135,7 @@
var HModName = "Sc_WorkBeginDotCheckBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HEntryID", "HBillStatus", "HICMOInterID", "HICMOEntryID", "HProcExchInterID", "HProcExchEntryID", "HMaterID", "HSourceID", "HCheckEmpID", "HGroupID", "HGroupLeaderID", "HCheckNoteItemID","HCheckPostID"];
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID","HCheckPostID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -144,7 +143,7 @@
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "鍚姩鐐规鍒楄〃";
+ window.HModuleName = "璁惧鍚姩鐐规娓呭崟缁存姢";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -297,13 +296,12 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/get锘縎c_WorkBeginDotCheckBillMainList',
+ url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/getGy_WorkBeginDotCheckListBillMainList',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
- var totalArray = ["鍌績娆℃暟"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -315,10 +313,7 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
+ }
else {
switch (data[i].Type) {
//int
@@ -435,9 +430,9 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ヤ綔浠诲姟鍒楄〃-鏂板'
+ , title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/鍚姩妫�鏌ュ崟/Sc_WorkBeginDotCheckBill.html?OperationType=1&linterid=0&HSouceBillType='
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Gy_WorkBeginDotCheckListBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
@@ -457,9 +452,9 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ヤ綔浠诲姟鍒楄〃-缂栬緫'
+ , title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/鍚姩妫�鏌ュ崟/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Gy_WorkBeginDotCheckListBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
@@ -484,7 +479,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Sc_WorkBeginDotCheckBill/Delete锘縎c_WorkBeginDotCheckBill',
+ url: GetWEBURL() + 'Sc_WorkBeginDotCheckBill/DeleteGy_WorkBeginDotCheckListBill',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -532,7 +527,7 @@
layer.confirm("纭瑕佸鏍稿悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/AuditSc_WorkBeginDotCheckBill',
+ url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/AuditGy_WorkBeginDotCheckListBill',
type: "GET",
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -563,7 +558,7 @@
layer.confirm("纭瑕佸叧闂悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/CloseSc_WorkBeginDotCheckBill',
+ url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/CloseGy_WorkBeginDotCheckListBill',
type: "GET",
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -595,7 +590,7 @@
layer.confirm("纭瑕佸叧闂悧?", function (index) {
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/DropSc_WorkBeginDotCheckBill',
+ url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/DropGy_WorkBeginDotCheckListBill',
type: "GET",
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
similarity index 99%
rename from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 31dea12..b914fda 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -1182,7 +1182,7 @@
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);
}
- //鐢熸垚璧勬簮
+ //鐢熶骇璧勬簮
function GetGySource(obj) {
$("#HSourceID").val(obj[0].HItemID);
$("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
similarity index 98%
rename from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
index ac39b8c..34a1173 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\346\243\200\346\237\245\345\215\225/Sc_WorkBeginDotCheckBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
@@ -104,8 +104,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HHasten"><i class="layui-icon layui-icon-logout"></i>鍌績娆℃暟鎸夐挳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -435,9 +434,9 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ヤ綔浠诲姟鍒楄〃-鏂板'
+ , title: '鍚姩鐐规鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/鍚姩妫�鏌ュ崟/Sc_WorkBeginDotCheckBill.html?OperationType=1&linterid=0&HSouceBillType='
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
@@ -457,9 +456,9 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ヤ綔浠诲姟鍒楄〃-缂栬緫'
+ , title: '鍚姩鐐规鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../杞﹂棿绠＄悊/鍚姩妫�鏌ュ崟/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
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_StationOutBill.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_StationOutBill.html"
index 01308f5..4df54fc 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_StationOutBill.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_StationOutBill.html"
@@ -1437,6 +1437,8 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+
if ($("#lngBillSubKey").val() == 0) {
layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1455,6 +1457,7 @@
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
if (sessionStorage["OrganizationID"] == 1) {
+ console.log("姹囨姤鍗曞彿锛�" + $("#HBillNo").val() + " " + "宸ュ簭锛�" + $("#HProcName").val() + " " + "FirstEndHProcNo:" + FirstEndHProcNo);
if (FirstEndHProcNo == 1) {
//姹囨姤
GetInStorage();
@@ -1479,11 +1482,13 @@
}
}
else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -1999,6 +2004,9 @@
function GetInStorage() {
var InterID = $("#HInterID").val();
var BillNo = $("#HBillNo").val();
+ if (InterID == "" || InterID == null || InterID == "undefined" || BillNo == "" || BillNo == null || BillNo == "undefined" || sessionStorage["HUserName"] == "" || sessionStorage["HUserName"] == null || sessionStorage["HUserName"] == "undefined" || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == sessionStorage["OrganizationID"] || InterID == "undefined") {
+ layer.alert("姹囨姤鍗曞悓姝ュ弬鏁板彂鐢熷紓甯�");
+ }
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1