From 2a7f42931793527ceebfbc2eb9f4b7525084f764 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 28 五月 2025 13:45:13 +0800
Subject: [PATCH] 开工单停工单完工单优化，技能考核优化
---
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 28 +
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 35 +
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 11
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 125 ++++----
WebTM/views/工资管理/技能考核/HR_EmployeeSkillExamBillList.html | 333 +++++++++++++----------
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 10
WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html | 12
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 5
WebTM/views/工资管理/技能考核/HR_EmployeeSkillExamBill.html | 95 ++++-
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 28 +
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 104 ++++++
11 files changed, 498 insertions(+), 288 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index f71435e..563d6a2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -46,7 +46,7 @@
var params = get_UrlVars();
var HProcID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭id
var HSourceID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐢熶骇璧勬簮id
-
+ var HMaterID = params[params[2]];//浠庡弬鏁颁腑鑾峰彇鐗╂枡ID
form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
//var sMainStr = JSON.stringify(table.cache['mainTable']);
RoadQuery($('#Value').val());
@@ -210,8 +210,14 @@
if (Value != "") {
sWhere = " and 鍗曟嵁鍙� like '%" + Value + "%' ";
}
- if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
- sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
+ if (HProcID != '' && HProcID != undefined && HProcID != 0) {
+ sWhere += ' and HProcID=' + HProcID
+ }
+ if (HSourceID != '' && HSourceID != undefined && HSourceID != 0) {
+ sWhere += ' and HSourceID=' + HSourceID + ''
+ }
+ if (HMaterID != '' && HMaterID != undefined && HMaterID != 0) {
+ sWhere += ' and HMaterID=' + HMaterID
}
$.ajax({
type: "get",
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_Material.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_Material.html"
index d2361f0..6db61ed 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_Material.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_Material.html"
@@ -1517,7 +1517,10 @@
} else if (openType2 == "SeOrder") {
sWhere += " and 鐗╂枡灞炴��='鑷埗' "
}
- Organ(HOrgID);
+ if (typeof (HOrgID) != "undefined") {
+ Organ(HOrgID);
+ }
+
}
}
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
index c15ce2a..2e83362 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
@@ -43,7 +43,7 @@
<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>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -116,6 +116,20 @@
</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="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" 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="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </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" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -125,18 +139,6 @@
</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" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" 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">
<label class="layui-form-label" style="width: 85px;">浜嬩笟閮�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 128px; width: 185px;">
@@ -151,7 +153,19 @@
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
</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" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" 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>
</div>
<!--鍏朵粬淇℃伅-->
@@ -349,6 +363,30 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) { //澶嶅埗
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+ RoadBillMain(linterid);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpdater").val();
+ $("#HUpdaterDate").val();
+ $("#HChecker").val();
+ $("#HCheckerDate").val();
+ $("#HCloseMan").val();
+ $("#HCloseManDate").val();
+ $("#HDeleteMan").val();
+ $("#HDeleteManDate").val();
+ $("#HBacker").val();
+ $("#HBackerDate").val();
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
@@ -594,7 +632,7 @@
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HEmpID', title: '鑰冭瘯浜篒D', hide: true }
, { field: 'HEmpNumber', title: '鑰冭瘯浜轰唬鐮�', edit: 'text', event: "HEmpNumber" }//f7
- , { field: 'HEmpName', title: '鑰冭瘯浜哄悕绉�' }
+ , { field: 'HEmpName', title: '鑰冭瘯浜哄悕绉�', style: 'background-color:#efefef4d;' }
, { field: 'HLowMark', title: '鏈�浣庤姹傚垎鏁�', edit: 'text' }
, { field: 'HMark', title: '鍒嗘暟', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
@@ -634,7 +672,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?HType=2&HOrgName='+sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -718,7 +756,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -729,7 +767,8 @@
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
$("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
-
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -746,7 +785,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -774,7 +813,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Type=&Type2=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -912,21 +951,23 @@
, "HCheckEmpName": data[0]["璇勫畾浜哄悕绉�"]
, "HMaterID": data[0]["HMaterID"]
, "HMaterNumber": data[0]["鐗╂枡浠ｇ爜"]
+ , "HMaterName": data[0]["鐗╂枡鍚嶇О"]
+ , "HMaterModel": data[0]["瑙勬牸鍨嬪彿"]
, "HProcID": data[0]["HProcID"]
, "HProcName": data[0]["宸ュ簭鍚嶇О"]
, "HSourceID": data[0]["HSourceID"]
, "HSourceName": data[0]["鐢熶骇璧勬簮鍚嶇О"]
, "HRemark": data[0]["琛ㄥご澶囨敞"]
, "HMaker": data[0]["鍒跺崟浜�"]
- , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
- , "HUpDater": data[0]["淇敼浜�"]
- , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+ , "HMakerDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+ , "HUpdater": data[0]["淇敼浜�"]
+ , "HUpdaterDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
, "HChecker": data[0]["瀹℃牳浜�"]
- , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckerDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
, "HCloseMan": data[0]["鍏抽棴浜�"]
- , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCloseManDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
, "HDeleteMan": data[0]["浣滃簾浜�"]
- , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+ , "HDeleteManDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -1266,6 +1307,8 @@
function GetGyMaterial(obj) {
$("#HMaterID").val(obj.HItemID);//鐗╂枡id
$("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);//鐗╂枡鍚嶇О
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);
}
//宸ュ簭
function GetProcessValue(obj) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBillList.html"
index eabd9c0..ff9a5ed 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBillList.html"
@@ -15,7 +15,8 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -30,10 +31,12 @@
<span>鏇村</span>
</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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -48,6 +51,14 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -143,19 +154,22 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><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>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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" 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" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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" lay-event="set_HideButton" id="set_HideButton"><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>
</div>
@@ -183,7 +197,8 @@
var option = [];
var sWhere = "";
var HModName = "HR_EmployeeSkillExamBillList";
-
+ var HBillType = "2332";
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HProcID","HMaterID"];
@@ -223,6 +238,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -260,8 +278,12 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -269,7 +291,31 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
};
+ });
+ //#endregion
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ //$('#HDate').prop('disabled', true);
+ //$('#HDate1').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery(2);
+ } else {
+ //$('#HDate').prop('disabled', false);
+ //$('#HDate1').prop('disabled', false);
+ }
});
//#endregion
@@ -305,6 +351,31 @@
get_FastQuery(2);
});
//#endregion
+ //瓒呴摼鎺ヨ烦杞�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = obj.data.HInterID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鎶�鑳借�冩牳璁板綍-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/鎶�鑳借�冩牳/HR_EmployeeSkillExamBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
//#endregion
@@ -312,12 +383,17 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鍒濆鍖栨棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery(1);
+ get_FastQuery(2);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -369,6 +445,12 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -394,12 +476,13 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+ ins = table.render(option);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
-
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -552,6 +635,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-鎶�鑳借�冩牳璁板綍'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/鎶�鑳借�冩牳/HR_EmployeeSkillExamBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -577,12 +688,43 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "";
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xlsx");
+ //閫昏緫瀹℃牳鏂规硶
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+
+ // } else {
+ // layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ }
+ //#endregion
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -614,7 +756,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -734,125 +876,6 @@
}
//#endregion
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
-
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
-
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
@@ -867,6 +890,25 @@
$("#ColName1").append(Organization);
$("#ColName2").empty();
$("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [7, 30, 45, 60];
+ var titleList = ["杩�7澶�", "杩戜竴鏈�", "杩�45澶�", "杩�60澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+
+
+ $("#HInitTimeCycle").val("30");
form.render('select');
}
//#endregion
@@ -910,7 +952,6 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 9bb17fc..452fbe3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -505,8 +505,7 @@
set_InitGrid();
//鏌ヨ
get_FastQuery();
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+
}
@@ -670,6 +669,11 @@
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ var HBillStatus = data.鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
@@ -791,7 +795,11 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -823,8 +831,10 @@
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
} else {
layer.close(ajaxLoad);
@@ -865,8 +875,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1") {
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
return false;
}
@@ -901,9 +911,9 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1") {
- layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
return false;
}
//閫昏緫鍒犻櫎鏂规硶
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index be171aa..586667f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -67,10 +67,10 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HSource" id="HSource">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; ">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -238,7 +238,7 @@
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "鍋滃伐鍗曠淮鎶�";
+ window.HModuleName = "瀹屽伐鍗曠淮鎶�";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -514,8 +514,7 @@
set_InitGrid();
//鏌ヨ
get_FastQuery();
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+
}
//鍒濆鍖栬〃鏍�
@@ -659,6 +658,11 @@
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ var HBillStatus = data.鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
@@ -796,7 +800,11 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -828,8 +836,10 @@
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
} else {
layer.close(ajaxLoad);
@@ -870,8 +880,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1") {
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
return false;
}
@@ -906,8 +916,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1") {
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
return false;
}
@@ -1186,8 +1196,7 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 0f4011d..374ab09 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -286,19 +286,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇敼鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
</div>
@@ -320,13 +320,13 @@
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣滃簾鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
</div>
@@ -921,7 +921,6 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
- window.parent.location.reload();
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index 0ddba34..dcca5fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -492,8 +492,7 @@
set_InitGrid();
//鏌ヨ
get_FastQuery();
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+
}
@@ -638,7 +637,12 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var HBillStatus = data.鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -768,6 +772,12 @@
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 (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -799,8 +809,10 @@
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
} else {
layer.close(ajaxLoad);
@@ -865,8 +877,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1")
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓")
{
layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
return false;
@@ -903,8 +915,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
- var HBillStatus = data[0].HBillStatus.toString();
- if (HBillStatus != "1") {
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString();
+ if (HBillStatus != "鍒涘缓") {
layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
return false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 779159e..9de7d49 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -110,7 +110,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
- <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ <!--<input id="HMaker" name="HMaker" type="hidden" />--><!--鍒跺崟浜�-->
</div>
</div>
<div class="layui-inline">
@@ -287,73 +287,74 @@
</div>
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇敼浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹℃牳浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
- </div>
+
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇敼鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍏抽棴浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣滃簾浜�:</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣滃簾浜�:</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
+ </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="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
</div>
@@ -1102,7 +1103,7 @@
return Result = false;
}
//if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
- // 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 Result = false;
//}
return Result;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 88b38f5..e2fd667 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -264,19 +264,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇敼鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
</div>
@@ -298,13 +298,13 @@
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣滃簾鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 76bca7b..c1f3299 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -273,19 +273,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇敼鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
</div>
@@ -307,13 +307,13 @@
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣滃簾鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
</div>
@@ -1060,7 +1060,7 @@
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', style: 'background-color: #f9f9f9;' }
, { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆鍗″唴鐮�', hide: true }
, { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', hide: true }
- , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', templet: "#HProcExchInterID" }
+ , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', templet: "#HProcExchInterID", style: 'background-color: #f9f9f9;' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
@@ -1132,6 +1132,7 @@
if (obj.event == "HRelationBillNo") {
var HProcID = $("#HProcID").val();
var HSourceID = $("#HSourceID").val();
+ var HMaterID = $("#HMaterID").val();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1140,7 +1141,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID + '&HMaterID=' + HMaterID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1243,6 +1244,91 @@
, btn2: function (index, layero) { }
, end: function () {
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ if (event.key == "F6") {
+ if (obj.event == "HRelationBillNo") {
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ var HMaterID = $("#HMaterID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍓骇璁″垝鍗�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ if ($("#HSourceName").val() == checkStatus.data[0].鐢熶骇璧勬簮 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
+ obj.update({
+ "HProcExchInterID": checkStatus.data[0].hmainid
+ , "HProcExchEntryID": checkStatus.data[0].hsubid
+ , "HProcExchBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HRelationBillInterID": checkStatus.data[0].hmainid
+ , "HRelationBillEntryID": checkStatus.data[0].hsubid
+ , "HRelationBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HICMOInterID": checkStatus.data[0].hicmointerid
+ , "HICMOEntryID": checkStatus.data[0].HICMOEntryID
+ , "HICMOBillNo": checkStatus.data[0].鐢熶骇璁㈠崟鍙�
+ , "HMaterID": checkStatus.data[0].HMaterID
+ , "HMaterName": checkStatus.data[0].浜у搧
+ , "HProcID": checkStatus.data[0].HProcID
+ , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HSourceInterID": checkStatus.data[0].hmainid
+ , "HSourceEntryID": checkStatus.data[0].hsubid
+ , "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HSourceBillType": 3772
+
+ })
+ }
+ else {
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
+ }
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ if ($("#HSourceName").val() == OptionData[0].鐢熶骇璧勬簮 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
+ obj.update({
+ "HProcExchInterID": OptionData[0].hmainid
+ , "HProcExchEntryID": OptionData[0].hsubid
+ , "HProcExchBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HRelationBillInterID": OptionData[0].hmainid
+ , "HRelationBillEntryID": OptionData[0].hsubid
+ , "HRelationBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HICMOInterID": OptionData[0].hicmointerid
+ , "HICMOEntryID": OptionData[0].HICMOEntryID
+ , "HICMOBillNo": OptionData[0].鐢熶骇璁㈠崟鍙�
+ , "HMaterID": OptionData[0].HMaterID
+ , "HMaterName": OptionData[0].浜у搧
+ , "HProcID": OptionData[0].HProcID
+ , "HProcName": OptionData[0].宸ュ簭
+ , "HSourceInterID": OptionData[0].hmainid
+ , "HSourceEntryID": OptionData[0].hsubid
+ , "HSourceBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HSourceBillType": 3772
+
+ })
+ } else {
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
+ }
+
+ OptionData = [];
}
})
}
@@ -1472,8 +1558,8 @@
//鐢熶骇鐝
function GetHWorkShiftsValue(obj) {
- $("#HWorkShiftID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID
- $("#HWorkShiftName").val(obj[0].鐝鍚嶇О); //褰撳墠宸ュ簭
+ $("#HWorkShiftID").val(obj[0].HInterID); //褰撳墠鐝
+ $("#HWorkShiftName").val(obj[0].鐝鍚嶇О); //褰撳墠鐝鍚嶇О
}
function GetSwipeCardStart(obj) {
--
Gitblit v1.9.1